diff options
| author | Steven Fackler <[email protected]> | 2014-09-17 12:21:07 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-09-17 12:21:07 -0400 |
| commit | cc7511a3329ae07df6bb658391fe19e8115e7f52 (patch) | |
| tree | b43617b033ed59a2f15f59581843e210c495895e /src/ssl | |
| parent | Merge pull request #44 from mvdnes/rsa_pubkey (diff) | |
| parent | Update for rust rfc 52 changes (diff) | |
| download | rust-openssl-cc7511a3329ae07df6bb658391fe19e8115e7f52.tar.xz rust-openssl-cc7511a3329ae07df6bb658391fe19e8115e7f52.zip | |
Merge pull request #48 from ebfe/rfc-52
Update for rust rfc 52 changes
Diffstat (limited to 'src/ssl')
| -rw-r--r-- | src/ssl/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs index 85503704..2ae1d41a 100644 --- a/src/ssl/mod.rs +++ b/src/ssl/mod.rs @@ -132,7 +132,7 @@ impl SslContext { init(); let ctx = unsafe { ffi::SSL_CTX_new(method.to_raw()) }; - if ctx == ptr::mut_null() { + if ctx == ptr::null_mut() { return Err(SslError::get()); } @@ -296,18 +296,18 @@ impl Drop for Ssl { impl Ssl { pub fn new(ctx: &SslContext) -> Result<Ssl, SslError> { let ssl = unsafe { ffi::SSL_new(ctx.ctx) }; - if ssl == ptr::mut_null() { + if ssl == ptr::null_mut() { return Err(SslError::get()); } let ssl = Ssl { ssl: ssl }; let rbio = unsafe { ffi::BIO_new(ffi::BIO_s_mem()) }; - if rbio == ptr::mut_null() { + if rbio == ptr::null_mut() { return Err(SslError::get()); } let wbio = unsafe { ffi::BIO_new(ffi::BIO_s_mem()) }; - if wbio == ptr::mut_null() { + if wbio == ptr::null_mut() { unsafe { ffi::BIO_free_all(rbio) } return Err(SslError::get()); } |