diff options
| author | Steven Fackler <[email protected]> | 2016-08-10 20:51:06 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-08-10 20:51:06 -0700 |
| commit | c4e7743c57bde2d25b8a14521c48bba85fe72e68 (patch) | |
| tree | 71c853706a665984f88031a2403d6643c74c6dfe /openssl/src/crypto | |
| parent | Fix workspace declaration (diff) | |
| download | rust-openssl-c4e7743c57bde2d25b8a14521c48bba85fe72e68.tar.xz rust-openssl-c4e7743c57bde2d25b8a14521c48bba85fe72e68.zip | |
Asn1 and Bignum renames
Diffstat (limited to 'openssl/src/crypto')
| -rw-r--r-- | openssl/src/crypto/dsa.rs | 6 | ||||
| -rw-r--r-- | openssl/src/crypto/rsa.rs | 12 |
2 files changed, 9 insertions, 9 deletions
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)) } } } |