From c4e7743c57bde2d25b8a14521c48bba85fe72e68 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Wed, 10 Aug 2016 20:51:06 -0700 Subject: [PATCH] Asn1 and Bignum renames --- openssl/src/asn1/mod.rs | 12 ++-- openssl/src/bn/mod.rs | 122 ++++++++++++++++++-------------------- openssl/src/crypto/dsa.rs | 6 +- openssl/src/crypto/rsa.rs | 12 ++-- openssl/src/dh/mod.rs | 1 - openssl/src/x509/mod.rs | 4 +- 6 files changed, 76 insertions(+), 81 deletions(-) diff --git a/openssl/src/asn1/mod.rs b/openssl/src/asn1/mod.rs index e79a0fd2..7d209775 100644 --- a/openssl/src/asn1/mod.rs +++ b/openssl/src/asn1/mod.rs @@ -8,26 +8,26 @@ pub struct Asn1Time(*mut ffi::ASN1_TIME); impl Asn1Time { /// Wraps existing ASN1_TIME and takes ownership - pub unsafe fn from_raw(handle: *mut ffi::ASN1_TIME) -> Asn1Time { + pub unsafe fn from_ptr(handle: *mut ffi::ASN1_TIME) -> Asn1Time { Asn1Time(handle) } - fn from_period(period: u64) -> Result { + fn from_period(period: c_long) -> Result { ffi::init(); unsafe { - let handle = try_ssl_null!(ffi::X509_gmtime_adj(ptr::null_mut(), period as c_long)); - Ok(Asn1Time::from_raw(handle)) + let handle = try_ssl_null!(ffi::X509_gmtime_adj(ptr::null_mut(), period)); + Ok(Asn1Time::from_ptr(handle)) } } /// Creates a new time on specified interval in days from now pub fn days_from_now(days: u32) -> Result { - Asn1Time::from_period(days as u64 * 60 * 60 * 24) + Asn1Time::from_period(days as c_long * 60 * 60 * 24) } /// Returns the raw handle - pub fn handle(&self) -> *mut ffi::ASN1_TIME { + pub fn as_ptr(&self) -> *mut ffi::ASN1_TIME { self.0 } } diff --git a/openssl/src/bn/mod.rs b/openssl/src/bn/mod.rs index a933157c..2f751037 100644 --- a/openssl/src/bn/mod.rs +++ b/openssl/src/bn/mod.rs @@ -80,7 +80,7 @@ pub struct BigNumRef<'a>(*mut ffi::BIGNUM, PhantomData<&'a ()>); impl<'a> BigNumRef<'a> { - pub unsafe fn from_handle(handle: *mut ffi::BIGNUM) -> BigNumRef<'a> { + pub unsafe fn from_ptr(handle: *mut ffi::BIGNUM) -> BigNumRef<'a> { BigNumRef(handle, PhantomData) } @@ -97,7 +97,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_sqr(&self) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_sqr(r.raw(), self.raw(), ctx) == 1 + ffi::BN_sqr(r.as_ptr(), self.as_ptr(), ctx) == 1 }) } } @@ -106,7 +106,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_nnmod(&self, n: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_nnmod(r.raw(), self.raw(), n.raw(), ctx) == 1 + ffi::BN_nnmod(r.as_ptr(), self.as_ptr(), n.as_ptr(), ctx) == 1 }) } } @@ -125,7 +125,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_mod_add(&self, a: &BigNumRef, n: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_mod_add(r.raw(), self.raw(), a.raw(), n.raw(), ctx) == 1 + ffi::BN_mod_add(r.as_ptr(), self.as_ptr(), a.as_ptr(), n.as_ptr(), ctx) == 1 }) } } @@ -134,7 +134,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_mod_sub(&self, a: &BigNumRef, n: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_mod_sub(r.raw(), self.raw(), a.raw(), n.raw(), ctx) == 1 + ffi::BN_mod_sub(r.as_ptr(), self.as_ptr(), a.as_ptr(), n.as_ptr(), ctx) == 1 }) } } @@ -143,7 +143,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_mod_mul(&self, a: &BigNumRef, n: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_mod_mul(r.raw(), self.raw(), a.raw(), n.raw(), ctx) == 1 + ffi::BN_mod_mul(r.as_ptr(), self.as_ptr(), a.as_ptr(), n.as_ptr(), ctx) == 1 }) } } @@ -152,7 +152,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_mod_sqr(&self, n: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_mod_sqr(r.raw(), self.raw(), n.raw(), ctx) == 1 + ffi::BN_mod_sqr(r.as_ptr(), self.as_ptr(), n.as_ptr(), ctx) == 1 }) } } @@ -161,7 +161,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_exp(&self, p: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_exp(r.raw(), self.raw(), p.raw(), ctx) == 1 + ffi::BN_exp(r.as_ptr(), self.as_ptr(), p.as_ptr(), ctx) == 1 }) } } @@ -170,7 +170,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_mod_exp(&self, p: &BigNumRef, n: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_mod_exp(r.raw(), self.raw(), p.raw(), n.raw(), ctx) == 1 + ffi::BN_mod_exp(r.as_ptr(), self.as_ptr(), p.as_ptr(), n.as_ptr(), ctx) == 1 }) } } @@ -180,7 +180,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_mod_inv(&self, n: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - !ffi::BN_mod_inverse(r.raw(), self.raw(), n.raw(), ctx).is_null() + !ffi::BN_mod_inverse(r.as_ptr(), self.as_ptr(), n.as_ptr(), ctx).is_null() }) } } @@ -188,7 +188,7 @@ impl<'a> BigNumRef<'a> { /// Add an `unsigned long` to `self`. This is more efficient than adding a `BigNum`. pub fn add_word(&mut self, w: c_ulong) -> Result<(), ErrorStack> { unsafe { - if ffi::BN_add_word(self.raw(), w) == 1 { + if ffi::BN_add_word(self.as_ptr(), w) == 1 { Ok(()) } else { Err(ErrorStack::get()) @@ -198,7 +198,7 @@ impl<'a> BigNumRef<'a> { pub fn sub_word(&mut self, w: c_ulong) -> Result<(), ErrorStack> { unsafe { - if ffi::BN_sub_word(self.raw(), w) == 1 { + if ffi::BN_sub_word(self.as_ptr(), w) == 1 { Ok(()) } else { Err(ErrorStack::get()) @@ -208,7 +208,7 @@ impl<'a> BigNumRef<'a> { pub fn mul_word(&mut self, w: c_ulong) -> Result<(), ErrorStack> { unsafe { - if ffi::BN_mul_word(self.raw(), w) == 1 { + if ffi::BN_mul_word(self.as_ptr(), w) == 1 { Ok(()) } else { Err(ErrorStack::get()) @@ -218,7 +218,7 @@ impl<'a> BigNumRef<'a> { pub fn div_word(&mut self, w: c_ulong) -> Result { unsafe { - let result = ffi::BN_div_word(self.raw(), w); + let result = ffi::BN_div_word(self.as_ptr(), w); if result != !0 as c_ulong { Ok(result) } else { @@ -229,7 +229,7 @@ impl<'a> BigNumRef<'a> { pub fn mod_word(&self, w: c_ulong) -> Result { unsafe { - let result = ffi::BN_mod_word(self.raw(), w); + let result = ffi::BN_mod_word(self.as_ptr(), w); if result != !0 as c_ulong { Ok(result) } else { @@ -242,7 +242,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_gcd(&self, a: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_gcd(r.raw(), self.raw(), a.raw(), ctx) == 1 + ffi::BN_gcd(r.as_ptr(), self.as_ptr(), a.as_ptr(), ctx) == 1 }) } } @@ -257,7 +257,7 @@ impl<'a> BigNumRef<'a> { pub fn is_prime(&self, checks: i32) -> Result { unsafe { with_ctx!(ctx, { - Ok(ffi::BN_is_prime_ex(self.raw(), checks as c_int, ctx, ptr::null()) == 1) + Ok(ffi::BN_is_prime_ex(self.as_ptr(), checks as c_int, ctx, ptr::null()) == 1) }) } } @@ -274,7 +274,7 @@ impl<'a> BigNumRef<'a> { pub fn is_prime_fast(&self, checks: i32, do_trial_division: bool) -> Result { unsafe { with_ctx!(ctx, { - Ok(ffi::BN_is_prime_fasttest_ex(self.raw(), + Ok(ffi::BN_is_prime_fasttest_ex(self.as_ptr(), checks as c_int, ctx, do_trial_division as c_int, @@ -288,7 +288,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_rand_in_range(&self) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_rand_range(r.raw(), self.raw()) == 1 + ffi::BN_rand_range(r.as_ptr(), self.as_ptr()) == 1 }) } } @@ -297,7 +297,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_pseudo_rand_in_range(&self) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_pseudo_rand_range(r.raw(), self.raw()) == 1 + ffi::BN_pseudo_rand_range(r.as_ptr(), self.as_ptr()) == 1 }) } } @@ -307,7 +307,7 @@ impl<'a> BigNumRef<'a> { /// When setting a bit outside of `self`, it is expanded. pub fn set_bit(&mut self, n: i32) -> Result<(), ErrorStack> { unsafe { - if ffi::BN_set_bit(self.raw(), n as c_int) == 1 { + if ffi::BN_set_bit(self.as_ptr(), n as c_int) == 1 { Ok(()) } else { Err(ErrorStack::get()) @@ -320,7 +320,7 @@ impl<'a> BigNumRef<'a> { /// When clearing a bit outside of `self`, an error is returned. pub fn clear_bit(&mut self, n: i32) -> Result<(), ErrorStack> { unsafe { - if ffi::BN_clear_bit(self.raw(), n as c_int) == 1 { + if ffi::BN_clear_bit(self.as_ptr(), n as c_int) == 1 { Ok(()) } else { Err(ErrorStack::get()) @@ -330,7 +330,7 @@ impl<'a> BigNumRef<'a> { /// Returns `true` if the `n`th bit of `self` is set to 1, `false` otherwise. pub fn is_bit_set(&self, n: i32) -> bool { - unsafe { ffi::BN_is_bit_set(self.raw(), n as c_int) == 1 } + unsafe { ffi::BN_is_bit_set(self.as_ptr(), n as c_int) == 1 } } /// Truncates `self` to the lowest `n` bits. @@ -338,7 +338,7 @@ impl<'a> BigNumRef<'a> { /// An error occurs if `self` is already shorter than `n` bits. pub fn mask_bits(&mut self, n: i32) -> Result<(), ErrorStack> { unsafe { - if ffi::BN_mask_bits(self.raw(), n as c_int) == 1 { + if ffi::BN_mask_bits(self.as_ptr(), n as c_int) == 1 { Ok(()) } else { Err(ErrorStack::get()) @@ -367,7 +367,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_shl1(&self) -> Result { unsafe { with_bn!(r, { - ffi::BN_lshift1(r.raw(), self.raw()) == 1 + ffi::BN_lshift1(r.as_ptr(), self.as_ptr()) == 1 }) } } @@ -376,7 +376,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_shr1(&self) -> Result { unsafe { with_bn!(r, { - ffi::BN_rshift1(r.raw(), self.raw()) == 1 + ffi::BN_rshift1(r.as_ptr(), self.as_ptr()) == 1 }) } } @@ -384,7 +384,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_add(&self, a: &BigNumRef) -> Result { unsafe { with_bn!(r, { - ffi::BN_add(r.raw(), self.raw(), a.raw()) == 1 + ffi::BN_add(r.as_ptr(), self.as_ptr(), a.as_ptr()) == 1 }) } } @@ -392,7 +392,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_sub(&self, a: &BigNumRef) -> Result { unsafe { with_bn!(r, { - ffi::BN_sub(r.raw(), self.raw(), a.raw()) == 1 + ffi::BN_sub(r.as_ptr(), self.as_ptr(), a.as_ptr()) == 1 }) } } @@ -400,7 +400,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_mul(&self, a: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_mul(r.raw(), self.raw(), a.raw(), ctx) == 1 + ffi::BN_mul(r.as_ptr(), self.as_ptr(), a.as_ptr(), ctx) == 1 }) } } @@ -408,7 +408,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_div(&self, a: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_div(r.raw(), ptr::null_mut(), self.raw(), a.raw(), ctx) == 1 + ffi::BN_div(r.as_ptr(), ptr::null_mut(), self.as_ptr(), a.as_ptr(), ctx) == 1 }) } } @@ -416,7 +416,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_mod(&self, a: &BigNumRef) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_div(ptr::null_mut(), r.raw(), self.raw(), a.raw(), ctx) == 1 + ffi::BN_div(ptr::null_mut(), r.as_ptr(), self.as_ptr(), a.as_ptr(), ctx) == 1 }) } } @@ -424,7 +424,7 @@ impl<'a> BigNumRef<'a> { pub fn checked_shl(&self, a: &i32) -> Result { unsafe { with_bn!(r, { - ffi::BN_lshift(r.raw(), self.raw(), *a as c_int) == 1 + ffi::BN_lshift(r.as_ptr(), self.as_ptr(), *a as c_int) == 1 }) } } @@ -432,15 +432,15 @@ impl<'a> BigNumRef<'a> { pub fn checked_shr(&self, a: &i32) -> Result { unsafe { with_bn!(r, { - ffi::BN_rshift(r.raw(), self.raw(), *a as c_int) == 1 + ffi::BN_rshift(r.as_ptr(), self.as_ptr(), *a as c_int) == 1 }) } } pub fn to_owned(&self) -> Result { unsafe { - let r = try_ssl_null!(ffi::BN_dup(self.raw())); - Ok(BigNum::from_handle(r)) + let r = try_ssl_null!(ffi::BN_dup(self.as_ptr())); + Ok(BigNum::from_ptr(r)) } } @@ -456,7 +456,7 @@ impl<'a> BigNumRef<'a> { /// assert_eq!(s, BigNum::new_from(8).unwrap()); /// ``` pub fn negate(&mut self) { - unsafe { ffi::BN_set_negative(self.raw(), !self.is_negative() as c_int) } + unsafe { ffi::BN_set_negative(self.as_ptr(), !self.is_negative() as c_int) } } /// Compare the absolute values of `self` and `oth`. @@ -471,7 +471,7 @@ impl<'a> BigNumRef<'a> { /// ``` pub fn abs_cmp(&self, oth: &BigNumRef) -> Ordering { unsafe { - let res = ffi::BN_ucmp(self.raw(), oth.raw()) as i32; + let res = ffi::BN_ucmp(self.as_ptr(), oth.as_ptr()) as i32; if res < 0 { Ordering::Less } else if res > 0 { @@ -483,12 +483,12 @@ impl<'a> BigNumRef<'a> { } pub fn is_negative(&self) -> bool { - unsafe { (*self.raw()).neg == 1 } + unsafe { (*self.as_ptr()).neg == 1 } } /// Returns the number of significant bits in `self`. pub fn num_bits(&self) -> i32 { - unsafe { ffi::BN_num_bits(self.raw()) as i32 } + unsafe { ffi::BN_num_bits(self.as_ptr()) as i32 } } /// Returns the size of `self` in bytes. @@ -496,14 +496,10 @@ impl<'a> BigNumRef<'a> { (self.num_bits() + 7) / 8 } - pub fn raw(&self) -> *mut ffi::BIGNUM { + pub fn as_ptr(&self) -> *mut ffi::BIGNUM { self.0 } - pub fn raw_ptr(&self) -> *const *mut ffi::BIGNUM { - &self.0 - } - /// Returns a big-endian byte vector representation of the absolute value of `self`. /// /// `self` can be recreated by using `new_from_slice`. @@ -520,7 +516,7 @@ impl<'a> BigNumRef<'a> { let size = self.num_bytes() as usize; let mut v = Vec::with_capacity(size); unsafe { - ffi::BN_bn2bin(self.raw(), v.as_mut_ptr()); + ffi::BN_bn2bin(self.as_ptr(), v.as_mut_ptr()); v.set_len(size); } v @@ -536,7 +532,7 @@ impl<'a> BigNumRef<'a> { /// ``` pub fn to_dec_str(&self) -> String { unsafe { - let buf = ffi::BN_bn2dec(self.raw()); + let buf = ffi::BN_bn2dec(self.as_ptr()); assert!(!buf.is_null()); let str = String::from_utf8(CStr::from_ptr(buf as *const _).to_bytes().to_vec()) .unwrap(); @@ -555,7 +551,7 @@ impl<'a> BigNumRef<'a> { /// ``` pub fn to_hex_str(&self) -> String { unsafe { - let buf = ffi::BN_bn2hex(self.raw()); + let buf = ffi::BN_bn2hex(self.as_ptr()); assert!(!buf.is_null()); let str = String::from_utf8(CStr::from_ptr(buf as *const _).to_bytes().to_vec()) .unwrap(); @@ -579,14 +575,14 @@ impl BigNum { unsafe { ffi::init(); let v = try_ssl_null!(ffi::BN_new()); - Ok(BigNum::from_handle(v)) + Ok(BigNum::from_ptr(v)) } } /// Creates a new `BigNum` with the given value. pub fn new_from(n: c_ulong) -> Result { BigNum::new().and_then(|v| unsafe { - try_ssl!(ffi::BN_set_word(v.raw(), n)); + try_ssl!(ffi::BN_set_word(v.as_ptr(), n)); Ok(v) }) } @@ -595,7 +591,7 @@ impl BigNum { pub fn from_dec_str(s: &str) -> Result { BigNum::new().and_then(|v| unsafe { let c_str = CString::new(s.as_bytes()).unwrap(); - try_ssl!(ffi::BN_dec2bn(v.raw_ptr(), c_str.as_ptr() as *const _)); + try_ssl!(ffi::BN_dec2bn(&(v.0).0, c_str.as_ptr() as *const _)); Ok(v) }) } @@ -604,13 +600,13 @@ impl BigNum { pub fn from_hex_str(s: &str) -> Result { BigNum::new().and_then(|v| unsafe { let c_str = CString::new(s.as_bytes()).unwrap(); - try_ssl!(ffi::BN_hex2bn(v.raw_ptr(), c_str.as_ptr() as *const _)); + try_ssl!(ffi::BN_hex2bn(&(v.0).0, c_str.as_ptr() as *const _)); Ok(v) }) } - pub unsafe fn from_handle(handle: *mut ffi::BIGNUM) -> BigNum { - BigNum(BigNumRef::from_handle(handle)) + pub unsafe fn from_ptr(handle: *mut ffi::BIGNUM) -> BigNum { + BigNum(BigNumRef::from_ptr(handle)) } /// Creates a new `BigNum` from an unsigned, big-endian encoded number of arbitrary length. @@ -623,7 +619,7 @@ impl BigNum { /// ``` pub fn new_from_slice(n: &[u8]) -> Result { BigNum::new().and_then(|v| unsafe { - try_ssl_null!(ffi::BN_bin2bn(n.as_ptr(), n.len() as c_int, v.raw())); + try_ssl_null!(ffi::BN_bin2bn(n.as_ptr(), n.len() as c_int, v.as_ptr())); Ok(v) }) } @@ -642,10 +638,10 @@ impl BigNum { -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - 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()); + let add_arg = add.map(|a| a.as_ptr()).unwrap_or(ptr::null_mut()); + let rem_arg = rem.map(|r| r.as_ptr()).unwrap_or(ptr::null_mut()); - ffi::BN_generate_prime_ex(r.raw(), + ffi::BN_generate_prime_ex(r.as_ptr(), bits as c_int, safe as c_int, add_arg, @@ -665,7 +661,7 @@ impl BigNum { pub fn checked_new_random(bits: i32, prop: RNGProperty, odd: bool) -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_rand(r.raw(), bits as c_int, prop as c_int, odd as c_int) == 1 + ffi::BN_rand(r.as_ptr(), bits as c_int, prop as c_int, odd as c_int) == 1 }) } } @@ -677,13 +673,13 @@ impl BigNum { -> Result { unsafe { with_bn_in_ctx!(r, ctx, { - ffi::BN_pseudo_rand(r.raw(), bits as c_int, prop as c_int, odd as c_int) == 1 + ffi::BN_pseudo_rand(r.as_ptr(), bits as c_int, prop as c_int, odd as c_int) == 1 }) } } pub fn into_raw(self) -> *mut ffi::BIGNUM { - let ptr = self.raw(); + let ptr = self.as_ptr(); mem::forget(self); ptr } @@ -691,7 +687,7 @@ impl BigNum { impl Drop for BigNum { fn drop(&mut self) { - unsafe { ffi::BN_clear_free(self.raw()); } + unsafe { ffi::BN_clear_free(self.as_ptr()); } } } @@ -741,7 +737,7 @@ impl fmt::Display for BigNum { impl<'a, 'b> PartialEq> for BigNumRef<'a> { fn eq(&self, oth: &BigNumRef) -> bool { - unsafe { ffi::BN_cmp(self.raw(), oth.raw()) == 0 } + unsafe { ffi::BN_cmp(self.as_ptr(), oth.as_ptr()) == 0 } } } @@ -781,7 +777,7 @@ impl<'a> PartialOrd for BigNumRef<'a> { impl<'a> Ord for BigNumRef<'a> { fn cmp(&self, oth: &BigNumRef) -> Ordering { - unsafe { ffi::BN_cmp(self.raw(), oth.raw()).cmp(&0) } + unsafe { ffi::BN_cmp(self.as_ptr(), oth.as_ptr()).cmp(&0) } } } diff --git a/openssl/src/crypto/dsa.rs b/openssl/src/crypto/dsa.rs index 7852d391..7e6f0381 100644 --- a/openssl/src/crypto/dsa.rs +++ b/openssl/src/crypto/dsa.rs @@ -195,7 +195,7 @@ impl DSA { if p.is_null() { None } else { - Some(BigNumRef::from_handle((*self.0).p)) + Some(BigNumRef::from_ptr((*self.0).p)) } } } @@ -206,7 +206,7 @@ impl DSA { if q.is_null() { None } else { - Some(BigNumRef::from_handle((*self.0).q)) + Some(BigNumRef::from_ptr((*self.0).q)) } } } @@ -217,7 +217,7 @@ impl DSA { if g.is_null() { None } else { - Some(BigNumRef::from_handle((*self.0).g)) + Some(BigNumRef::from_ptr((*self.0).g)) } } } diff --git a/openssl/src/crypto/rsa.rs b/openssl/src/crypto/rsa.rs index 2dfa64a6..e68b2420 100644 --- a/openssl/src/crypto/rsa.rs +++ b/openssl/src/crypto/rsa.rs @@ -68,7 +68,7 @@ impl RSA { let rsa = RSA(rsa); let e = try!(BigNum::new_from(ffi::RSA_F4 as c_ulong)); - try_ssl!(ffi::RSA_generate_key_ex(rsa.0, bits as c_int, e.raw(), ptr::null_mut())); + try_ssl!(ffi::RSA_generate_key_ex(rsa.0, bits as c_int, e.as_ptr(), ptr::null_mut())); Ok(rsa) } @@ -190,7 +190,7 @@ impl RSA { if n.is_null() { None } else { - Some(BigNumRef::from_handle(n)) + Some(BigNumRef::from_ptr(n)) } } } @@ -201,7 +201,7 @@ impl RSA { if d.is_null() { None } else { - Some(BigNumRef::from_handle(d)) + Some(BigNumRef::from_ptr(d)) } } } @@ -212,7 +212,7 @@ impl RSA { if e.is_null() { None } else { - Some(BigNumRef::from_handle(e)) + Some(BigNumRef::from_ptr(e)) } } } @@ -223,7 +223,7 @@ impl RSA { if p.is_null() { None } else { - Some(BigNumRef::from_handle(p)) + Some(BigNumRef::from_ptr(p)) } } } @@ -234,7 +234,7 @@ impl RSA { if q.is_null() { None } else { - Some(BigNumRef::from_handle(q)) + Some(BigNumRef::from_ptr(q)) } } } diff --git a/openssl/src/dh/mod.rs b/openssl/src/dh/mod.rs index b9613a1d..0a37a5e2 100644 --- a/openssl/src/dh/mod.rs +++ b/openssl/src/dh/mod.rs @@ -1,7 +1,6 @@ use ffi; use error::ErrorStack; use bio::MemBioSlice; -use bn::BigNum; use std::ptr; pub struct DH(*mut ffi::DH); diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs index 3bdbaa67..31c67453 100644 --- a/openssl/src/x509/mod.rs +++ b/openssl/src/x509/mod.rs @@ -306,11 +306,11 @@ impl X509Generator { let not_before = try!(Asn1Time::days_from_now(0)); let not_after = try!(Asn1Time::days_from_now(self.days)); - try_ssl!(ffi::X509_set_notBefore(x509.handle(), not_before.handle() as *const _)); + try_ssl!(ffi::X509_set_notBefore(x509.handle(), not_before.as_ptr() as *const _)); // If prev line succeded - ownership should go to cert mem::forget(not_before); - try_ssl!(ffi::X509_set_notAfter(x509.handle(), not_after.handle() as *const _)); + try_ssl!(ffi::X509_set_notAfter(x509.handle(), not_after.as_ptr() as *const _)); // If prev line succeded - ownership should go to cert mem::forget(not_after);