Do some tweaks and cleanups #60
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jsha
force-pushed
the
tweaks-and-cleanups
branch
from
15776bb to
be46156
Compare
tgeoghegan
requested changes
Mar 11, 2021
| Some(out_n) => out_n, | ||
| None => return, | ||
| }; | ||
| *out_n = 0; | ||
| if buf.is_null() { | ||
| return; | ||
| } | ||
| slice::from_raw_parts_mut(buf as *mut u8, len as usize) | ||
| }; |
There was a problem hiding this comment.
I think this is the pattern we were talking about in Slack earlier. How about:
if buf.is_null() {
return;
}
let write_buf: &mut [u8] = unsafe { slice::from_raw_parts_mut(buf as *mut u8, len as usize) };
There was a problem hiding this comment.
(Is the Slack instance accessible to me? Might be useful...)
There was a problem hiding this comment.
Yep! Josh sent you an invite. Let me know if you didn't receive it.
src/cipher.rs
Outdated
| pub struct rustls_certified_key { | ||
| // We use the opaque struct pattern to tell C about our types without | ||
| // telling them what's inside. | ||
| // https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs | ||
| _private: [u8; 0], | ||
| } | ||
|
|
||
| /// Build a `rustls_certified_key` from a certificate chain and a private key. | ||
| /// `cert_chain` must point to an array of `cert_chain_len` bytes, containing |
There was a problem hiding this comment.
Suggested change
| /// `cert_chain` must point to an array of `cert_chain_len` bytes, containing | |
| /// `cert_chain` must point to a buffer of `cert_chain_len` bytes, containing |
Per discussion in Slack earlier today
src/server.rs
Outdated
| @@ -105,6 +105,16 @@ pub extern "C" fn rustls_server_config_builder_set_ignore_client_order( | |||
| } | |||
| } | |||
|
|
|||
| /// Set the ALPN protocol list to the given protocols. `protocols` must point | |||
| /// to a buffer of `rustls_slice_bytes` (built by the caller) with `len` | |||
| /// elements. Each element of th buffer must point to a slice of bytes that | |||
There was a problem hiding this comment.
Suggested change
| /// elements. Each element of th buffer must point to a slice of bytes that | |
| /// elements. Each element of the buffer must point to a slice of bytes that |
src/cipher.rs
Outdated
| /// a series of PEM-encoded certificates, with the end-entity (leaf) | ||
| /// certificate first. | ||
| /// | ||
| /// `private_key` must point to an array of `private_key_len` bytes, containing |
There was a problem hiding this comment.
Suggested change
| /// `private_key` must point to an array of `private_key_len` bytes, containing | |
| /// `private_key` must point to a buffer of `private_key_len` bytes, containing |
tgeoghegan
approved these changes
Mar 11, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Order imports as: std, third-party, crate.
Use
try_ref_from_ptr!to turnout_n's into refs. This moves unsafe blocks from later in the function to earlier in the function, closer to where their safety properties are checked. Also, remove pre-emptive zeroing ofout_n's. According to the conventions listed in our README, there are no partial successes or partial failures, so we shouldn't write toout_nif we early-return.Remove
strong_count < 1checks on Arc. Follow-up from #32.Add some missing comments and fix some formatting.