min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a couple of FIXMEs

This commit is contained in:
Steven Fackler 2017-11-05 10:47:05 -08:00
parent 6bb54e0171
commit 8830bd5daf
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssl/src/ssl/mod.rs
View File

@ -368,6 +368,7 @@ impl SslContextBuilder {
/// registers a verification callback. /// registers a verification callback.
pub fn set_verify_callback<F>(&mut self, mode: SslVerifyMode, verify: F) pub fn set_verify_callback<F>(&mut self, mode: SslVerifyMode, verify: F)
where where
// FIXME should take a mutable reference to the store
F: Fn(bool, &X509StoreContextRef) -> bool + Any + 'static + Sync + Send, F: Fn(bool, &X509StoreContextRef) -> bool + Any + 'static + Sync + Send,
{ {
unsafe { unsafe {
@ -1136,6 +1137,7 @@ impl SslRef {
/// chain is valid and `false` otherwise. /// chain is valid and `false` otherwise.
pub fn set_verify_callback<F>(&mut self, mode: SslVerifyMode, verify: F) pub fn set_verify_callback<F>(&mut self, mode: SslVerifyMode, verify: F)
where where
// FIXME should take a mutable reference to the x509 store
F: Fn(bool, &X509StoreContextRef) -> bool + Any + 'static + Sync + Send, F: Fn(bool, &X509StoreContextRef) -> bool + Any + 'static + Sync + Send,
{ {
unsafe { unsafe {
@ -1649,6 +1651,7 @@ impl<S> MidHandshakeSslStream<S> {
/// A stream wrapper which handles SSL encryption for an underlying stream. /// A stream wrapper which handles SSL encryption for an underlying stream.
pub struct SslStream<S> { pub struct SslStream<S> {
// FIXME use ManuallyDrop
ssl: Ssl, ssl: Ssl,
_method: BioMethod, // NOTE: this *must* be after the Ssl field so things drop right _method: BioMethod, // NOTE: this *must* be after the Ssl field so things drop right
_p: PhantomData<S>, _p: PhantomData<S>,
@ -1699,6 +1702,7 @@ impl<S: Read + Write> SslStream<S> {
Ok(ret as usize) Ok(ret as usize)
} else { } else {
match self.make_error(ret) { match self.make_error(ret) {
// FIXME only do this in read
// Don't treat unexpected EOFs as errors when reading // Don't treat unexpected EOFs as errors when reading
Error::Stream(ref e) if e.kind() == io::ErrorKind::ConnectionAborted => Ok(0), Error::Stream(ref e) if e.kind() == io::ErrorKind::ConnectionAborted => Ok(0),
e => Err(e), e => Err(e),