aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ec_key.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-13 17:06:50 +0000
committerSteven Fackler <[email protected]>2016-11-13 17:06:50 +0000
commit48c0009418cbbf7c69c24b35d56e80edb0c80d45 (patch)
tree21ab4cb2b259ea883a36865d0971c3ad65ea0722 /openssl/src/ec_key.rs
parentMacroise to_der (diff)
downloadrust-openssl-48c0009418cbbf7c69c24b35d56e80edb0c80d45.tar.xz
rust-openssl-48c0009418cbbf7c69c24b35d56e80edb0c80d45.zip
Macroise from_der
Diffstat (limited to 'openssl/src/ec_key.rs')
-rw-r--r--openssl/src/ec_key.rs12
1 files changed, 1 insertions, 11 deletions
diff --git a/openssl/src/ec_key.rs b/openssl/src/ec_key.rs
index 706265ef..268a6fd2 100644
--- a/openssl/src/ec_key.rs
+++ b/openssl/src/ec_key.rs
@@ -1,6 +1,4 @@
use ffi;
-use std::cmp;
-use libc::c_long;
use std::ptr;
use {cvt, cvt_p, init};
@@ -23,16 +21,8 @@ impl EcKey {
}
}
- /// Deserializes a DER-encoded private key.
- pub fn private_key_from_der(der: &[u8]) -> Result<EcKey, ErrorStack> {
- unsafe {
- init();
- let len = cmp::min(der.len(), c_long::max_value() as usize) as c_long;
- cvt_p(ffi::d2i_ECPrivateKey(ptr::null_mut(), &mut der.as_ptr(), len)).map(EcKey)
- }
- }
-
private_key_from_pem!(EcKey, ffi::PEM_read_bio_ECPrivateKey);
+ private_key_from_der!(EcKey, ffi::d2i_ECPrivateKey);
}
#[cfg(test)]