aboutsummaryrefslogtreecommitdiff
path: root/src/bn/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2014-09-30 03:15:42 -0400
committerSteven Fackler <[email protected]>2014-09-30 03:15:42 -0400
commit73885dad0263e6203cf33211857e3c25ff52aa99 (patch)
treecbfcdf8a2c3297164ef29a854e6469441d96c064 /src/bn/mod.rs
parentMerge pull request #56 from vhbit/single-ffi (diff)
parentUnification and explicity in FFI type decls (diff)
downloadrust-openssl-73885dad0263e6203cf33211857e3c25ff52aa99.tar.xz
rust-openssl-73885dad0263e6203cf33211857e3c25ff52aa99.zip
Merge pull request #57 from vhbit/mut-cleanup
Clean up of mut/const types in `ffi` and also `mut_null` -> `null_mut`
Diffstat (limited to 'src/bn/mod.rs')
-rw-r--r--src/bn/mod.rs8
1 files changed, 4 insertions, 4 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 })
}
}