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

Fixed mut_null deprecation warnings

This commit is contained in:
Valerii Hiora 2014-09-30 09:37:32 +03:00
parent 36977c2aa3
commit dec5f967c6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bn/mod.rs
View File

@ -165,8 +165,8 @@ impl BigNum {
pub fn checked_generate_prime(bits: i32, safe: bool, add: Option<&BigNum>, rem: Option<&BigNum>) -> Result<BigNum, SslError> { pub fn checked_generate_prime(bits: i32, safe: bool, add: Option<&BigNum>, rem: Option<&BigNum>) -> Result<BigNum, SslError> {
unsafe { unsafe {
with_bn_in_ctx!(r, ctx, { with_bn_in_ctx!(r, ctx, {
let add_arg = add.map(|a| a.raw()).unwrap_or(ptr::mut_null()); let add_arg = add.map(|a| a.raw()).unwrap_or(ptr::null_mut());
let rem_arg = rem.map(|r| r.raw()).unwrap_or(ptr::mut_null()); let rem_arg = rem.map(|r| r.raw()).unwrap_or(ptr::null_mut());
ffi::BN_generate_prime_ex(r.raw(), bits as c_int, safe as c_int, add_arg, rem_arg, ptr::null()) == 1 ffi::BN_generate_prime_ex(r.raw(), bits as c_int, safe as c_int, add_arg, rem_arg, ptr::null()) == 1
}) })
@ -281,13 +281,13 @@ impl BigNum {
pub fn checked_div(&self, a: &BigNum) -> Result<BigNum, SslError> { pub fn checked_div(&self, a: &BigNum) -> Result<BigNum, SslError> {
unsafe { unsafe {
with_bn_in_ctx!(r, ctx, { ffi::BN_div(r.raw(), ptr::mut_null(), self.raw(), a.raw(), ctx) == 1 }) with_bn_in_ctx!(r, ctx, { ffi::BN_div(r.raw(), ptr::null_mut(), self.raw(), a.raw(), ctx) == 1 })
} }
} }
pub fn checked_mod(&self, a: &BigNum) -> Result<BigNum, SslError> { pub fn checked_mod(&self, a: &BigNum) -> Result<BigNum, SslError> {
unsafe { unsafe {
with_bn_in_ctx!(r, ctx, { ffi::BN_div(ptr::mut_null(), r.raw(), self.raw(), a.raw(), ctx) == 1 }) with_bn_in_ctx!(r, ctx, { ffi::BN_div(ptr::null_mut(), r.raw(), self.raw(), a.raw(), ctx) == 1 })
} }
} }

2
src/ssl/mod.rs
View File

@ -242,7 +242,7 @@ impl Ssl {
} }
fn wrap_bio<'a>(&'a self, bio: *mut ffi::BIO) -> MemBioRef<'a> { fn wrap_bio<'a>(&'a self, bio: *mut ffi::BIO) -> MemBioRef<'a> {
assert!(bio != ptr::mut_null()); assert!(bio != ptr::null_mut());
MemBioRef { MemBioRef {
ssl: self, ssl: self,
bio: MemBio::borrowed(bio) bio: MemBio::borrowed(bio)