diff options
| author | Valerii Hiora <[email protected]> | 2014-09-30 09:37:32 +0300 |
|---|---|---|
| committer | Valerii Hiora <[email protected]> | 2014-09-30 09:37:32 +0300 |
| commit | dec5f967c6683a47ae495fd309db15883511ef88 (patch) | |
| tree | 04018971a70b54127b3a6c340901bc0e06708008 /src | |
| parent | Merge pull request #56 from vhbit/single-ffi (diff) | |
| download | rust-openssl-dec5f967c6683a47ae495fd309db15883511ef88.tar.xz rust-openssl-dec5f967c6683a47ae495fd309db15883511ef88.zip | |
Fixed mut_null deprecation warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/bn/mod.rs | 8 | ||||
| -rw-r--r-- | src/ssl/mod.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bn/mod.rs b/src/bn/mod.rs index 29ffd413..fb836a39 100644 --- a/src/bn/mod.rs +++ b/src/bn/mod.rs @@ -165,8 +165,8 @@ impl BigNum { pub fn checked_generate_prime(bits: i32, safe: bool, add: Option<&BigNum>, rem: Option<&BigNum>) -> Result<BigNum, SslError> { unsafe { with_bn_in_ctx!(r, ctx, { - let add_arg = add.map(|a| a.raw()).unwrap_or(ptr::mut_null()); - let rem_arg = rem.map(|r| r.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::null_mut()); 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> { 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> { 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 }) } } diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs index 1198aa4a..f034ed37 100644 --- a/src/ssl/mod.rs +++ b/src/ssl/mod.rs @@ -242,7 +242,7 @@ impl Ssl { } fn wrap_bio<'a>(&'a self, bio: *mut ffi::BIO) -> MemBioRef<'a> { - assert!(bio != ptr::mut_null()); + assert!(bio != ptr::null_mut()); MemBioRef { ssl: self, bio: MemBio::borrowed(bio) |