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

Update for rust rfc 52 changes

This commit is contained in:
Michael Gehring 2014-09-17 17:21:17 +02:00
parent cec41181c0
commit 6802216f79
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto/hash.rs
View File

@ -96,7 +96,7 @@ impl Hasher {
pub fn final(&self) -> Vec<u8> { pub fn final(&self) -> Vec<u8> {
unsafe { unsafe {
let mut res = Vec::from_elem(self.len, 0u8); let mut res = Vec::from_elem(self.len, 0u8);
EVP_DigestFinal(self.ctx, res.as_mut_ptr(), ptr::mut_null()); EVP_DigestFinal(self.ctx, res.as_mut_ptr(), ptr::null_mut());
res res
} }
} }

2
src/crypto/pkey.rs
View File

@ -107,7 +107,7 @@ impl PKey {
fn _fromstr(&mut self, s: &[u8], f: unsafe extern "C" fn(*const *mut RSA, *const *const u8, c_uint) -> *mut RSA) { fn _fromstr(&mut self, s: &[u8], f: unsafe extern "C" fn(*const *mut RSA, *const *const u8, c_uint) -> *mut RSA) {
unsafe { unsafe {
let rsa = ptr::mut_null(); let rsa = ptr::null_mut();
f(&rsa, &s.as_ptr(), s.len() as c_uint); f(&rsa, &s.as_ptr(), s.len() as c_uint);
EVP_PKEY_set1_RSA(self.evp, rsa); EVP_PKEY_set1_RSA(self.evp, rsa);
} }

8
src/ssl/mod.rs
View File

@ -132,7 +132,7 @@ impl SslContext {
init(); init();
let ctx = unsafe { ffi::SSL_CTX_new(method.to_raw()) }; let ctx = unsafe { ffi::SSL_CTX_new(method.to_raw()) };
if ctx == ptr::mut_null() { if ctx == ptr::null_mut() {
return Err(SslError::get()); return Err(SslError::get());
} }
@ -296,18 +296,18 @@ impl Drop for Ssl {
impl Ssl { impl Ssl {
pub fn new(ctx: &SslContext) -> Result<Ssl, SslError> { pub fn new(ctx: &SslContext) -> Result<Ssl, SslError> {
let ssl = unsafe { ffi::SSL_new(ctx.ctx) }; let ssl = unsafe { ffi::SSL_new(ctx.ctx) };
if ssl == ptr::mut_null() { if ssl == ptr::null_mut() {
return Err(SslError::get()); return Err(SslError::get());
} }
let ssl = Ssl { ssl: ssl }; let ssl = Ssl { ssl: ssl };
let rbio = unsafe { ffi::BIO_new(ffi::BIO_s_mem()) }; let rbio = unsafe { ffi::BIO_new(ffi::BIO_s_mem()) };
if rbio == ptr::mut_null() { if rbio == ptr::null_mut() {
return Err(SslError::get()); return Err(SslError::get());
} }
let wbio = unsafe { ffi::BIO_new(ffi::BIO_s_mem()) }; 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) } unsafe { ffi::BIO_free_all(rbio) }
return Err(SslError::get()); return Err(SslError::get());
} }