diff options
Diffstat (limited to 'openssl/src/pkcs12.rs')
| -rw-r--r-- | openssl/src/pkcs12.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/openssl/src/pkcs12.rs b/openssl/src/pkcs12.rs index 20422a28..a840490c 100644 --- a/openssl/src/pkcs12.rs +++ b/openssl/src/pkcs12.rs @@ -11,7 +11,7 @@ use pkey::{PKey, PKeyRef}; use error::ErrorStack; use x509::X509; use stack::Stack; -use nid; +use nid::Nid; foreign_type_and_impl_send_sync! { type CType = ffi::PKCS12; @@ -75,8 +75,8 @@ impl Pkcs12 { ffi::init(); Pkcs12Builder { - nid_key: nid::UNDEF, //nid::PBE_WITHSHA1AND3_KEY_TRIPLEDES_CBC, - nid_cert: nid::UNDEF, //nid::PBE_WITHSHA1AND40BITRC2_CBC, + nid_key: Nid::UNDEF, //nid::PBE_WITHSHA1AND3_KEY_TRIPLEDES_CBC, + nid_cert: Nid::UNDEF, //nid::PBE_WITHSHA1AND40BITRC2_CBC, iter: ffi::PKCS12_DEFAULT_ITER, mac_iter: ffi::PKCS12_DEFAULT_ITER, ca: None, @@ -92,8 +92,8 @@ pub struct ParsedPkcs12 { } pub struct Pkcs12Builder { - nid_key: nid::Nid, - nid_cert: nid::Nid, + nid_key: Nid, + nid_cert: Nid, iter: c_int, mac_iter: c_int, ca: Option<Stack<X509>>, @@ -101,13 +101,13 @@ pub struct Pkcs12Builder { impl Pkcs12Builder { /// The encryption algorithm that should be used for the key - pub fn key_algorithm(&mut self, nid: nid::Nid) -> &mut Self { + pub fn key_algorithm(&mut self, nid: Nid) -> &mut Self { self.nid_key = nid; self } /// The encryption algorithm that should be used for the cert - pub fn cert_algorithm(&mut self, nid: nid::Nid) -> &mut Self { + pub fn cert_algorithm(&mut self, nid: Nid) -> &mut Self { self.nid_cert = nid; self } |