Merge pull request #487 from sfackler/update

Updates

19 files changed, 1082 insertions, 366 deletions

diff --git a/openssl/src/crypto/mod.rs b/openssl/src/crypto/mod.rs
deleted file mode 100644
index 0db23bcc..00000000
--- a/openssl/src/crypto/mod.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2011 Google Inc.
-//           2013 Jack Lloyd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-mod util;
-pub mod dsa;
-pub mod hash;
-pub mod memcmp;
-pub mod pkcs12;
-pub mod pkcs5;
-pub mod pkey;
-pub mod rand;
-pub mod rsa;
-pub mod sign;
-pub mod symm;
-
diff --git a/openssl/src/crypto/dsa.rs b/openssl/src/dsa.rs
index f5b0f4e4..46bdfaff 100644
--- a/openssl/src/crypto/dsa.rs
+++ b/openssl/src/dsa.rs
@@ -7,15 +7,15 @@ use libc::{c_int, c_char, c_void};
 use {cvt, cvt_p};
 use bn::BigNumRef;
 use bio::{MemBio, MemBioSlice};
-use crypto::util::{CallbackState, invoke_passwd_cb};
+use util::{CallbackState, invoke_passwd_cb};
 
 /// Builder for upfront DSA parameter generation
-pub struct DSAParams(*mut ffi::DSA);
+pub struct DsaParams(*mut ffi::DSA);
 
-impl DSAParams {
-    pub fn with_size(size: u32) -> Result<DSAParams, ErrorStack> {
+impl DsaParams {
+    pub fn with_size(size: u32) -> Result<DsaParams, ErrorStack> {
         unsafe {
-            let dsa = DSAParams(try!(cvt_p(ffi::DSA_new())));
+            let dsa = DsaParams(try!(cvt_p(ffi::DSA_new())));
             try!(cvt(ffi::DSA_generate_parameters_ex(dsa.0,
                                                      size as c_int,
                                                      ptr::null(),
@@ -28,17 +28,17 @@ impl DSAParams {
     }
 
     /// Generate a key pair from the initialized parameters
-    pub fn generate(self) -> Result<DSA, ErrorStack> {
+    pub fn generate(self) -> Result<Dsa, ErrorStack> {
         unsafe {
             try!(cvt(ffi::DSA_generate_key(self.0)));
-            let dsa = DSA(self.0);
+            let dsa = Dsa(self.0);
             ::std::mem::forget(self);
             Ok(dsa)
         }
     }
 }
 
-impl Drop for DSAParams {
+impl Drop for DsaParams {
     fn drop(&mut self) {
         unsafe {
             ffi::DSA_free(self.0);
@@ -46,9 +46,9 @@ impl Drop for DSAParams {
     }
 }
 
-pub struct DSA(*mut ffi::DSA);
+pub struct Dsa(*mut ffi::DSA);
 
-impl Drop for DSA {
+impl Drop for Dsa {
     fn drop(&mut self) {
         unsafe {
             ffi::DSA_free(self.0);
@@ -56,20 +56,20 @@ impl Drop for DSA {
     }
 }
 
-impl DSA {
-    pub unsafe fn from_ptr(dsa: *mut ffi::DSA) -> DSA {
-        DSA(dsa)
+impl Dsa {
+    pub unsafe fn from_ptr(dsa: *mut ffi::DSA) -> Dsa {
+        Dsa(dsa)
     }
 
     /// Generate a DSA key pair
     /// For more complicated key generation scenarios see the `DSAParams` type
-    pub fn generate(size: u32) -> Result<DSA, ErrorStack> {
-        let params = try!(DSAParams::with_size(size));
+    pub fn generate(size: u32) -> Result<Dsa, ErrorStack> {
+        let params = try!(DsaParams::with_size(size));
         params.generate()
     }
 
     /// Reads a DSA private key from PEM formatted data.
-    pub fn private_key_from_pem(buf: &[u8]) -> Result<DSA, ErrorStack> {
+    pub fn private_key_from_pem(buf: &[u8]) -> Result<Dsa, ErrorStack> {
         ffi::init();
         let mem_bio = try!(MemBioSlice::new(buf));
 
@@ -78,7 +78,7 @@ impl DSA {
                                                                  ptr::null_mut(),
                                                                  None,
                                                                  ptr::null_mut())));
-            Ok(DSA(dsa))
+            Ok(Dsa(dsa))
         }
     }
 
@@ -87,7 +87,7 @@ impl DSA {
     ///
     /// The callback will be passed the password buffer and should return the number of characters
     /// placed into the buffer.
-    pub fn private_key_from_pem_cb<F>(buf: &[u8], pass_cb: F) -> Result<DSA, ErrorStack>
+    pub fn private_key_from_pem_cb<F>(buf: &[u8], pass_cb: F) -> Result<Dsa, ErrorStack>
         where F: FnOnce(&mut [c_char]) -> usize
     {
         ffi::init();
@@ -100,7 +100,7 @@ impl DSA {
                                                                  ptr::null_mut(),
                                                                  Some(invoke_passwd_cb::<F>),
                                                                  cb_ptr)));
-            Ok(DSA(dsa))
+            Ok(Dsa(dsa))
         }
     }
 
@@ -120,7 +120,7 @@ impl DSA {
     }
 
     /// Reads an DSA public key from PEM formatted data.
-    pub fn public_key_from_pem(buf: &[u8]) -> Result<DSA, ErrorStack>
+    pub fn public_key_from_pem(buf: &[u8]) -> Result<Dsa, ErrorStack>
     {
         ffi::init();
 
@@ -130,7 +130,7 @@ impl DSA {
                                                               ptr::null_mut(),
                                                               None,
                                                               ptr::null_mut())));
-            Ok(DSA(dsa))
+            Ok(Dsa(dsa))
         }
     }
 
@@ -228,7 +228,7 @@ mod compat {
     }
 }
 
-impl fmt::Debug for DSA {
+impl fmt::Debug for Dsa {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "DSA")
     }
@@ -242,14 +242,14 @@ mod test {
 
     #[test]
     pub fn test_generate() {
-        DSA::generate(1024).unwrap();
+        Dsa::generate(1024).unwrap();
     }
 
     #[test]
     pub fn test_password() {
         let mut password_queried = false;
-        let key = include_bytes!("../../test/dsa-encrypted.pem");
-        DSA::private_key_from_pem_cb(key, |password| {
+        let key = include_bytes!("../test/dsa-encrypted.pem");
+        Dsa::private_key_from_pem_cb(key, |password| {
             password_queried = true;
             password[0] = b'm' as c_char;
             password[1] = b'y' as c_char;
diff --git a/openssl/src/crypto/hash.rs b/openssl/src/hash.rs
index ec265631..4093ab79 100644
--- a/openssl/src/crypto/hash.rs
+++ b/openssl/src/hash.rs
@@ -77,7 +77,7 @@ use self::State::*;
 /// Calculate a hash in one go.
 ///
 /// ```
-/// use openssl::crypto::hash::{hash, MessageDigest};
+/// use openssl::hash::{hash, MessageDigest};
 ///
 /// let data = b"\x42\xF4\x97\xE0";
 /// let spec = b"\x7c\x43\x0f\x17\x8a\xef\xdf\x14\x87\xfe\xe7\x14\x4e\x96\x41\xe2";
@@ -88,7 +88,7 @@ use self::State::*;
 /// Use the `Write` trait to supply the input in chunks.
 ///
 /// ```
-/// use openssl::crypto::hash::{Hasher, MessageDigest};
+/// use openssl::hash::{Hasher, MessageDigest};
 ///
 /// let data = [b"\x42\xF4", b"\x97\xE0"];
 /// let spec = b"\x7c\x43\x0f\x17\x8a\xef\xdf\x14\x87\xfe\xe7\x14\x4e\x96\x41\xe2";
@@ -103,7 +103,7 @@ use self::State::*;
 ///
 /// Don't actually use MD5 and SHA-1 hashes, they're not secure anymore.
 ///
-/// Don't ever hash passwords, use `crypto::pkcs5` or bcrypt/scrypt instead.
+/// Don't ever hash passwords, use the functions in the `pkcs5` module or bcrypt/scrypt instead.
 pub struct Hasher {
     ctx: *mut ffi::EVP_MD_CTX,
     md: *const ffi::EVP_MD,
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 10f450dd..9ed02207 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -22,17 +22,27 @@ use error::ErrorStack;
 
 mod macros;
 
-pub mod asn1;
 mod bio;
+mod opaque;
+mod util;
+pub mod asn1;
 pub mod bn;
-pub mod crypto;
 pub mod dh;
+pub mod dsa;
 pub mod error;
+pub mod hash;
+pub mod memcmp;
 pub mod nid;
+pub mod pkcs12;
+pub mod pkcs5;
+pub mod pkey;
+pub mod rand;
+pub mod rsa;
+pub mod sign;
 pub mod ssl;
+pub mod symm;
 pub mod version;
 pub mod x509;
-mod opaque;
 
 pub fn cvt_p<T>(r: *mut T) -> Result<*mut T, ErrorStack> {
     if r.is_null() {
diff --git a/openssl/src/crypto/memcmp.rs b/openssl/src/memcmp.rs
index cf08bdb5..0a7124bd 100644
--- a/openssl/src/crypto/memcmp.rs
+++ b/openssl/src/memcmp.rs
@@ -6,7 +6,7 @@ use ffi;
 /// This operation takes an amount of time dependent on the length of the two
 /// arrays given, but is independent of the contents of a and b.
 ///
-/// # Failure
+/// # Panics
 ///
 /// This function will panic the current task if `a` and `b` do not have the same
 /// length.
diff --git a/openssl/src/nid.rs b/openssl/src/nid.rs
index 874d4a6f..b58e3a3d 100644
--- a/openssl/src/nid.rs
+++ b/openssl/src/nid.rs
@@ -1,196 +1,930 @@
-#[allow(non_camel_case_types)]
-#[derive(Copy, Clone, Hash, PartialEq, Eq)]
-#[repr(usize)]
-pub enum Nid {
-    Undefined, // 0
-    Rsadsi,
-    Pkcs,
-    MD2,
-    MD4,
-    MD5,
-    RC4,
-    RsaEncryption,
-    RSA_MD2,
-    RSA_MD5,
-    PBE_MD2_DES, // 10
-    X500,
-    x509,
-    CN,
-    C,
-    L,
-    ST,
-    O,
-    OU,
-    RSA,
-    Pkcs7, // 20
-    Pkcs7_data,
-    Pkcs7_signedData,
-    Pkcs7_envelopedData,
-    Pkcs7_signedAndEnvelopedData,
-    Pkcs7_digestData,
-    Pkcs7_encryptedData,
-    Pkcs3,
-    DhKeyAgreement,
-    DES_ECB,
-    DES_CFB, // 30
-    DES_CBC,
-    DES_EDE,
-    DES_EDE3,
-    IDEA_CBC,
-    IDEA_CFB,
-    IDEA_ECB,
-    RC2_CBC,
-    RC2_ECB,
-    RC2_CFB,
-    RC2_OFB, // 40
-    SHA,
-    RSA_SHA,
-    DES_EDE_CBC,
-    DES_EDE3_CBC,
-    DES_OFB,
-    IDEA_OFB,
-    Pkcs9,
-    Email,
-    UnstructuredName,
-    ContentType, // 50
-    MessageDigest,
-    SigningTime,
-    CounterSignature,
-    ChallengePassword,
-    UnstructuredAddress,
-    ExtendedCertificateAttributes,
-    Netscape,
-    NetscapeCertExtention,
-    NetscapeDatatype,
-    DES_EDE_CFB64, // 60
-    DES_EDE3_CFB64,
-    DES_EDE_OFB64,
-    DES_EDE3_OFB64,
-    SHA1,
-    RSA_SHA1,
-    DSA_SHA,
-    DSA_OLD,
-    PBE_SHA1_RC2_64,
-    PBKDF2,
-    DSA_SHA1_OLD, // 70
-    NetscapeCertType,
-    NetscapeBaseUrl,
-    NetscapeRevocationUrl,
-    NetscapeCARevocationUrl,
-    NetscapeRenewalUrl,
-    NetscapeCAPolicyUrl,
-    NetscapeSSLServerName,
-    NetscapeComment,
-    NetscapeCertSequence,
-    DESX_CBC, // 80
-    ID_CE,
-    SubjectKeyIdentifier,
-    KeyUsage,
-    PrivateKeyUsagePeriod,
-    SubjectAltName,
-    IssuerAltName,
-    BasicConstraints,
-    CrlNumber,
-    CertificatePolicies,
-    AuthorityKeyIdentifier, // 90
-    BF_CBC,
-    BF_ECB,
-    BF_CFB,
-    BF_OFB,
-    MDC2,
-    RSA_MDC2,
-    RC4_40,
-    RC2_40_CBC,
-    G,
-    S, // 100
-    I,
-    /// uniqueIdentifier
-    UID,
-    CrlDistributionPoints,
-    RSA_NP_MD5,
-    SN,
-    T,
-    D,
-    CAST5_CBC,
-    CAST5_ECB,
-    CAST5_CFB, // 110
-    CAST5_OFB,
-    PbeWithMD5AndCast5CBC,
-    DSA_SHA1,
-    MD5_SHA1,
-    RSA_SHA1_2,
-    DSA,
-    RIPEMD160,
-    // 118 missing
-    RSA_RIPEMD160 = 119,
-    RC5_CBC, // 120
-    RC5_ECB,
-    RC5_CFB,
-    RC5_OFB,
-    RLE,
-    ZLIB,
-    ExtendedKeyUsage,
-    PKIX,
-    ID_KP,
-    ServerAuth,
-    ClientAuth, // 130
-    CodeSigning,
-    EmailProtection,
-    TimeStamping,
-    MsCodeInd,
-    MsCodeCom,
-    MsCtlSigh,
-    MsSGC,
-    MsEFS,
-    NsSGC,
-    DeltaCRL, // 140
-    CRLReason,
-    InvalidityDate,
-    SXNetID,
-    PBE_SHA1_RC4_128,
-    PBE_SHA1_RC4_40,
-    PBE_SHA1_3DES,
-    PBE_SHA1_2DES,
-    PBE_SHA1_RC2_128,
-    PBE_SHA1_RC2_40,
-    KeyBag, // 150
-    Pkcs8ShroudedKeyBag,
-    CertBag,
-    CrlBag,
-    SecretBag,
-    SafeContentsBag,
-    FriendlyName,
-    LocalKeyID,
-    X509Certificate,
-    SdsiCertificate,
-    X509Crl, // 160
-    PBES2,
-    PBMAC1,
-    HmacWithSha1,
-    ID_QT_CPS,
-    ID_QT_UNOTICE,
-    RC2_64_CBC,
-    SMIMECaps,
-    PBE_MD2_RC2_64,
-    PBE_MD5_RC2_64,
-    PBE_SHA1_DES,
-    MicrosoftExtensionRequest,
-    ExtensionRequest,
-    Name,
-    DnQualifier,
-    IdPe,
-    IdAd,
-    AuthorityInfoAccess,
-    OCSP,
-    CaIssuers,
-    OCSPSigning, // 180
+use ffi;
+use libc::c_int;
 
-    // 181 and up are from openssl's obj_mac.h
-    /// Shown as UID in cert subject
-    UserId = 458,
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub struct Nid(c_int);
 
-    SHA256 = 672,
-    SHA384,
-    SHA512,
-    SHA224,
+#[allow(non_snake_case)]
+impl Nid {
+    pub fn from_raw(raw: c_int) -> Nid {
+        Nid(raw)
+    }
+
+    pub fn as_raw(&self) -> c_int {
+        self.0
+    }
 }
+
+pub const UNDEF: Nid = Nid(ffi::NID_undef);
+pub const ITU_T: Nid = Nid(ffi::NID_itu_t);
+pub const CCITT: Nid = Nid(ffi::NID_ccitt);
+pub const ISO: Nid = Nid(ffi::NID_iso);
+pub const JOINT_ISO_ITU_T: Nid = Nid(ffi::NID_joint_iso_itu_t);
+pub const JOINT_ISO_CCITT: Nid = Nid(ffi::NID_joint_iso_ccitt);
+pub const MEMBER_BODY: Nid = Nid(ffi::NID_member_body);
+pub const IDENTIFIED_ORGANIZATION: Nid = Nid(ffi::NID_identified_organization);
+pub const HMAC_MD5: Nid = Nid(ffi::NID_hmac_md5);
+pub const HMAC_SHA1: Nid = Nid(ffi::NID_hmac_sha1);
+pub const CERTICOM_ARC: Nid = Nid(ffi::NID_certicom_arc);
+pub const INTERNATIONAL_ORGANIZATIONS: Nid = Nid(ffi::NID_international_organizations);
+pub const WAP: Nid = Nid(ffi::NID_wap);
+pub const WAP_WSG: Nid = Nid(ffi::NID_wap_wsg);
+pub const SELECTED_ATTRIBUTE_TYPES: Nid = Nid(ffi::NID_selected_attribute_types);
+pub const CLEARANCE: Nid = Nid(ffi::NID_clearance);
+pub const ISO_US: Nid = Nid(ffi::NID_ISO_US);
+pub const X9_57: Nid = Nid(ffi::NID_X9_57);
+pub const X9CM: Nid = Nid(ffi::NID_X9cm);
+pub const DSA: Nid = Nid(ffi::NID_dsa);
+pub const DSAWITHSHA1: Nid = Nid(ffi::NID_dsaWithSHA1);
+pub const ANSI_X9_62: Nid = Nid(ffi::NID_ansi_X9_62);
+pub const X9_62_PRIME_FIELD: Nid = Nid(ffi::NID_X9_62_prime_field);
+pub const X9_62_CHARACTERISTIC_TWO_FIELD: Nid = Nid(ffi::NID_X9_62_characteristic_two_field);
+pub const X9_62_ID_CHARACTERISTIC_TWO_BASIS: Nid = Nid(ffi::NID_X9_62_id_characteristic_two_basis);
+pub const X9_62_ONBASIS: Nid = Nid(ffi::NID_X9_62_onBasis);
+pub const X9_62_TPBASIS: Nid = Nid(ffi::NID_X9_62_tpBasis);
+pub const X9_62_PPBASIS: Nid = Nid(ffi::NID_X9_62_ppBasis);
+pub const X9_62_ID_ECPUBLICKEY: Nid = Nid(ffi::NID_X9_62_id_ecPublicKey);
+pub const X9_62_C2PNB163V1: Nid = Nid(ffi::NID_X9_62_c2pnb163v1);
+pub const X9_62_C2PNB163V2: Nid = Nid(ffi::NID_X9_62_c2pnb163v2);
+pub const X9_62_C2PNB163V3: Nid = Nid(ffi::NID_X9_62_c2pnb163v3);
+pub const X9_62_C2PNB176V1: Nid = Nid(ffi::NID_X9_62_c2pnb176v1);
+pub const X9_62_C2TNB191V1: Nid = Nid(ffi::NID_X9_62_c2tnb191v1);
+pub const X9_62_C2TNB191V2: Nid = Nid(ffi::NID_X9_62_c2tnb191v2);
+pub const X9_62_C2TNB191V3: Nid = Nid(ffi::NID_X9_62_c2tnb191v3);
+pub const X9_62_C2ONB191V4: Nid = Nid(ffi::NID_X9_62_c2onb191v4);
+pub const X9_62_C2ONB191V5: Nid = Nid(ffi::NID_X9_62_c2onb191v5);
+pub const X9_62_C2PNB208W1: Nid = Nid(ffi::NID_X9_62_c2pnb208w1);
+pub const X9_62_C2TNB239V1: Nid = Nid(ffi::NID_X9_62_c2tnb239v1);
+pub const X9_62_C2TNB239V2: Nid = Nid(ffi::NID_X9_62_c2tnb239v2);
+pub const X9_62_C2TNB239V3: Nid = Nid(ffi::NID_X9_62_c2tnb239v3);
+pub const X9_62_C2ONB239V4: Nid = Nid(ffi::NID_X9_62_c2onb239v4);
+pub const X9_62_C2ONB239V5: Nid = Nid(ffi::NID_X9_62_c2onb239v5);
+pub const X9_62_C2PNB272W1: Nid = Nid(ffi::NID_X9_62_c2pnb272w1);
+pub const X9_62_C2PNB304W1: Nid = Nid(ffi::NID_X9_62_c2pnb304w1);
+pub const X9_62_C2TNB359V1: Nid = Nid(ffi::NID_X9_62_c2tnb359v1);
+pub const X9_62_C2PNB368W1: Nid = Nid(ffi::NID_X9_62_c2pnb368w1);
+pub const X9_62_C2TNB431R1: Nid = Nid(ffi::NID_X9_62_c2tnb431r1);
+pub const X9_62_PRIME192V1: Nid = Nid(ffi::NID_X9_62_prime192v1);
+pub const X9_62_PRIME192V2: Nid = Nid(ffi::NID_X9_62_prime192v2);
+pub const X9_62_PRIME192V3: Nid = Nid(ffi::NID_X9_62_prime192v3);
+pub const X9_62_PRIME239V1: Nid = Nid(ffi::NID_X9_62_prime239v1);
+pub const X9_62_PRIME239V2: Nid = Nid(ffi::NID_X9_62_prime239v2);
+pub const X9_62_PRIME239V3: Nid = Nid(ffi::NID_X9_62_prime239v3);
+pub const X9_62_PRIME256V1: Nid = Nid(ffi::NID_X9_62_prime256v1);
+pub const ECDSA_WITH_SHA1: Nid = Nid(ffi::NID_ecdsa_with_SHA1);
+pub const ECDSA_WITH_RECOMMENDED: Nid = Nid(ffi::NID_ecdsa_with_Recommended);
+pub const ECDSA_WITH_SPECIFIED: Nid = Nid(ffi::NID_ecdsa_with_Specified);
+pub const ECDSA_WITH_SHA224: Nid = Nid(ffi::NID_ecdsa_with_SHA224);
+pub const ECDSA_WITH_SHA256: Nid = Nid(ffi::NID_ecdsa_with_SHA256);
+pub const ECDSA_WITH_SHA384: Nid = Nid(ffi::NID_ecdsa_with_SHA384);
+pub const ECDSA_WITH_SHA512: Nid = Nid(ffi::NID_ecdsa_with_SHA512);
+pub const SECP112R1: Nid = Nid(ffi::NID_secp112r1);
+pub const SECP112R2: Nid = Nid(ffi::NID_secp112r2);
+pub const SECP128R1: Nid = Nid(ffi::NID_secp128r1);
+pub const SECP128R2: Nid = Nid(ffi::NID_secp128r2);
+pub const SECP160K1: Nid = Nid(ffi::NID_secp160k1);
+pub const SECP160R1: Nid = Nid(ffi::NID_secp160r1);
+pub const SECP160R2: Nid = Nid(ffi::NID_secp160r2);
+pub const SECP192K1: Nid = Nid(ffi::NID_secp192k1);
+pub const SECP224K1: Nid = Nid(ffi::NID_secp224k1);
+pub const SECP224R1: Nid = Nid(ffi::NID_secp224r1);
+pub const SECP256K1: Nid = Nid(ffi::NID_secp256k1);
+pub const SECP384R1: Nid = Nid(ffi::NID_secp384r1);
+pub const SECP521R1: Nid = Nid(ffi::NID_secp521r1);
+pub const SECT113R1: Nid = Nid(ffi::NID_sect113r1);
+pub const SECT113R2: Nid = Nid(ffi::NID_sect113r2);
+pub const SECT131R1: Nid = Nid(ffi::NID_sect131r1);
+pub const SECT131R2: Nid = Nid(ffi::NID_sect131r2);
+pub const SECT163K1: Nid = Nid(ffi::NID_sect163k1);
+pub const SECT163R1: Nid = Nid(ffi::NID_sect163r1);
+pub const SECT163R2: Nid = Nid(ffi::NID_sect163r2);
+pub const SECT193R1: Nid = Nid(ffi::NID_sect193r1);
+pub const SECT193R2: Nid = Nid(ffi::NID_sect193r2);
+pub const SECT233K1: Nid = Nid(ffi::NID_sect233k1);
+pub const SECT233R1: Nid = Nid(ffi::NID_sect233r1);
+pub const SECT239K1: Nid = Nid(ffi::NID_sect239k1);
+pub const SECT283K1: Nid = Nid(ffi::NID_sect283k1);
+pub const SECT283R1: Nid = Nid(ffi::NID_sect283r1);
+pub const SECT409K1: Nid = Nid(ffi::NID_sect409k1);
+pub const SECT409R1: Nid = Nid(ffi::NID_sect409r1);
+pub const SECT571K1: Nid = Nid(ffi::NID_sect571k1);
+pub const SECT571R1: Nid = Nid(ffi::NID_sect571r1);
+pub const WAP_WSG_IDM_ECID_WTLS1: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls1);
+pub const WAP_WSG_IDM_ECID_WTLS3: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls3);
+pub const WAP_WSG_IDM_ECID_WTLS4: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls4);
+pub const WAP_WSG_IDM_ECID_WTLS5: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls5);
+pub const WAP_WSG_IDM_ECID_WTLS6: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls6);
+pub const WAP_WSG_IDM_ECID_WTLS7: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls7);
+pub const WAP_WSG_IDM_ECID_WTLS8: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls8);
+pub const WAP_WSG_IDM_ECID_WTLS9: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls9);
+pub const WAP_WSG_IDM_ECID_WTLS10: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls10);
+pub const WAP_WSG_IDM_ECID_WTLS11: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls11);
+pub const WAP_WSG_IDM_ECID_WTLS12: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls12);
+pub const CAST5_CBC: Nid = Nid(ffi::NID_cast5_cbc);
+pub const CAST5_ECB: Nid = Nid(ffi::NID_cast5_ecb);
+pub const CAST5_CFB64: Nid = Nid(ffi::NID_cast5_cfb64);
+pub const CAST5_OFB64: Nid = Nid(ffi::NID_cast5_ofb64);
+pub const PBEWITHMD5ANDCAST5_CBC: Nid = Nid(ffi::NID_pbeWithMD5AndCast5_CBC);
+pub const ID_PASSWORDBASEDMAC: Nid = Nid(ffi::NID_id_PasswordBasedMAC);
+pub const ID_DHBASEDMAC: Nid = Nid(ffi::NID_id_DHBasedMac);
+pub const RSADSI: Nid = Nid(ffi::NID_rsadsi);
+pub const PKCS: Nid = Nid(ffi::NID_pkcs);
+pub const PKCS1: Nid = Nid(ffi::NID_pkcs1);
+pub const RSAENCRYPTION: Nid = Nid(ffi::NID_rsaEncryption);
+pub const MD2WITHRSAENCRYPTION: Nid = Nid(ffi::NID_md2WithRSAEncryption);
+pub const MD4WITHRSAENCRYPTION: Nid = Nid(ffi::NID_md4WithRSAEncryption);
+pub const MD5WITHRSAENCRYPTION: Nid = Nid(ffi::NID_md5WithRSAEncryption);
+pub const SHA1WITHRSAENCRYPTION: Nid = Nid(ffi::NID_sha1WithRSAEncryption);
+pub const RSAESOAEP: Nid = Nid(ffi::NID_rsaesOaep);
+pub const MGF1: Nid = Nid(ffi::NID_mgf1);
+pub const RSASSAPSS: Nid = Nid(ffi::NID_rsassaPss);
+pub const SHA256WITHRSAENCRYPTION: Nid = Nid(ffi::NID_sha256WithRSAEncryption);
+pub const SHA384WITHRSAENCRYPTION: Nid = Nid(ffi::NID_sha384WithRSAEncryption);
+pub const SHA512WITHRSAENCRYPTION: Nid = Nid(ffi::NID_sha512WithRSAEncryption);
+pub const SHA224WITHRSAENCRYPTION: Nid = Nid(ffi::NID_sha224WithRSAEncryption);
+pub const PKCS3: Nid = Nid(ffi::NID_pkcs3);
+pub const DHKEYAGREEMENT: Nid = Nid(ffi::NID_dhKeyAgreement);
+pub const PKCS5: Nid = Nid(ffi::NID_pkcs5);
+pub const PBEWITHMD2ANDDES_CBC: Nid = Nid(ffi::NID_pbeWithMD2AndDES_CBC);
+pub const PBEWITHMD5ANDDES_CBC: Nid = Nid(ffi::NID_pbeWithMD5AndDES_CBC);
+pub const PBEWITHMD2ANDRC2_CBC: Nid = Nid(ffi::NID_pbeWithMD2AndRC2_CBC);
+pub const PBEWITHMD5ANDRC2_CBC: Nid = Nid(ffi::NID_pbeWithMD5AndRC2_CBC);
+pub const PBEWITHSHA1ANDDES_CBC: Nid = Nid(ffi::NID_pbeWithSHA1AndDES_CBC);
+pub const PBEWITHSHA1ANDRC2_CBC: Nid = Nid(ffi::NID_pbeWithSHA1AndRC2_CBC);
+pub const ID_PBKDF2: Nid = Nid(ffi::NID_id_pbkdf2);
+pub const PBES2: Nid = Nid(ffi::NID_pbes2);
+pub const PBMAC1: Nid = Nid(ffi::NID_pbmac1);
+pub const PKCS7: Nid = Nid(ffi::NID_pkcs7);
+pub const PKCS7_DATA: Nid = Nid(ffi::NID_pkcs7_data);
+pub const PKCS7_SIGNED: Nid = Nid(ffi::NID_pkcs7_signed);
+pub const PKCS7_ENVELOPED: Nid = Nid(ffi::NID_pkcs7_enveloped);
+pub const PKCS7_SIGNEDANDENVELOPED: Nid = Nid(ffi::NID_pkcs7_signedAndEnveloped);
+pub const PKCS7_DIGEST: Nid = Nid(ffi::NID_pkcs7_digest);
+pub const PKCS7_ENCRYPTED: Nid = Nid(ffi::NID_pkcs7_encrypted);
+pub const PKCS9: Nid = Nid(ffi::NID_pkcs9);
+pub const PKCS9_EMAILADDRESS: Nid = Nid(ffi::NID_pkcs9_emailAddress);
+pub const PKCS9_UNSTRUCTUREDNAME: Nid = Nid(ffi::NID_pkcs9_unstructuredName);
+pub const PKCS9_CONTENTTYPE: Nid = Nid(ffi::NID_pkcs9_contentType);
+pub const PKCS9_MESSAGEDIGEST: Nid = Nid(ffi::NID_pkcs9_messageDigest);
+pub const PKCS9_SIGNINGTIME: Nid = Nid(ffi::NID_pkcs9_signingTime);
+pub const PKCS9_COUNTERSIGNATURE: Nid = Nid(ffi::NID_pkcs9_countersignature);
+pub const PKCS9_CHALLENGEPASSWORD: Nid = Nid(ffi::NID_pkcs9_challengePassword);
+pub const PKCS9_UNSTRUCTUREDADDRESS: Nid = Nid(ffi::NID_pkcs9_unstructuredAddress);
+pub const PKCS9_EXTCERTATTRIBUTES: Nid = Nid(ffi::NID_pkcs9_extCertAttributes);
+pub const EXT_REQ: Nid = Nid(ffi::NID_ext_req);
+pub const SMIMECAPABILITIES: Nid = Nid(ffi::NID_SMIMECapabilities);
+pub const SMIME: Nid = Nid(ffi::NID_SMIME);
+pub const ID_SMIME_MOD: Nid = Nid(ffi::NID_id_smime_mod);
+pub const ID_SMIME_CT: Nid = Nid(ffi::NID_id_smime_ct);
+pub const ID_SMIME_AA: Nid = Nid(ffi::NID_id_smime_aa);
+pub const ID_SMIME_ALG: Nid = Nid(ffi::NID_id_smime_alg);
+pub const ID_SMIME_CD: Nid = Nid(ffi::NID_id_smime_cd);
+pub const ID_SMIME_SPQ: Nid = Nid(ffi::NID_id_smime_spq);
+pub const ID_SMIME_CTI: Nid = Nid(ffi::NID_id_smime_cti);
+pub const ID_SMIME_MOD_CMS: Nid = Nid(ffi::NID_id_smime_mod_cms);
+pub const ID_SMIME_MOD_ESS: Nid = Nid(ffi::NID_id_smime_mod_ess);
+pub const ID_SMIME_MOD_OID: Nid = Nid(ffi::NID_id_smime_mod_oid);
+pub const ID_SMIME_MOD_MSG_V3: Nid = Nid(ffi::NID_id_smime_mod_msg_v3);
+pub const ID_SMIME_MOD_ETS_ESIGNATURE_88: Nid = Nid(ffi::NID_id_smime_mod_ets_eSignature_88);
+pub const ID_SMIME_MOD_ETS_ESIGNATURE_97: Nid = Nid(ffi::NID_id_smime_mod_ets_eSignature_97);
+pub const ID_SMIME_MOD_ETS_ESIGPOLICY_88: Nid = Nid(ffi::NID_id_smime_mod_ets_eSigPolicy_88);
+pub const ID_SMIME_MOD_ETS_ESIGPOLICY_97: Nid = Nid(ffi::NID_id_smime_mod_ets_eSigPolicy_97);
+pub const ID_SMIME_CT_RECEIPT: Nid = Nid(ffi::NID_id_smime_ct_receipt);
+pub const ID_SMIME_CT_AUTHDATA: Nid = Nid(ffi::NID_id_smime_ct_authData);
+pub const ID_SMIME_CT_PUBLISHCERT: Nid = Nid(ffi::NID_id_smime_ct_publishCert);
+pub const ID_SMIME_CT_TSTINFO: Nid = Nid(ffi::NID_id_smime_ct_TSTInfo);
+pub const ID_SMIME_CT_TDTINFO: Nid = Nid(ffi::NID_id_smime_ct_TDTInfo);
+pub const ID_SMIME_CT_CONTENTINFO: Nid = Nid(ffi::NID_id_smime_ct_contentInfo);
+pub const ID_SMIME_CT_DVCSREQUESTDATA: Nid = Nid(ffi::NID_id_smime_ct_DVCSRequestData);
+pub const ID_SMIME_CT_DVCSRESPONSEDATA: Nid = Nid(ffi::NID_id_smime_ct_DVCSResponseData);
+pub const ID_SMIME_CT_COMPRESSEDDATA: Nid = Nid(ffi::NID_id_smime_ct_compressedData);
+pub const ID_CT_ASCIITEXTWITHCRLF: Nid = Nid(ffi::NID_id_ct_asciiTextWithCRLF);
+pub const ID_SMIME_AA_RECEIPTREQUEST: Nid = Nid(ffi::NID_id_smime_aa_receiptRequest);
+pub const ID_SMIME_AA_SECURITYLABEL: Nid = Nid(ffi::NID_id_smime_aa_securityLabel);
+pub const ID_SMIME_AA_MLEXPANDHISTORY: Nid = Nid(ffi::NID_id_smime_aa_mlExpandHistory);
+pub const ID_SMIME_AA_CONTENTHINT: Nid = Nid(ffi::NID_id_smime_aa_contentHint);
+pub const ID_SMIME_AA_MSGSIGDIGEST: Nid = Nid(ffi::NID_id_smime_aa_msgSigDigest);
+pub const ID_SMIME_AA_ENCAPCONTENTTYPE: Nid = Nid(ffi::NID_id_smime_aa_encapContentType);
+pub const ID_SMIME_AA_CONTENTIDENTIFIER: Nid = Nid(ffi::NID_id_smime_aa_contentIdentifier);
+pub const ID_SMIME_AA_MACVALUE: Nid = Nid(ffi::NID_id_smime_aa_macValue);
+pub const ID_SMIME_AA_EQUIVALENTLABELS: Nid = Nid(ffi::NID_id_smime_aa_equivalentLabels);
+pub const ID_SMIME_AA_CONTENTREFERENCE: Nid = Nid(ffi::NID_id_smime_aa_contentReference);
+pub const ID_SMIME_AA_ENCRYPKEYPREF: Nid = Nid(ffi::NID_id_smime_aa_encrypKeyPref);
+pub const ID_SMIME_AA_SIGNINGCERTIFICATE: Nid = Nid(ffi::NID_id_smime_aa_signingCertificate);
+pub const ID_SMIME_AA_SMIMEENCRYPTCERTS: Nid = Nid(ffi::NID_id_smime_aa_smimeEncryptCerts);
+pub const ID_SMIME_AA_TIMESTAMPTOKEN: Nid = Nid(ffi::NID_id_smime_aa_timeStampToken);
+pub const ID_SMIME_AA_ETS_SIGPOLICYID: Nid = Nid(ffi::NID_id_smime_aa_ets_sigPolicyId);
+pub const ID_SMIME_AA_ETS_COMMITMENTTYPE: Nid = Nid(ffi::NID_id_smime_aa_ets_commitmentType);
+pub const ID_SMIME_AA_ETS_SIGNERLOCATION: Nid = Nid(ffi::NID_id_smime_aa_ets_signerLocation);
+pub const ID_SMIME_AA_ETS_SIGNERATTR: Nid = Nid(ffi::NID_id_smime_aa_ets_signerAttr);
+pub const ID_SMIME_AA_ETS_OTHERSIGCERT: Nid = Nid(ffi::NID_id_smime_aa_ets_otherSigCert);
+pub const ID_SMIME_AA_ETS_CONTENTTIMESTAMP: Nid = Nid(ffi::NID_id_smime_aa_ets_contentTimestamp);
+pub const ID_SMIME_AA_ETS_CERTIFICATEREFS: Nid = Nid(ffi::NID_id_smime_aa_ets_CertificateRefs);
+pub const ID_SMIME_AA_ETS_REVOCATIONREFS: Nid = Nid(ffi::NID_id_smime_aa_ets_RevocationRefs);
+pub const ID_SMIME_AA_ETS_CERTVALUES: Nid = Nid(ffi::NID_id_smime_aa_ets_certValues);
+pub const ID_SMIME_AA_ETS_REVOCATIONVALUES: Nid = Nid(ffi::NID_id_smime_aa_ets_revocationValues);
+pub const ID_SMIME_AA_ETS_ESCTIMESTAMP: Nid = Nid(ffi::NID_id_smime_aa_ets_escTimeStamp);
+pub const ID_SMIME_AA_ETS_CERTCRLTIMESTAMP: Nid = Nid(ffi::NID_id_smime_aa_ets_certCRLTimestamp);
+pub const ID_SMIME_AA_ETS_ARCHIVETIMESTAMP: Nid = Nid(ffi::NID_id_smime_aa_ets_archiveTimeStamp);
+pub const ID_SMIME_AA_SIGNATURETYPE: Nid = Nid(ffi::NID_id_smime_aa_signatureType);
+pub const ID_SMIME_AA_DVCS_DVC: Nid = Nid(ffi::NID_id_smime_aa_dvcs_dvc);
+pub const ID_SMIME_ALG_ESDHWITH3DES: Nid = Nid(ffi::NID_id_smime_alg_ESDHwith3DES);
+pub const ID_SMIME_ALG_ESDHWITHRC2: Nid = Nid(ffi::NID_id_smime_alg_ESDHwithRC2);
+pub const ID_SMIME_ALG_3DESWRAP: Nid = Nid(ffi::NID_id_smime_alg_3DESwrap);
+pub const ID_SMIME_ALG_RC2WRAP: Nid = Nid(ffi::NID_id_smime_alg_RC2wrap);
+pub const ID_SMIME_ALG_ESDH: Nid = Nid(ffi::NID_id_smime_alg_ESDH);
+pub const ID_SMIME_ALG_CMS3DESWRAP: Nid = Nid(ffi::NID_id_smime_alg_CMS3DESwrap);
+pub const ID_SMIME_ALG_CMSRC2WRAP: Nid = Nid(ffi::NID_id_smime_alg_CMSRC2wrap);
+pub const ID_ALG_PWRI_KEK: Nid = Nid(ffi::NID_id_alg_PWRI_KEK);
+pub const ID_SMIME_CD_LDAP: Nid = Nid(ffi::NID_id_smime_cd_ldap);
+pub const ID_SMIME_SPQ_ETS_SQT_URI: Nid = Nid(ffi::NID_id_smime_spq_ets_sqt_uri);
+pub const ID_SMIME_SPQ_ETS_SQT_UNOTICE: Nid = Nid(ffi::NID_id_smime_spq_ets_sqt_unotice);
+pub const ID_SMIME_CTI_ETS_PROOFOFORIGIN: Nid = Nid(ffi::NID_id_smime_cti_ets_proofOfOrigin);
+pub const ID_SMIME_CTI_ETS_PROOFOFRECEIPT: Nid = Nid(ffi::NID_id_smime_cti_ets_proofOfReceipt);
+pub const ID_SMIME_CTI_ETS_PROOFOFDELIVERY: Nid = Nid(ffi::NID_id_smime_cti_ets_proofOfDelivery);
+pub const ID_SMIME_CTI_ETS_PROOFOFSENDER: Nid = Nid(ffi::NID_id_smime_cti_ets_proofOfSender);
+pub const ID_SMIME_CTI_ETS_PROOFOFAPPROVAL: Nid = Nid(ffi::NID_id_smime_cti_ets_proofOfApproval);
+pub const ID_SMIME_CTI_ETS_PROOFOFCREATION: Nid = Nid(ffi::NID_id_smime_cti_ets_proofOfCreation);
+pub const FRIENDLYNAME: Nid = Nid(ffi::NID_friendlyName);
+pub const LOCALKEYID: Nid = Nid(ffi::NID_localKeyID);
+pub const MS_CSP_NAME: Nid = Nid(ffi::NID_ms_csp_name);
+pub const LOCALKEYSET: Nid = Nid(ffi::NID_LocalKeySet);
+pub const X509CERTIFICATE: Nid = Nid(ffi::NID_x509Certificate);
+pub const SDSICERTIFICATE: Nid = Nid(ffi::NID_sdsiCertificate);
+pub const X509CRL: Nid = Nid(ffi::NID_x509Crl);
+pub const PBE_WITHSHA1AND128BITRC4: Nid = Nid(ffi::NID_pbe_WithSHA1And128BitRC4);
+pub const PBE_WITHSHA1AND40BITRC4: Nid = Nid(ffi::NID_pbe_WithSHA1And40BitRC4);
+pub const PBE_WITHSHA1AND3_KEY_TRIPLEDES_CBC: Nid = Nid(ffi::NID_pbe_WithSHA1And3_Key_TripleDES_CBC);
+pub const PBE_WITHSHA1AND2_KEY_TRIPLEDES_CBC: Nid = Nid(ffi::NID_pbe_WithSHA1And2_Key_TripleDES_CBC);
+pub const PBE_WITHSHA1AND128BITRC2_CBC: Nid = Nid(ffi::NID_pbe_WithSHA1And128BitRC2_CBC);
+pub const PBE_WITHSHA1AND40BITRC2_CBC: Nid = Nid(ffi::NID_pbe_WithSHA1And40BitRC2_CBC);
+pub const KEYBAG: Nid = Nid(ffi::NID_keyBag);
+pub const PKCS8SHROUDEDKEYBAG: Nid = Nid(ffi::NID_pkcs8ShroudedKeyBag);
+pub const CERTBAG: Nid = Nid(ffi::NID_certBag);
+pub const CRLBAG: Nid = Nid(ffi::NID_crlBag);
+pub const SECRETBAG: Nid = Nid(ffi::NID_secretBag);
+pub const SAFECONTENTSBAG: Nid = Nid(ffi::NID_safeContentsBag);
+pub const MD2: Nid = Nid(ffi::NID_md2);
+pub const MD4: Nid = Nid(ffi::NID_md4);
+pub const MD5: Nid = Nid(ffi::NID_md5);
+pub const MD5_SHA1: Nid = Nid(ffi::NID_md5_sha1);
+pub const HMACWITHMD5: Nid = Nid(ffi::NID_hmacWithMD5);
+pub const HMACWITHSHA1: Nid = Nid(ffi::NID_hmacWithSHA1);
+pub const HMACWITHSHA224: Nid = Nid(ffi::NID_hmacWithSHA224);
+pub const HMACWITHSHA256: Nid = Nid(ffi::NID_hmacWithSHA256);
+pub const HMACWITHSHA384: Nid = Nid(ffi::NID_hmacWithSHA384);
+pub const HMACWITHSHA512: Nid = Nid(ffi::NID_hmacWithSHA512);
+pub const RC2_CBC: Nid = Nid(ffi::NID_rc2_cbc);
+pub const RC2_ECB: Nid = Nid(ffi::NID_rc2_ecb);
+pub const RC2_CFB64: Nid = Nid(ffi::NID_rc2_cfb64);
+pub const RC2_OFB64: Nid = Nid(ffi::NID_rc2_ofb64);
+pub const RC2_40_CBC: Nid = Nid(ffi::NID_rc2_40_cbc);
+pub const RC2_64_CBC: Nid = Nid(ffi::NID_rc2_64_cbc);
+pub const RC4: Nid = Nid(ffi::NID_rc4);
+pub const RC4_40: Nid = Nid(ffi::NID_rc4_40);
+pub const DES_EDE3_CBC: Nid = Nid(ffi::NID_des_ede3_cbc);
+pub const RC5_CBC: Nid = Nid(ffi::NID_rc5_cbc);
+pub const RC5_ECB: Nid = Nid(ffi::NID_rc5_ecb);
+pub const RC5_CFB64: Nid = Nid(ffi::NID_rc5_cfb64);
+pub const RC5_OFB64: Nid = Nid(ffi::NID_rc5_ofb64);
+pub const MS_EXT_REQ: Nid = Nid(ffi::NID_ms_ext_req);
+pub const MS_CODE_IND: Nid = Nid(ffi::NID_ms_code_ind);
+pub const MS_CODE_COM: Nid = Nid(ffi::NID_ms_code_com);
+pub const MS_CTL_SIGN: Nid = Nid(ffi::NID_ms_ctl_sign);
+pub const MS_SGC: Nid = Nid(ffi::NID_ms_sgc);
+pub const MS_EFS: Nid = Nid(ffi::NID_ms_efs);
+pub const MS_SMARTCARD_LOGIN: Nid = Nid(ffi::NID_ms_smartcard_login);
+pub const MS_UPN: Nid = Nid(ffi::NID_ms_upn);
+pub const IDEA_CBC: Nid = Nid(ffi::NID_idea_cbc);
+pub const IDEA_ECB: Nid = Nid(ffi::NID_idea_ecb);
+pub const IDEA_CFB64: Nid = Nid(ffi::NID_idea_cfb64);
+pub const IDEA_OFB64: Nid = Nid(ffi::NID_idea_ofb64);
+pub const BF_CBC: Nid = Nid(ffi::NID_bf_cbc);
+pub const BF_ECB: Nid = Nid(ffi::NID_bf_ecb);
+pub const BF_CFB64: Nid = Nid(ffi::NID_bf_cfb64);
+pub const BF_OFB64: Nid = Nid(ffi::NID_bf_ofb64);
+pub const ID_PKIX: Nid = Nid(ffi::NID_id_pkix);
+pub const ID_PKIX_MOD: Nid = Nid(ffi::NID_id_pkix_mod);
+pub const ID_PE: Nid = Nid(ffi::NID_id_pe);
+pub const ID_QT: Nid = Nid(ffi::NID_id_qt);
+pub const ID_KP: Nid = Nid(ffi::NID_id_kp);
+pub const ID_IT: Nid = Nid(ffi::NID_id_it);
+pub const ID_PKIP: Nid = Nid(ffi::NID_id_pkip);
+pub const ID_ALG: Nid = Nid(ffi::NID_id_alg);
+pub const ID_CMC: Nid = Nid(ffi::NID_id_cmc);
+pub const ID_ON: Nid = Nid(ffi::NID_id_on);
+pub const ID_PDA: Nid = Nid(ffi::NID_id_pda);
+pub const ID_ACA: Nid = Nid(ffi::NID_id_aca);
+pub const ID_QCS: Nid = Nid(ffi::NID_id_qcs);
+pub const ID_CCT: Nid = Nid(ffi::NID_id_cct);
+pub const ID_PPL: Nid = Nid(ffi::NID_id_ppl);
+pub const ID_AD: Nid = Nid(ffi::NID_id_ad);
+pub const ID_PKIX1_EXPLICIT_88: Nid = Nid(ffi::NID_id_pkix1_explicit_88);
+pub const ID_PKIX1_IMPLICIT_88: Nid = Nid(ffi::NID_id_pkix1_implicit_88);
+pub const ID_PKIX1_EXPLICIT_93: Nid = Nid(ffi::NID_id_pkix1_explicit_93);
+pub const ID_PKIX1_IMPLICIT_93: Nid = Nid(ffi::NID_id_pkix1_implicit_93);
+pub const ID_MOD_CRMF: Nid = Nid(ffi::NID_id_mod_crmf);
+pub const ID_MOD_CMC: Nid = Nid(ffi::NID_id_mod_cmc);
+pub const ID_MOD_KEA_PROFILE_88: Nid = Nid(ffi::NID_id_mod_kea_profile_88);
+pub const ID_MOD_KEA_PROFILE_93: Nid = Nid(ffi::NID_id_mod_kea_profile_93);
+pub const ID_MOD_CMP: Nid = Nid(ffi::NID_id_mod_cmp);
+pub const ID_MOD_QUALIFIED_CERT_88: Nid = Nid(ffi::NID_id_mod_qualified_cert_88);
+pub const ID_MOD_QUALIFIED_CERT_93: Nid = Nid(ffi::NID_id_mod_qualified_cert_93);
+pub const ID_MOD_ATTRIBUTE_CERT: Nid = Nid(ffi::NID_id_mod_attribute_cert);
+pub const ID_MOD_TIMESTAMP_PROTOCOL: Nid = Nid(ffi::NID_id_mod_timestamp_protocol);
+pub const ID_MOD_OCSP: Nid = Nid(ffi::NID_id_mod_ocsp);
+pub const ID_MOD_DVCS: Nid = Nid(ffi::NID_id_mod_dvcs);
+pub const ID_MOD_CMP2000: Nid = Nid(ffi::NID_id_mod_cmp2000);
+pub const INFO_ACCESS: Nid = Nid(ffi::NID_info_access);
+pub const BIOMETRICINFO: Nid = Nid(ffi::NID_biometricInfo);
+pub const QCSTATEMENTS: Nid = Nid(ffi::NID_qcStatements);
+pub const AC_AUDITENTITY: Nid = Nid(ffi::NID_ac_auditEntity);
+pub const AC_TARGETING: Nid = Nid(ffi::NID_ac_targeting);
+pub const AACONTROLS: Nid = Nid(ffi::NID_aaControls);
+pub const SBGP_IPADDRBLOCK: Nid = Nid(ffi::NID_sbgp_ipAddrBlock);
+pub const SBGP_AUTONOMOUSSYSNUM: Nid = Nid(ffi::NID_sbgp_autonomousSysNum);
+pub const SBGP_ROUTERIDENTIFIER: Nid = Nid(ffi::NID_sbgp_routerIdentifier);
+pub const AC_PROXYING: Nid = Nid(ffi::NID_ac_proxying);
+pub const SINFO_ACCESS: Nid = Nid(ffi::NID_sinfo_access);
+pub const PROXYCERTINFO: Nid = Nid(ffi::NID_proxyCertInfo);
+pub const ID_QT_CPS: Nid = Nid(ffi::NID_id_qt_cps);
+pub const ID_QT_UNOTICE: Nid = Nid(ffi::NID_id_qt_unotice);
+pub const TEXTNOTICE: Nid = Nid(ffi::NID_textNotice);
+pub const SERVER_AUTH: Nid = Nid(ffi::NID_server_auth);
+pub const CLIENT_AUTH: Nid = Nid(ffi::NID_client_auth);
+pub const CODE_SIGN: Nid = Nid(ffi::NID_code_sign);
+pub const EMAIL_PROTECT: Nid = Nid(ffi::NID_email_protect);
+pub const IPSECENDSYSTEM: Nid = Nid(ffi::NID_ipsecEndSystem);
+pub const IPSECTUNNEL: Nid = Nid(ffi::NID_ipsecTunnel);
+pub const IPSECUSER: Nid = Nid(ffi::NID_ipsecUser);
+pub const TIME_STAMP: Nid = Nid(ffi::NID_time_stamp);
+pub const OCSP_SIGN: Nid = Nid(ffi::NID_OCSP_sign);
+pub const DVCS: Nid = Nid(ffi::NID_dvcs);
+pub const ID_IT_CAPROTENCCERT: Nid = Nid(ffi::NID_id_it_caProtEncCert);
+pub const ID_IT_SIGNKEYPAIRTYPES: Nid = Nid(ffi::NID_id_it_signKeyPairTypes);
+pub const ID_IT_ENCKEYPAIRTYPES: Nid = Nid(ffi::NID_id_it_encKeyPairTypes);
+pub const ID_IT_PREFERREDSYMMALG: Nid = Nid(ffi::NID_id_it_preferredSymmAlg);
+pub const ID_IT_CAKEYUPDATEINFO: Nid = Nid(ffi::NID_id_it_caKeyUpdateInfo);
+pub const ID_IT_CURRENTCRL: Nid = Nid(ffi::NID_id_it_currentCRL);
+pub const ID_IT_UNSUPPORTEDOIDS: Nid = Nid(ffi::NID_id_it_unsupportedOIDs);
+pub const ID_IT_SUBSCRIPTIONREQUEST: Nid = Nid(ffi::NID_id_it_subscriptionRequest);
+pub const ID_IT_SUBSCRIPTIONRESPONSE: Nid = Nid(ffi::NID_id_it_subscriptionResponse);
+pub const ID_IT_KEYPAIRPARAMREQ: Nid = Nid(ffi::NID_id_it_keyPairParamReq);
+pub const ID_IT_KEYPAIRPARAMREP: Nid = Nid(ffi::NID_id_it_keyPairParamRep);
+pub const ID_IT_REVPASSPHRASE: Nid = Nid(ffi::NID_id_it_revPassphrase);
+pub const ID_IT_IMPLICITCONFIRM: Nid = Nid(ffi::NID_id_it_implicitConfirm);
+pub const ID_IT_CONFIRMWAITTIME: Nid = Nid(ffi::NID_id_it_confirmWaitTime);
+pub const ID_IT_ORIGPKIMESSAGE: Nid = Nid(ffi::NID_id_it_origPKIMessage);
+pub const ID_IT_SUPPLANGTAGS: Nid = Nid(ffi::NID_id_it_suppLangTags);
+pub const ID_REGCTRL: Nid = Nid(ffi::NID_id_regCtrl);
+pub const ID_REGINFO: Nid = Nid(ffi::NID_id_regInfo);
+pub const ID_REGCTRL_REGTOKEN: Nid = Nid(ffi::NID_id_regCtrl_regToken);
+pub const ID_REGCTRL_AUTHENTICATOR: Nid = Nid(ffi::NID_id_regCtrl_authenticator);
+pub const ID_REGCTRL_PKIPUBLICATIONINFO: Nid = Nid(ffi::NID_id_regCtrl_pkiPublicationInfo);
+pub const ID_REGCTRL_PKIARCHIVEOPTIONS: Nid = Nid(ffi::NID_id_regCtrl_pkiArchiveOptions);
+pub const ID_REGCTRL_OLDCERTID: Nid = Nid(ffi::NID_id_regCtrl_oldCertID);
+pub const ID_REGCTRL_PROTOCOLENCRKEY: Nid = Nid(ffi::NID_id_regCtrl_protocolEncrKey);
+pub const ID_REGINFO_UTF8PAIRS: Nid = Nid(ffi::NID_id_regInfo_utf8Pairs);
+pub const ID_REGINFO_CERTREQ: Nid = Nid(ffi::NID_id_regInfo_certReq);
+pub const ID_ALG_DES40: Nid = Nid(ffi::NID_id_alg_des40);
+pub const ID_ALG_NOSIGNATURE: Nid = Nid(ffi::NID_id_alg_noSignature);
+pub const ID_ALG_DH_SIG_HMAC_SHA1: Nid = Nid(ffi::NID_id_alg_dh_sig_hmac_sha1);
+pub const ID_ALG_DH_POP: Nid = Nid(ffi::NID_id_alg_dh_pop);
+pub const ID_CMC_STATUSINFO: Nid = Nid(ffi::NID_id_cmc_statusInfo);
+pub const ID_CMC_IDENTIFICATION: Nid = Nid(ffi::NID_id_cmc_identification);
+pub const ID_CMC_IDENTITYPROOF: Nid = Nid(ffi::NID_id_cmc_identityProof);
+pub const ID_CMC_DATARETURN: Nid = Nid(ffi::NID_id_cmc_dataReturn);
+pub const ID_CMC_TRANSACTIONID: Nid = Nid(ffi::NID_id_cmc_transactionId);
+pub const ID_CMC_SENDERNONCE: Nid = Nid(ffi::NID_id_cmc_senderNonce);
+pub const ID_CMC_RECIPIENTNONCE: Nid = Nid(ffi::NID_id_cmc_recipientNonce);
+pub const ID_CMC_ADDEXTENSIONS: Nid = Nid(ffi::NID_id_cmc_addExtensions);
+pub const ID_CMC_ENCRYPTEDPOP: Nid = Nid(ffi::NID_id_cmc_encryptedPOP);
+pub const ID_CMC_DECRYPTEDPOP: Nid = Nid(ffi::NID_id_cmc_decryptedPOP);
+pub const ID_CMC_LRAPOPWITNESS: Nid = Nid(ffi::NID_id_cmc_lraPOPWitness);
+pub const ID_CMC_GETCERT: Nid = Nid(ffi::NID_id_cmc_getCert);
+pub const ID_CMC_GETCRL: Nid = Nid(ffi::NID_id_cmc_getCRL);
+pub const ID_CMC_REVOKEREQUEST: Nid = Nid(ffi::NID_id_cmc_revokeRequest);
+pub const ID_CMC_REGINFO: Nid = Nid(ffi::NID_id_cmc_regInfo);
+pub const ID_CMC_RESPONSEINFO: Nid = Nid(ffi::NID_id_cmc_responseInfo);
+pub const ID_CMC_QUERYPENDING: Nid = Nid(ffi::NID_id_cmc_queryPending);
+pub const ID_CMC_POPLINKRANDOM: Nid = Nid(ffi::NID_id_cmc_popLinkRandom);
+pub const ID_CMC_POPLINKWITNESS: Nid = Nid(ffi::NID_id_cmc_popLinkWitness);
+pub const ID_CMC_CONFIRMCERTACCEPTANCE: Nid = Nid(ffi::NID_id_cmc_confirmCertAcceptance);
+pub const ID_ON_PERSONALDATA: Nid = Nid(ffi::NID_id_on_personalData);
+pub const ID_ON_PERMANENTIDENTIFIER: Nid = Nid(ffi::NID_id_on_permanentIdentifier);
+pub const ID_PDA_DATEOFBIRTH: Nid = Nid(ffi::NID_id_pda_dateOfBirth);
+pub const ID_PDA_PLACEOFBIRTH: Nid = Nid(ffi::NID_id_pda_placeOfBirth);
+pub const ID_PDA_GENDER: Nid = Nid(ffi::NID_id_pda_gender);
+pub const ID_PDA_COUNTRYOFCITIZENSHIP: Nid = Nid(ffi::NID_id_pda_countryOfCitizenship);
+pub const ID_PDA_COUNTRYOFRESIDENCE: Nid = Nid(ffi::NID_id_pda_countryOfResidence);
+pub const ID_ACA_AUTHENTICATIONINFO: Nid = Nid(ffi::NID_id_aca_authenticationInfo);
+pub const ID_ACA_ACCESSIDENTITY: Nid = Nid(ffi::NID_id_aca_accessIdentity);
+pub const ID_ACA_CHARGINGIDENTITY: Nid = Nid(ffi::NID_id_aca_chargingIdentity);
+pub const ID_ACA_GROUP: Nid = Nid(ffi::NID_id_aca_group);
+pub const ID_ACA_ROLE: Nid = Nid(ffi::NID_id_aca_role);
+pub const ID_ACA_ENCATTRS: Nid = Nid(ffi::NID_id_aca_encAttrs);
+pub const ID_QCS_PKIXQCSYNTAX_V1: Nid = Nid(ffi::NID_id_qcs_pkixQCSyntax_v1);
+pub const ID_CCT_CRS: Nid = Nid(ffi::NID_id_cct_crs);
+pub const ID_CCT_PKIDATA: Nid = Nid(ffi::NID_id_cct_PKIData);
+pub const ID_CCT_PKIRESPONSE: Nid = Nid(ffi::NID_id_cct_PKIResponse);
+pub const ID_PPL_ANYLANGUAGE: Nid = Nid(ffi::NID_id_ppl_anyLanguage);
+pub const ID_PPL_INHERITALL: Nid = Nid(ffi::NID_id_ppl_inheritAll);
+pub const INDEPENDENT: Nid = Nid(ffi::NID_Independent);
+pub const AD_OCSP: Nid = Nid(ffi::NID_ad_OCSP);
+pub const AD_CA_ISSUERS: Nid = Nid(ffi::NID_ad_ca_issuers);
+pub const AD_TIMESTAMPING: Nid = Nid(ffi::NID_ad_timeStamping);
+pub const AD_DVCS: Nid = Nid(ffi::NID_ad_dvcs);
+pub const CAREPOSITORY: Nid = Nid(ffi::NID_caRepository);
+pub const ID_PKIX_OCSP_BASIC: Nid = Nid(ffi::NID_id_pkix_OCSP_basic);
+pub const ID_PKIX_OCSP_NONCE: Nid = Nid(ffi::NID_id_pkix_OCSP_Nonce);
+pub const ID_PKIX_OCSP_CRLID: Nid = Nid(ffi::NID_id_pkix_OCSP_CrlID);
+pub const ID_PKIX_OCSP_ACCEPTABLERESPONSES: Nid = Nid(ffi::NID_id_pkix_OCSP_acceptableResponses);
+pub const ID_PKIX_OCSP_NOCHECK: Nid = Nid(ffi::NID_id_pkix_OCSP_noCheck);
+pub const ID_PKIX_OCSP_ARCHIVECUTOFF: Nid = Nid(ffi::NID_id_pkix_OCSP_archiveCutoff);
+pub const ID_PKIX_OCSP_SERVICELOCATOR: Nid = Nid(ffi::NID_id_pkix_OCSP_serviceLocator);
+pub const ID_PKIX_OCSP_EXTENDEDSTATUS: Nid = Nid(ffi::NID_id_pkix_OCSP_extendedStatus);
+pub const ID_PKIX_OCSP_VALID: Nid = Nid(ffi::NID_id_pkix_OCSP_valid);
+pub const ID_PKIX_OCSP_PATH: Nid = Nid(ffi::NID_id_pkix_OCSP_path);
+pub const ID_PKIX_OCSP_TRUSTROOT: Nid = Nid(ffi::NID_id_pkix_OCSP_trustRoot);
+pub const ALGORITHM: Nid = Nid(ffi::NID_algorithm);
+pub const MD5WITHRSA: Nid = Nid(ffi::NID_md5WithRSA);
+pub const DES_ECB: Nid = Nid(ffi::NID_des_ecb);
+pub const DES_CBC: Nid = Nid(ffi::NID_des_cbc);
+pub const DES_OFB64: Nid = Nid(ffi::NID_des_ofb64);
+pub const DES_CFB64: Nid = Nid(ffi::NID_des_cfb64);
+pub const RSASIGNATURE: Nid = Nid(ffi::NID_rsaSignature);
+pub const DSA_2: Nid = Nid(ffi::NID_dsa_2);
+pub const DSAWITHSHA: Nid = Nid(ffi::NID_dsaWithSHA);
+pub const SHAWITHRSAENCRYPTION: Nid = Nid(ffi::NID_shaWithRSAEncryption);
+pub const DES_EDE_ECB: Nid = Nid(ffi::NID_des_ede_ecb);
+pub const DES_EDE3_ECB: Nid = Nid(ffi::NID_des_ede3_ecb);
+pub const DES_EDE_CBC: Nid = Nid(ffi::NID_des_ede_cbc);
+pub const DES_EDE_CFB64: Nid = Nid(ffi::NID_des_ede_cfb64);
+pub const DES_EDE3_CFB64: Nid = Nid(ffi::NID_des_ede3_cfb64);
+pub const DES_EDE_OFB64: Nid = Nid(ffi::NID_des_ede_ofb64);
+pub const DES_EDE3_OFB64: Nid = Nid(ffi::NID_des_ede3_ofb64);
+pub const DESX_CBC: Nid = Nid(ffi::NID_desx_cbc);
+pub const SHA: Nid = Nid(ffi::NID_sha);
+pub const SHA1: Nid = Nid(ffi::NID_sha1);
+pub const DSAWITHSHA1_2: Nid = Nid(ffi::NID_dsaWithSHA1_2);
+pub const SHA1WITHRSA: Nid = Nid(ffi::NID_sha1WithRSA);
+pub const RIPEMD160: Nid = Nid(ffi::NID_ripemd160);
+pub const RIPEMD160WITHRSA: Nid = Nid(ffi::NID_ripemd160WithRSA);
+pub const SXNET: Nid = Nid(ffi::NID_sxnet);
+pub const X500: Nid = Nid(ffi::NID_X500);
+pub const X509: Nid = Nid(ffi::NID_X509);
+pub const COMMONNAME: Nid = Nid(ffi::NID_commonName);
+pub const SURNAME: Nid = Nid(ffi::NID_surname);
+pub const SERIALNUMBER: Nid = Nid(ffi::NID_serialNumber);
+pub const COUNTRYNAME: Nid = Nid(ffi::NID_countryName);
+pub const LOCALITYNAME: Nid = Nid(ffi::NID_localityName);
+pub const STATEORPROVINCENAME: Nid = Nid(ffi::NID_stateOrProvinceName);
+pub const STREETADDRESS: Nid = Nid(ffi::NID_streetAddress);
+pub const ORGANIZATIONNAME: Nid = Nid(ffi::NID_organizationName);
+pub const ORGANIZATIONALUNITNAME: Nid = Nid(ffi::NID_organizationalUnitName);
+pub const TITLE: Nid = Nid(ffi::NID_title);
+pub const DESCRIPTION: Nid = Nid(ffi::NID_description);
+pub const SEARCHGUIDE: Nid = Nid(ffi::NID_searchGuide);
+pub const BUSINESSCATEGORY: Nid = Nid(ffi::NID_businessCategory);
+pub const POSTALADDRESS: Nid = Nid(ffi::NID_postalAddress);
+pub const POSTALCODE: Nid = Nid(ffi::NID_postalCode);
+pub const POSTOFFICEBOX: Nid = Nid(ffi::NID_postOfficeBox);
+pub const PHYSICALDELIVERYOFFICENAME: Nid = Nid(ffi::NID_physicalDeliveryOfficeName);
+pub const TELEPHONENUMBER: Nid = Nid(ffi::NID_telephoneNumber);
+pub const TELEXNUMBER: Nid = Nid(ffi::NID_telexNumber);
+pub const TELETEXTERMINALIDENTIFIER: Nid = Nid(ffi::NID_teletexTerminalIdentifier);
+pub const FACSIMILETELEPHONENUMBER: Nid = Nid(ffi::NID_facsimileTelephoneNumber);
+pub const X121ADDRESS: Nid = Nid(ffi::NID_x121Address);
+pub const INTERNATIONALISDNNUMBER: Nid = Nid(ffi::NID_internationaliSDNNumber);
+pub const REGISTEREDADDRESS: Nid = Nid(ffi::NID_registeredAddress);
+pub const DESTINATIONINDICATOR: Nid = Nid(ffi::NID_destinationIndicator);
+pub const PREFERREDDELIVERYMETHOD: Nid = Nid(ffi::NID_preferredDeliveryMethod);
+pub const PRESENTATIONADDRESS: Nid = Nid(ffi::NID_presentationAddress);
+pub const SUPPORTEDAPPLICATIONCONTEXT: Nid = Nid(ffi::NID_supportedApplicationContext);
+pub const MEMBER: Nid = Nid(ffi::NID_member);
+pub const OWNER: Nid = Nid(ffi::NID_owner);
+pub const ROLEOCCUPANT: Nid = Nid(ffi::NID_roleOccupant);
+pub const SEEALSO: Nid = Nid(ffi::NID_seeAlso);
+pub const USERPASSWORD: Nid = Nid(ffi::NID_userPassword);
+pub const USERCERTIFICATE: Nid = Nid(ffi::NID_userCertificate);
+pub const CACERTIFICATE: Nid = Nid(ffi::NID_cACertificate);
+pub const AUTHORITYREVOCATIONLIST: Nid = Nid(ffi::NID_authorityRevocationList);
+pub const CERTIFICATEREVOCATIONLIST: Nid = Nid(ffi::NID_certificateRevocationList);
+pub const CROSSCERTIFICATEPAIR: Nid = Nid(ffi::NID_crossCertificatePair);
+pub const NAME: Nid = Nid(ffi::NID_name);
+pub const GIVENNAME: Nid = Nid(ffi::NID_givenName);
+pub const INITIALS: Nid = Nid(ffi::NID_initials);
+pub const GENERATIONQUALIFIER: Nid = Nid(ffi::NID_generationQualifier);
+pub const X500UNIQUEIDENTIFIER: Nid = Nid(ffi::NID_x500UniqueIdentifier);
+pub const DNQUALIFIER: Nid = Nid(ffi::NID_dnQualifier);
+pub const ENHANCEDSEARCHGUIDE: Nid = Nid(ffi::NID_enhancedSearchGuide);
+pub const PROTOCOLINFORMATION: Nid = Nid(ffi::NID_protocolInformation);
+pub const DISTINGUISHEDNAME: Nid = Nid(ffi::NID_distinguishedName);
+pub const UNIQUEMEMBER: Nid = Nid(ffi::NID_uniqueMember);
+pub const HOUSEIDENTIFIER: Nid = Nid(ffi::NID_houseIdentifier);
+pub const SUPPORTEDALGORITHMS: Nid = Nid(ffi::NID_supportedAlgorithms);
+pub const DELTAREVOCATIONLIST: Nid = Nid(ffi::NID_deltaRevocationList);
+pub const DMDNAME: Nid = Nid(ffi::NID_dmdName);
+pub const PSEUDONYM: Nid = Nid(ffi::NID_pseudonym);
+pub const ROLE: Nid = Nid(ffi::NID_role);
+pub const X500ALGORITHMS: Nid = Nid(ffi::NID_X500algorithms);
+pub const RSA: Nid = Nid(ffi::NID_rsa);
+pub const MDC2WITHRSA: Nid = Nid(ffi::NID_mdc2WithRSA);
+pub const MDC2: Nid = Nid(ffi::NID_mdc2);
+pub const ID_CE: Nid = Nid(ffi::NID_id_ce);
+pub const SUBJECT_DIRECTORY_ATTRIBUTES: Nid = Nid(ffi::NID_subject_directory_attributes);
+pub const SUBJECT_KEY_IDENTIFIER: Nid = Nid(ffi::NID_subject_key_identifier);
+pub const KEY_USAGE: Nid = Nid(ffi::NID_key_usage);
+pub const PRIVATE_KEY_USAGE_PERIOD: Nid = Nid(ffi::NID_private_key_usage_period);
+pub const SUBJECT_ALT_NAME: Nid = Nid(ffi::NID_subject_alt_name);
+pub const ISSUER_ALT_NAME: Nid = Nid(ffi::NID_issuer_alt_name);
+pub const BASIC_CONSTRAINTS: Nid = Nid(ffi::NID_basic_constraints);
+pub const CRL_NUMBER: Nid = Nid(ffi::NID_crl_number);
+pub const CRL_REASON: Nid = Nid(ffi::NID_crl_reason);
+pub const INVALIDITY_DATE: Nid = Nid(ffi::NID_invalidity_date);
+pub const DELTA_CRL: Nid = Nid(ffi::NID_delta_crl);
+pub const ISSUING_DISTRIBUTION_POINT: Nid = Nid(ffi::NID_issuing_distribution_point);
+pub const CERTIFICATE_ISSUER: Nid = Nid(ffi::NID_certificate_issuer);
+pub const NAME_CONSTRAINTS: Nid = Nid(ffi::NID_name_constraints);
+pub const CRL_DISTRIBUTION_POINTS: Nid = Nid(ffi::NID_crl_distribution_points);
+pub const CERTIFICATE_POLICIES: Nid = Nid(ffi::NID_certificate_policies);
+pub const ANY_POLICY: Nid = Nid(ffi::NID_any_policy);
+pub const POLICY_MAPPINGS: Nid = Nid(ffi::NID_policy_mappings);
+pub const AUTHORITY_KEY_IDENTIFIER: Nid = Nid(ffi::NID_authority_key_identifier);
+pub const POLICY_CONSTRAINTS: Nid = Nid(ffi::NID_policy_constraints);
+pub const EXT_KEY_USAGE: Nid = Nid(ffi::NID_ext_key_usage);
+pub const FRESHEST_CRL: Nid = Nid(ffi::NID_freshest_crl);
+pub const INHIBIT_ANY_POLICY: Nid = Nid(ffi::NID_inhibit_any_policy);
+pub const TARGET_INFORMATION: Nid = Nid(ffi::NID_target_information);
+pub const NO_REV_AVAIL: Nid = Nid(ffi::NID_no_rev_avail);
+pub const ANYEXTENDEDKEYUSAGE: Nid = Nid(ffi::NID_anyExtendedKeyUsage);
+pub const NETSCAPE: Nid = Nid(ffi::NID_netscape);
+pub const NETSCAPE_CERT_EXTENSION: Nid = Nid(ffi::NID_netscape_cert_extension);
+pub const NETSCAPE_DATA_TYPE: Nid = Nid(ffi::NID_netscape_data_type);
+pub const NETSCAPE_CERT_TYPE: Nid = Nid(ffi::NID_netscape_cert_type);
+pub const NETSCAPE_BASE_URL: Nid = Nid(ffi::NID_netscape_base_url);
+pub const NETSCAPE_REVOCATION_URL: Nid = Nid(ffi::NID_netscape_revocation_url);
+pub const NETSCAPE_CA_REVOCATION_URL: Nid = Nid(ffi::NID_netscape_ca_revocation_url);
+pub const NETSCAPE_RENEWAL_URL: Nid = Nid(ffi::NID_netscape_renewal_url);
+pub const NETSCAPE_CA_POLICY_URL: Nid = Nid(ffi::NID_netscape_ca_policy_url);
+pub const NETSCAPE_SSL_SERVER_NAME: Nid = Nid(ffi::NID_netscape_ssl_server_name);
+pub const NETSCAPE_COMMENT: Nid = Nid(ffi::NID_netscape_comment);
+pub const NETSCAPE_CERT_SEQUENCE: Nid = Nid(ffi::NID_netscape_cert_sequence);
+pub const NS_SGC: Nid = Nid(ffi::NID_ns_sgc);
+pub const ORG: Nid = Nid(ffi::NID_org);
+pub const DOD: Nid = Nid(ffi::NID_dod);
+pub const IANA: Nid = Nid(ffi::NID_iana);
+pub const DIRECTORY: Nid = Nid(ffi::NID_Directory);
+pub const MANAGEMENT: Nid = Nid(ffi::NID_Management);
+pub const EXPERIMENTAL: Nid = Nid(ffi::NID_Experimental);
+pub const PRIVATE: Nid = Nid(ffi::NID_Private);
+pub const SECURITY: Nid = Nid(ffi::NID_Security);
+pub const SNMPV2: Nid = Nid(ffi::NID_SNMPv2);
+pub const MAIL: Nid = Nid(ffi::NID_Mail);
+pub const ENTERPRISES: Nid = Nid(ffi::NID_Enterprises);
+pub const DCOBJECT: Nid = Nid(ffi::NID_dcObject);
+pub const MIME_MHS: Nid = Nid(ffi::NID_mime_mhs);
+pub const MIME_MHS_HEADINGS: Nid = Nid(ffi::NID_mime_mhs_headings);
+pub const MIME_MHS_BODIES: Nid = Nid(ffi::NID_mime_mhs_bodies);
+pub const ID_HEX_PARTIAL_MESSAGE: Nid = Nid(ffi::NID_id_hex_partial_message);
+pub const ID_HEX_MULTIPART_MESSAGE: Nid = Nid(ffi::NID_id_hex_multipart_message);
+pub const ZLIB_COMPRESSION: Nid = Nid(ffi::NID_zlib_compression);
+pub const AES_128_ECB: Nid = Nid(ffi::NID_aes_128_ecb);
+pub const AES_128_CBC: Nid = Nid(ffi::NID_aes_128_cbc);
+pub const AES_128_OFB128: Nid = Nid(ffi::NID_aes_128_ofb128);
+pub const AES_128_CFB128: Nid = Nid(ffi::NID_aes_128_cfb128);
+pub const ID_AES128_WRAP: Nid = Nid(ffi::NID_id_aes128_wrap);
+pub const AES_128_GCM: Nid = Nid(ffi::NID_aes_128_gcm);
+pub const AES_128_CCM: Nid = Nid(ffi::NID_aes_128_ccm);
+pub const ID_AES128_WRAP_PAD: Nid = Nid(ffi::NID_id_aes128_wrap_pad);
+pub const AES_192_ECB: Nid = Nid(ffi::NID_aes_192_ecb);
+pub const AES_192_CBC: Nid = Nid(ffi::NID_aes_192_cbc);
+pub const AES_192_OFB128: Nid = Nid(ffi::NID_aes_192_ofb128);
+pub const AES_192_CFB128: Nid = Nid(ffi::NID_aes_192_cfb128);
+pub const ID_AES192_WRAP: Nid = Nid(ffi::NID_id_aes192_wrap);
+pub const AES_192_GCM: Nid = Nid(ffi::NID_aes_192_gcm);
+pub const AES_192_CCM: Nid = Nid(ffi::NID_aes_192_ccm);
+pub const ID_AES192_WRAP_PAD: Nid = Nid(ffi::NID_id_aes192_wrap_pad);
+pub const AES_256_ECB: Nid = Nid(ffi::NID_aes_256_ecb);
+pub const AES_256_CBC: Nid = Nid(ffi::NID_aes_256_cbc);
+pub const AES_256_OFB128: Nid = Nid(ffi::NID_aes_256_ofb128);
+pub const AES_256_CFB128: Nid = Nid(ffi::NID_aes_256_cfb128);
+pub const ID_AES256_WRAP: Nid = Nid(ffi::NID_id_aes256_wrap);
+pub const AES_256_GCM: Nid = Nid(ffi::NID_aes_256_gcm);
+pub const AES_256_CCM: Nid = Nid(ffi::NID_aes_256_ccm);
+pub const ID_AES256_WRAP_PAD: Nid = Nid(ffi::NID_id_aes256_wrap_pad);
+pub const AES_128_CFB1: Nid = Nid(ffi::NID_aes_128_cfb1);
+pub const AES_192_CFB1: Nid = Nid(ffi::NID_aes_192_cfb1);
+pub const AES_256_CFB1: Nid = Nid(ffi::NID_aes_256_cfb1);
+pub const AES_128_CFB8: Nid = Nid(ffi::NID_aes_128_cfb8);
+pub const AES_192_CFB8: Nid = Nid(ffi::NID_aes_192_cfb8);
+pub const AES_256_CFB8: Nid = Nid(ffi::NID_aes_256_cfb8);
+pub const AES_128_CTR: Nid = Nid(ffi::NID_aes_128_ctr);
+pub const AES_192_CTR: Nid = Nid(ffi::NID_aes_192_ctr);
+pub const AES_256_CTR: Nid = Nid(ffi::NID_aes_256_ctr);
+pub const AES_128_XTS: Nid = Nid(ffi::NID_aes_128_xts);
+pub const AES_256_XTS: Nid = Nid(ffi::NID_aes_256_xts);
+pub const DES_CFB1: Nid = Nid(ffi::NID_des_cfb1);
+pub const DES_CFB8: Nid = Nid(ffi::NID_des_cfb8);
+pub const DES_EDE3_CFB1: Nid = Nid(ffi::NID_des_ede3_cfb1);
+pub const DES_EDE3_CFB8: Nid = Nid(ffi::NID_des_ede3_cfb8);
+pub const SHA256: Nid = Nid(ffi::NID_sha256);
+pub const SHA384: Nid = Nid(ffi::NID_sha384);
+pub const SHA512: Nid = Nid(ffi::NID_sha512);
+pub const SHA224: Nid = Nid(ffi::NID_sha224);
+pub const DSA_WITH_SHA224: Nid = Nid(ffi::NID_dsa_with_SHA224);
+pub const DSA_WITH_SHA256: Nid = Nid(ffi::NID_dsa_with_SHA256);
+pub const HOLD_INSTRUCTION_CODE: Nid = Nid(ffi::NID_hold_instruction_code);
+pub const HOLD_INSTRUCTION_NONE: Nid = Nid(ffi::NID_hold_instruction_none);
+pub const HOLD_INSTRUCTION_CALL_ISSUER: Nid = Nid(ffi::NID_hold_instruction_call_issuer);
+pub const HOLD_INSTRUCTION_REJECT: Nid = Nid(ffi::NID_hold_instruction_reject);
+pub const DATA: Nid = Nid(ffi::NID_data);
+pub const PSS: Nid = Nid(ffi::NID_pss);
+pub const UCL: Nid = Nid(ffi::NID_ucl);
+pub const PILOT: Nid = Nid(ffi::NID_pilot);
+pub const PILOTATTRIBUTETYPE: Nid = Nid(ffi::NID_pilotAttributeType);
+pub const PILOTATTRIBUTESYNTAX: Nid = Nid(ffi::NID_pilotAttributeSyntax);
+pub const PILOTOBJECTCLASS: Nid = Nid(ffi::NID_pilotObjectClass);
+pub const PILOTGROUPS: Nid = Nid(ffi::NID_pilotGroups);
+pub const IA5STRINGSYNTAX: Nid = Nid(ffi::NID_iA5StringSyntax);
+pub const CASEIGNOREIA5STRINGSYNTAX: Nid = Nid(ffi::NID_caseIgnoreIA5StringSyntax);
+pub const PILOTOBJECT: Nid = Nid(ffi::NID_pilotObject);
+pub const PILOTPERSON: Nid = Nid(ffi::NID_pilotPerson);
+pub const ACCOUNT: Nid = Nid(ffi::NID_account);
+pub const DOCUMENT: Nid = Nid(ffi::NID_document);
+pub const ROOM: Nid = Nid(ffi::NID_room);
+pub const DOCUMENTSERIES: Nid = Nid(ffi::NID_documentSeries);
+pub const DOMAIN: Nid = Nid(ffi::NID_Domain);
+pub const RFC822LOCALPART: Nid = Nid(ffi::NID_rFC822localPart);
+pub const DNSDOMAIN: Nid = Nid(ffi::NID_dNSDomain);
+pub const DOMAINRELATEDOBJECT: Nid = Nid(ffi::NID_domainRelatedObject);
+pub const FRIENDLYCOUNTRY: Nid = Nid(ffi::NID_friendlyCountry);
+pub const SIMPLESECURITYOBJECT: Nid = Nid(ffi::NID_simpleSecurityObject);
+pub const PILOTORGANIZATION: Nid = Nid(ffi::NID_pilotOrganization);
+pub const PILOTDSA: Nid = Nid(ffi::NID_pilotDSA);
+pub const QUALITYLABELLEDDATA: Nid = Nid(ffi::NID_qualityLabelledData);
+pub const USERID: Nid = Nid(ffi::NID_userId);
+pub const TEXTENCODEDORADDRESS: Nid = Nid(ffi::NID_textEncodedORAddress);
+pub const RFC822MAILBOX: Nid = Nid(ffi::NID_rfc822Mailbox);
+pub const INFO: Nid = Nid(ffi::NID_info);
+pub const FAVOURITEDRINK: Nid = Nid(ffi::NID_favouriteDrink);
+pub const ROOMNUMBER: Nid = Nid(ffi::NID_roomNumber);
+pub const PHOTO: Nid = Nid(ffi::NID_photo);
+pub const USERCLASS: Nid = Nid(ffi::NID_userClass);
+pub const HOST: Nid = Nid(ffi::NID_host);
+pub const MANAGER: Nid = Nid(ffi::NID_manager);
+pub const DOCUMENTIDENTIFIER: Nid = Nid(ffi::NID_documentIdentifier);
+pub const DOCUMENTTITLE: Nid = Nid(ffi::NID_documentTitle);
+pub const DOCUMENTVERSION: Nid = Nid(ffi::NID_documentVersion);
+pub const DOCUMENTAUTHOR: Nid = Nid(ffi::NID_documentAuthor);
+pub const DOCUMENTLOCATION: Nid = Nid(ffi::NID_documentLocation);
+pub const HOMETELEPHONENUMBER: Nid = Nid(ffi::NID_homeTelephoneNumber);
+pub const SECRETARY: Nid = Nid(ffi::NID_secretary);
+pub const OTHERMAILBOX: Nid = Nid(ffi::NID_otherMailbox);
+pub const LASTMODIFIEDTIME: Nid = Nid(ffi::NID_lastModifiedTime);
+pub const LASTMODIFIEDBY: Nid = Nid(ffi::NID_lastModifiedBy);
+pub const DOMAINCOMPONENT: Nid = Nid(ffi::NID_domainComponent);
+pub const ARECORD: Nid = Nid(ffi::NID_aRecord);
+pub const PILOTATTRIBUTETYPE27: Nid = Nid(ffi::NID_pilotAttributeType27);
+pub const MXRECORD: Nid = Nid(ffi::NID_mXRecord);
+pub const NSRECORD: Nid = Nid(ffi::NID_nSRecord);
+pub const SOARECORD: Nid = Nid(ffi::NID_sOARecord);
+pub const CNAMERECORD: Nid = Nid(ffi::NID_cNAMERecord);
+pub const ASSOCIATEDDOMAIN: Nid = Nid(ffi::NID_associatedDomain);
+pub const ASSOCIATEDNAME: Nid = Nid(ffi::NID_associatedName);
+pub const HOMEPOSTALADDRESS: Nid = Nid(ffi::NID_homePostalAddress);
+pub const PERSONALTITLE: Nid = Nid(ffi::NID_personalTitle);
+pub const MOBILETELEPHONENUMBER: Nid = Nid(ffi::NID_mobileTelephoneNumber);
+pub const PAGERTELEPHONENUMBER: Nid = Nid(ffi::NID_pagerTelephoneNumber);
+pub const FRIENDLYCOUNTRYNAME: Nid = Nid(ffi::NID_friendlyCountryName);
+pub const ORGANIZATIONALSTATUS: Nid = Nid(ffi::NID_organizationalStatus);
+pub const JANETMAILBOX: Nid = Nid(ffi::NID_janetMailbox);
+pub const MAILPREFERENCEOPTION: Nid = Nid(ffi::NID_mailPreferenceOption);
+pub const BUILDINGNAME: Nid = Nid(ffi::NID_buildingName);
+pub const DSAQUALITY: Nid = Nid(ffi::NID_dSAQuality);
+pub const SINGLELEVELQUALITY: Nid = Nid(ffi::NID_singleLevelQuality);
+pub const SUBTREEMINIMUMQUALITY: Nid = Nid(ffi::NID_subtreeMinimumQuality);
+pub const SUBTREEMAXIMUMQUALITY: Nid = Nid(ffi::NID_subtreeMaximumQuality);
+pub const PERSONALSIGNATURE: Nid = Nid(ffi::NID_personalSignature);
+pub const DITREDIRECT: Nid = Nid(ffi::NID_dITRedirect);
+pub const AUDIO: Nid = Nid(ffi::NID_audio);
+pub const DOCUMENTPUBLISHER: Nid = Nid(ffi::NID_documentPublisher);
+pub const ID_SET: Nid = Nid(ffi::NID_id_set);
+pub const SET_CTYPE: Nid = Nid(ffi::NID_set_ctype);
+pub const SET_MSGEXT: Nid = Nid(ffi::NID_set_msgExt);
+pub const SET_ATTR: Nid = Nid(ffi::NID_set_attr);
+pub const SET_POLICY: Nid = Nid(ffi::NID_set_policy);
+pub const SET_CERTEXT: Nid = Nid(ffi::NID_set_certExt);
+pub const SET_BRAND: Nid = Nid(ffi::NID_set_brand);
+pub const SETCT_PANDATA: Nid = Nid(ffi::NID_setct_PANData);
+pub const SETCT_PANTOKEN: Nid = Nid(ffi::NID_setct_PANToken);
+pub const SETCT_PANONLY: Nid = Nid(ffi::NID_setct_PANOnly);
+pub const SETCT_OIDATA: Nid = Nid(ffi::NID_setct_OIData);
+pub const SETCT_PI: Nid = Nid(ffi::NID_setct_PI);
+pub const SETCT_PIDATA: Nid = Nid(ffi::NID_setct_PIData);
+pub const SETCT_PIDATAUNSIGNED: Nid = Nid(ffi::NID_setct_PIDataUnsigned);
+pub const SETCT_HODINPUT: Nid = Nid(ffi::NID_setct_HODInput);
+pub const SETCT_AUTHRESBAGGAGE: Nid = Nid(ffi::NID_setct_AuthResBaggage);
+pub const SETCT_AUTHREVREQBAGGAGE: Nid = Nid(ffi::NID_setct_AuthRevReqBaggage);
+pub const SETCT_AUTHREVRESBAGGAGE: Nid = Nid(ffi::NID_setct_AuthRevResBaggage);
+pub const SETCT_CAPTOKENSEQ: Nid = Nid(ffi::NID_setct_CapTokenSeq);
+pub const SETCT_PINITRESDATA: Nid = Nid(ffi::NID_setct_PInitResData);
+pub const SETCT_PI_TBS: Nid = Nid(ffi::NID_setct_PI_TBS);
+pub const SETCT_PRESDATA: Nid = Nid(ffi::NID_setct_PResData);
+pub const SETCT_AUTHREQTBS: Nid = Nid(ffi::NID_setct_AuthReqTBS);
+pub const SETCT_AUTHRESTBS: Nid = Nid(ffi::NID_setct_AuthResTBS);
+pub const SETCT_AUTHRESTBSX: Nid = Nid(ffi::NID_setct_AuthResTBSX);
+pub const SETCT_AUTHTOKENTBS: Nid = Nid(ffi::NID_setct_AuthTokenTBS);
+pub const SETCT_CAPTOKENDATA: Nid = Nid(ffi::NID_setct_CapTokenData);
+pub const SETCT_CAPTOKENTBS: Nid = Nid(ffi::NID_setct_CapTokenTBS);
+pub const SETCT_ACQCARDCODEMSG: Nid = Nid(ffi::NID_setct_AcqCardCodeMsg);
+pub const SETCT_AUTHREVREQTBS: Nid = Nid(ffi::NID_setct_AuthRevReqTBS);
+pub const SETCT_AUTHREVRESDATA: Nid = Nid(ffi::NID_setct_AuthRevResData);
+pub const SETCT_AUTHREVRESTBS: Nid = Nid(ffi::NID_setct_AuthRevResTBS);
+pub const SETCT_CAPREQTBS: Nid = Nid(ffi::NID_setct_CapReqTBS);
+pub const SETCT_CAPREQTBSX: Nid = Nid(ffi::NID_setct_CapReqTBSX);
+pub const SETCT_CAPRESDATA: Nid = Nid(ffi::NID_setct_CapResData);
+pub const SETCT_CAPREVREQTBS: Nid = Nid(ffi::NID_setct_CapRevReqTBS);
+pub const SETCT_CAPREVREQTBSX: Nid = Nid(ffi::NID_setct_CapRevReqTBSX);
+pub const SETCT_CAPREVRESDATA: Nid = Nid(ffi::NID_setct_CapRevResData);
+pub const SETCT_CREDREQTBS: Nid = Nid(ffi::NID_setct_CredReqTBS);
+pub const SETCT_CREDREQTBSX: Nid = Nid(ffi::NID_setct_CredReqTBSX);
+pub const SETCT_CREDRESDATA: Nid = Nid(ffi::NID_setct_CredResData);
+pub const SETCT_CREDREVREQTBS: Nid = Nid(ffi::NID_setct_CredRevReqTBS);
+pub const SETCT_CREDREVREQTBSX: Nid = Nid(ffi::NID_setct_CredRevReqTBSX);
+pub const SETCT_CREDREVRESDATA: Nid = Nid(ffi::NID_setct_CredRevResData);
+pub const SETCT_PCERTREQDATA: Nid = Nid(ffi::NID_setct_PCertReqData);
+pub const SETCT_PCERTRESTBS: Nid = Nid(ffi::NID_setct_PCertResTBS);
+pub const SETCT_BATCHADMINREQDATA: Nid = Nid(ffi::NID_setct_BatchAdminReqData);
+pub const SETCT_BATCHADMINRESDATA: Nid = Nid(ffi::NID_setct_BatchAdminResData);
+pub const SETCT_CARDCINITRESTBS: Nid = Nid(ffi::NID_setct_CardCInitResTBS);
+pub const SETCT_MEAQCINITRESTBS: Nid = Nid(ffi::NID_setct_MeAqCInitResTBS);
+pub const SETCT_REGFORMRESTBS: Nid = Nid(ffi::NID_setct_RegFormResTBS);
+pub const SETCT_CERTREQDATA: Nid = Nid(ffi::NID_setct_CertReqData);
+pub const SETCT_CERTREQTBS: Nid = Nid(ffi::NID_setct_CertReqTBS);
+pub const SETCT_CERTRESDATA: Nid = Nid(ffi::NID_setct_CertResData);
+pub const SETCT_CERTINQREQTBS: Nid = Nid(ffi::NID_setct_CertInqReqTBS);
+pub const SETCT_ERRORTBS: Nid = Nid(ffi::NID_setct_ErrorTBS);
+pub const SETCT_PIDUALSIGNEDTBE: Nid = Nid(ffi::NID_setct_PIDualSignedTBE);
+pub const SETCT_PIUNSIGNEDTBE: Nid = Nid(ffi::NID_setct_PIUnsignedTBE);
+pub const SETCT_AUTHREQTBE: Nid = Nid(ffi::NID_setct_AuthReqTBE);
+pub const SETCT_AUTHRESTBE: Nid = Nid(ffi::NID_setct_AuthResTBE);
+pub const SETCT_AUTHRESTBEX: Nid = Nid(ffi::NID_setct_AuthResTBEX);
+pub const SETCT_AUTHTOKENTBE: Nid = Nid(ffi::NID_setct_AuthTokenTBE);
+pub const SETCT_CAPTOKENTBE: Nid = Nid(ffi::NID_setct_CapTokenTBE);
+pub const SETCT_CAPTOKENTBEX: Nid = Nid(ffi::NID_setct_CapTokenTBEX);
+pub const SETCT_ACQCARDCODEMSGTBE: Nid = Nid(ffi::NID_setct_AcqCardCodeMsgTBE);
+pub const SETCT_AUTHREVREQTBE: Nid = Nid(ffi::NID_setct_AuthRevReqTBE);
+pub const SETCT_AUTHREVRESTBE: Nid = Nid(ffi::NID_setct_AuthRevResTBE);
+pub const SETCT_AUTHREVRESTBEB: Nid = Nid(ffi::NID_setct_AuthRevResTBEB);
+pub const SETCT_CAPREQTBE: Nid = Nid(ffi::NID_setct_CapReqTBE);
+pub const SETCT_CAPREQTBEX: Nid = Nid(ffi::NID_setct_CapReqTBEX);
+pub const SETCT_CAPRESTBE: Nid = Nid(ffi::NID_setct_CapResTBE);
+pub const SETCT_CAPREVREQTBE: Nid = Nid(ffi::NID_setct_CapRevReqTBE);
+pub const SETCT_CAPREVREQTBEX: Nid = Nid(ffi::NID_setct_CapRevReqTBEX);
+pub const SETCT_CAPREVRESTBE: Nid = Nid(ffi::NID_setct_CapRevResTBE);
+pub const SETCT_CREDREQTBE: Nid = Nid(ffi::NID_setct_CredReqTBE);
+pub const SETCT_CREDREQTBEX: Nid = Nid(ffi::NID_setct_CredReqTBEX);
+pub const SETCT_CREDRESTBE: Nid = Nid(ffi::NID_setct_CredResTBE);
+pub const SETCT_CREDREVREQTBE: Nid = Nid(ffi::NID_setct_CredRevReqTBE);
+pub const SETCT_CREDREVREQTBEX: Nid = Nid(ffi::NID_setct_CredRevReqTBEX);
+pub const SETCT_CREDREVRESTBE: Nid = Nid(ffi::NID_setct_CredRevResTBE);
+pub const SETCT_BATCHADMINREQTBE: Nid = Nid(ffi::NID_setct_BatchAdminReqTBE);
+pub const SETCT_BATCHADMINRESTBE: Nid = Nid(ffi::NID_setct_BatchAdminResTBE);
+pub const SETCT_REGFORMREQTBE: Nid = Nid(ffi::NID_setct_RegFormReqTBE);
+pub const SETCT_CERTREQTBE: Nid = Nid(ffi::NID_setct_CertReqTBE);
+pub const SETCT_CERTREQTBEX: Nid = Nid(ffi::NID_setct_CertReqTBEX);
+pub const SETCT_CERTRESTBE: Nid = Nid(ffi::NID_setct_CertResTBE);
+pub const SETCT_CRLNOTIFICATIONTBS: Nid = Nid(ffi::NID_setct_CRLNotificationTBS);
+pub const SETCT_CRLNOTIFICATIONRESTBS: Nid = Nid(ffi::NID_setct_CRLNotificationResTBS);
+pub const SETCT_BCIDISTRIBUTIONTBS: Nid = Nid(ffi::NID_setct_BCIDistributionTBS);
+pub const SETEXT_GENCRYPT: Nid = Nid(ffi::NID_setext_genCrypt);
+pub const SETEXT_MIAUTH: Nid = Nid(ffi::NID_setext_miAuth);
+pub const SETEXT_PINSECURE: Nid = Nid(ffi::NID_setext_pinSecure);
+pub const SETEXT_PINANY: Nid = Nid(ffi::NID_setext_pinAny);
+pub const SETEXT_TRACK2: Nid = Nid(ffi::NID_setext_track2);
+pub const SETEXT_CV: Nid = Nid(ffi::NID_setext_cv);
+pub const SET_POLICY_ROOT: Nid = Nid(ffi::NID_set_policy_root);
+pub const SETCEXT_HASHEDROOT: Nid = Nid(ffi::NID_setCext_hashedRoot);
+pub const SETCEXT_CERTTYPE: Nid = Nid(ffi::NID_setCext_certType);
+pub const SETCEXT_MERCHDATA: Nid = Nid(ffi::NID_setCext_merchData);
+pub const SETCEXT_CCERTREQUIRED: Nid = Nid(ffi::NID_setCext_cCertRequired);
+pub const SETCEXT_TUNNELING: Nid = Nid(ffi::NID_setCext_tunneling);
+pub const SETCEXT_SETEXT: Nid = Nid(ffi::NID_setCext_setExt);
+pub const SETCEXT_SETQUALF: Nid = Nid(ffi::NID_setCext_setQualf);
+pub const SETCEXT_PGWYCAPABILITIES: Nid = Nid(ffi::NID_setCext_PGWYcapabilities);
+pub const SETCEXT_TOKENIDENTIFIER: Nid = Nid(ffi::NID_setCext_TokenIdentifier);
+pub const SETCEXT_TRACK2DATA: Nid = Nid(ffi::NID_setCext_Track2Data);
+pub const SETCEXT_TOKENTYPE: Nid = Nid(ffi::NID_setCext_TokenType);
+pub const SETCEXT_ISSUERCAPABILITIES: Nid = Nid(ffi::NID_setCext_IssuerCapabilities);
+pub const SETATTR_CERT: Nid = Nid(ffi::NID_setAttr_Cert);
+pub const SETATTR_PGWYCAP: Nid = Nid(ffi::NID_setAttr_PGWYcap);
+pub const SETATTR_TOKENTYPE: Nid = Nid(ffi::NID_setAttr_TokenType);
+pub const SETATTR_ISSCAP: Nid = Nid(ffi::NID_setAttr_IssCap);
+pub const SET_ROOTKEYTHUMB: Nid = Nid(ffi::NID_set_rootKeyThumb);
+pub const SET_ADDPOLICY: Nid = Nid(ffi::NID_set_addPolicy);
+pub const SETATTR_TOKEN_EMV: Nid = Nid(ffi::NID_setAttr_Token_EMV);
+pub const SETATTR_TOKEN_B0PRIME: Nid = Nid(ffi::NID_setAttr_Token_B0Prime);
+pub const SETATTR_ISSCAP_CVM: Nid = Nid(ffi::NID_setAttr_IssCap_CVM);
+pub const SETATTR_ISSCAP_T2: Nid = Nid(ffi::NID_setAttr_IssCap_T2);
+pub const SETATTR_ISSCAP_SIG: Nid = Nid(ffi::NID_setAttr_IssCap_Sig);
+pub const SETATTR_GENCRYPTGRM: Nid = Nid(ffi::NID_setAttr_GenCryptgrm);
+pub const SETATTR_T2ENC: Nid = Nid(ffi::NID_setAttr_T2Enc);
+pub const SETATTR_T2CLEARTXT: Nid = Nid(ffi::NID_setAttr_T2cleartxt);
+pub const SETATTR_TOKICCSIG: Nid = Nid(ffi::NID_setAttr_TokICCsig);
+pub const SETATTR_SECDEVSIG: Nid = Nid(ffi::NID_setAttr_SecDevSig);
+pub const SET_BRAND_IATA_ATA: Nid = Nid(ffi::NID_set_brand_IATA_ATA);
+pub const SET_BRAND_DINERS: Nid = Nid(ffi::NID_set_brand_Diners);
+pub const SET_BRAND_AMERICANEXPRESS: Nid = Nid(ffi::NID_set_brand_AmericanExpress);
+pub const SET_BRAND_JCB: Nid = Nid(ffi::NID_set_brand_JCB);
+pub const SET_BRAND_VISA: Nid = Nid(ffi::NID_set_brand_Visa);
+pub const SET_BRAND_MASTERCARD: Nid = Nid(ffi::NID_set_brand_MasterCard);
+pub const SET_BRAND_NOVUS: Nid = Nid(ffi::NID_set_brand_Novus);
+pub const DES_CDMF: Nid = Nid(ffi::NID_des_cdmf);
+pub const RSAOAEPENCRYPTIONSET: Nid = Nid(ffi::NID_rsaOAEPEncryptionSET);
+pub const IPSEC3: Nid = Nid(ffi::NID_ipsec3);
+pub const IPSEC4: Nid = Nid(ffi::NID_ipsec4);
+pub const WHIRLPOOL: Nid = Nid(ffi::NID_whirlpool);
+pub const CRYPTOPRO: Nid = Nid(ffi::NID_cryptopro);
+pub const CRYPTOCOM: Nid = Nid(ffi::NID_cryptocom);
+pub const ID_GOSTR3411_94_WITH_GOSTR3410_2001: Nid = Nid(ffi::NID_id_GostR3411_94_with_GostR3410_2001);
+pub const ID_GOSTR3411_94_WITH_GOSTR3410_94: Nid = Nid(ffi::NID_id_GostR3411_94_with_GostR3410_94);
+pub const ID_GOSTR3411_94: Nid = Nid(ffi::NID_id_GostR3411_94);
+pub const ID_HMACGOSTR3411_94: Nid = Nid(ffi::NID_id_HMACGostR3411_94);
+pub const ID_GOSTR3410_2001: Nid = Nid(ffi::NID_id_GostR3410_2001);
+pub const ID_GOSTR3410_94: Nid = Nid(ffi::NID_id_GostR3410_94);
+pub const ID_GOST28147_89: Nid = Nid(ffi::NID_id_Gost28147_89);
+pub const GOST89_CNT: Nid = Nid(ffi::NID_gost89_cnt);
+pub const ID_GOST28147_89_MAC: Nid = Nid(ffi::NID_id_Gost28147_89_MAC);
+pub const ID_GOSTR3411_94_PRF: Nid = Nid(ffi::NID_id_GostR3411_94_prf);
+pub const ID_GOSTR3410_2001DH: Nid = Nid(ffi::NID_id_GostR3410_2001DH);
+pub const ID_GOSTR3410_94DH: Nid = Nid(ffi::NID_id_GostR3410_94DH);
+pub const ID_GOST28147_89_CRYPTOPRO_KEYMESHING: Nid = Nid(ffi::NID_id_Gost28147_89_CryptoPro_KeyMeshing);
+pub const ID_GOST28147_89_NONE_KEYMESHING: Nid = Nid(ffi::NID_id_Gost28147_89_None_KeyMeshing);
+pub const ID_GOSTR3411_94_TESTPARAMSET: Nid = Nid(ffi::NID_id_GostR3411_94_TestParamSet);
+pub const ID_GOSTR3411_94_CRYPTOPROPARAMSET: Nid = Nid(ffi::NID_id_GostR3411_94_CryptoProParamSet);
+pub const ID_GOST28147_89_TESTPARAMSET: Nid = Nid(ffi::NID_id_Gost28147_89_TestParamSet);
+pub const ID_GOST28147_89_CRYPTOPRO_A_PARAMSET: Nid = Nid(ffi::NID_id_Gost28147_89_CryptoPro_A_ParamSet);
+pub const ID_GOST28147_89_CRYPTOPRO_B_PARAMSET: Nid = Nid(ffi::NID_id_Gost28147_89_CryptoPro_B_ParamSet);
+pub const ID_GOST28147_89_CRYPTOPRO_C_PARAMSET: Nid = Nid(ffi::NID_id_Gost28147_89_CryptoPro_C_ParamSet);
+pub const ID_GOST28147_89_CRYPTOPRO_D_PARAMSET: Nid = Nid(ffi::NID_id_Gost28147_89_CryptoPro_D_ParamSet);
+pub const ID_GOST28147_89_CRYPTOPRO_OSCAR_1_1_PARAMSET: Nid = Nid(ffi::NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet);
+pub const ID_GOST28147_89_CRYPTOPRO_OSCAR_1_0_PARAMSET: Nid = Nid(ffi::NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet);
+pub const ID_GOST28147_89_CRYPTOPRO_RIC_1_PARAMSET: Nid = Nid(ffi::NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet);
+pub const ID_GOSTR3410_94_TESTPARAMSET: Nid = Nid(ffi::NID_id_GostR3410_94_TestParamSet);
+pub const ID_GOSTR3410_94_CRYPTOPRO_A_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_94_CryptoPro_A_ParamSet);
+pub const ID_GOSTR3410_94_CRYPTOPRO_B_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_94_CryptoPro_B_ParamSet);
+pub const ID_GOSTR3410_94_CRYPTOPRO_C_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_94_CryptoPro_C_ParamSet);
+pub const ID_GOSTR3410_94_CRYPTOPRO_D_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_94_CryptoPro_D_ParamSet);
+pub const ID_GOSTR3410_94_CRYPTOPRO_XCHA_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_94_CryptoPro_XchA_ParamSet);
+pub const ID_GOSTR3410_94_CRYPTOPRO_XCHB_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_94_CryptoPro_XchB_ParamSet);
+pub const ID_GOSTR3410_94_CRYPTOPRO_XCHC_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_94_CryptoPro_XchC_ParamSet);
+pub const ID_GOSTR3410_2001_TESTPARAMSET: Nid = Nid(ffi::NID_id_GostR3410_2001_TestParamSet);
+pub const ID_GOSTR3410_2001_CRYPTOPRO_A_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_2001_CryptoPro_A_ParamSet);
+pub const ID_GOSTR3410_2001_CRYPTOPRO_B_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_2001_CryptoPro_B_ParamSet);
+pub const ID_GOSTR3410_2001_CRYPTOPRO_C_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_2001_CryptoPro_C_ParamSet);
+pub const ID_GOSTR3410_2001_CRYPTOPRO_XCHA_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet);
+pub const ID_GOSTR3410_2001_CRYPTOPRO_XCHB_PARAMSET: Nid = Nid(ffi::NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet);
+pub const ID_GOSTR3410_94_A: Nid = Nid(ffi::NID_id_GostR3410_94_a);
+pub const ID_GOSTR3410_94_ABIS: Nid = Nid(ffi::NID_id_GostR3410_94_aBis);
+pub const ID_GOSTR3410_94_B: Nid = Nid(ffi::NID_id_GostR3410_94_b);
+pub const ID_GOSTR3410_94_BBIS: Nid = Nid(ffi::NID_id_GostR3410_94_bBis);
+pub const ID_GOST28147_89_CC: Nid = Nid(ffi::NID_id_Gost28147_89_cc);
+pub const ID_GOSTR3410_94_CC: Nid = Nid(ffi::NID_id_GostR3410_94_cc);
+pub const ID_GOSTR3410_2001_CC: Nid = Nid(ffi::NID_id_GostR3410_2001_cc);
+pub const ID_GOSTR3411_94_WITH_GOSTR3410_94_CC: Nid = Nid(ffi::NID_id_GostR3411_94_with_GostR3410_94_cc);
+pub const ID_GOSTR3411_94_WITH_GOSTR3410_2001_CC: Nid = Nid(ffi::NID_id_GostR3411_94_with_GostR3410_2001_cc);
+pub const ID_GOSTR3410_2001_PARAMSET_CC: Nid = Nid(ffi::NID_id_GostR3410_2001_ParamSet_cc);
+pub const CAMELLIA_128_CBC: Nid = Nid(ffi::NID_camellia_128_cbc);
+pub const CAMELLIA_192_CBC: Nid = Nid(ffi::NID_camellia_192_cbc);
+pub const CAMELLIA_256_CBC: Nid = Nid(ffi::NID_camellia_256_cbc);
+pub const ID_CAMELLIA128_WRAP: Nid = Nid(ffi::NID_id_camellia128_wrap);
+pub const ID_CAMELLIA192_WRAP: Nid = Nid(ffi::NID_id_camellia192_wrap);
+pub const ID_CAMELLIA256_WRAP: Nid = Nid(ffi::NID_id_camellia256_wrap);
+pub const CAMELLIA_128_ECB: Nid = Nid(ffi::NID_camellia_128_ecb);
+pub const CAMELLIA_128_OFB128: Nid = Nid(ffi::NID_camellia_128_ofb128);
+pub const CAMELLIA_128_CFB128: Nid = Nid(ffi::NID_camellia_128_cfb128);
+pub const CAMELLIA_192_ECB: Nid = Nid(ffi::NID_camellia_192_ecb);
+pub const CAMELLIA_192_OFB128: Nid = Nid(ffi::NID_camellia_192_ofb128);
+pub const CAMELLIA_192_CFB128: Nid = Nid(ffi::NID_camellia_192_cfb128);
+pub const CAMELLIA_256_ECB: Nid = Nid(ffi::NID_camellia_256_ecb);
+pub const CAMELLIA_256_OFB128: Nid = Nid(ffi::NID_camellia_256_ofb128);
+pub const CAMELLIA_256_CFB128: Nid = Nid(ffi::NID_camellia_256_cfb128);
+pub const CAMELLIA_128_CFB1: Nid = Nid(ffi::NID_camellia_128_cfb1);
+pub const CAMELLIA_192_CFB1: Nid = Nid(ffi::NID_camellia_192_cfb1);
+pub const CAMELLIA_256_CFB1: Nid = Nid(ffi::NID_camellia_256_cfb1);
+pub const CAMELLIA_128_CFB8: Nid = Nid(ffi::NID_camellia_128_cfb8);
+pub const CAMELLIA_192_CFB8: Nid = Nid(ffi::NID_camellia_192_cfb8);
+pub const CAMELLIA_256_CFB8: Nid = Nid(ffi::NID_camellia_256_cfb8);
+pub const KISA: Nid = Nid(ffi::NID_kisa);
+pub const SEED_ECB: Nid = Nid(ffi::NID_seed_ecb);
+pub const SEED_CBC: Nid = Nid(ffi::NID_seed_cbc);
+pub const SEED_CFB128: Nid = Nid(ffi::NID_seed_cfb128);
+pub const SEED_OFB128: Nid = Nid(ffi::NID_seed_ofb128);
+pub const HMAC: Nid = Nid(ffi::NID_hmac);
+pub const CMAC: Nid = Nid(ffi::NID_cmac);
+pub const RC4_HMAC_MD5: Nid = Nid(ffi::NID_rc4_hmac_md5);
+pub const AES_128_CBC_HMAC_SHA1: Nid = Nid(ffi::NID_aes_128_cbc_hmac_sha1);
+pub const AES_192_CBC_HMAC_SHA1: Nid = Nid(ffi::NID_aes_192_cbc_hmac_sha1);
+pub const AES_256_CBC_HMAC_SHA1: Nid = Nid(ffi::NID_aes_256_cbc_hmac_sha1);
+
diff --git a/openssl/src/crypto/pkcs12.rs b/openssl/src/pkcs12.rs
index 846b7baf..f143ec49 100644
--- a/openssl/src/crypto/pkcs12.rs
+++ b/openssl/src/pkcs12.rs
@@ -7,7 +7,7 @@ use std::ptr;
 use std::ffi::CString;
 
 use {cvt, cvt_p};
-use crypto::pkey::PKey;
+use pkey::PKey;
 use error::ErrorStack;
 use x509::X509;
 
@@ -98,14 +98,14 @@ mod compat {
 
 #[cfg(test)]
 mod test {
-    use crypto::hash::MessageDigest;
+    use hash::MessageDigest;
     use serialize::hex::ToHex;
 
     use super::*;
 
     #[test]
     fn parse() {
-        let der = include_bytes!("../../test/identity.p12");
+        let der = include_bytes!("../test/identity.p12");
         let pkcs12 = Pkcs12::from_der(der).unwrap();
         let parsed = pkcs12.parse("mypass").unwrap();
 
diff --git a/openssl/src/crypto/pkcs5.rs b/openssl/src/pkcs5.rs
index 8bcb9b31..b0c899e5 100644
--- a/openssl/src/crypto/pkcs5.rs
+++ b/openssl/src/pkcs5.rs
@@ -3,8 +3,8 @@ use std::ptr;
 use ffi;
 
 use cvt;
-use crypto::hash::MessageDigest;
-use crypto::symm::Cipher;
+use hash::MessageDigest;
+use symm::Cipher;
 use error::ErrorStack;
 
 #[derive(Clone, Eq, PartialEq, Hash, Debug)]
@@ -98,8 +98,8 @@ pub fn pbkdf2_hmac(pass: &[u8],
 
 #[cfg(test)]
 mod tests {
-    use crypto::hash::MessageDigest;
-    use crypto::symm::Cipher;
+    use hash::MessageDigest;
+    use symm::Cipher;
 
     // Test vectors from
     // https://git.lysator.liu.se/nettle/nettle/blob/nettle_3.1.1_release_20150424/testsuite/pbkdf2-test.c
diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/pkey.rs
index 1d062cfa..e62bbbd9 100644
--- a/openssl/src/crypto/pkey.rs
+++ b/openssl/src/pkey.rs
@@ -5,10 +5,10 @@ use ffi;
 
 use {cvt, cvt_p};
 use bio::{MemBio, MemBioSlice};
-use crypto::dsa::DSA;
-use crypto::rsa::RSA;
+use dsa::Dsa;
+use rsa::Rsa;
 use error::ErrorStack;
-use crypto::util::{CallbackState, invoke_passwd_cb};
+use util::{CallbackState, invoke_passwd_cb};
 
 pub struct PKey(*mut ffi::EVP_PKEY);
 
@@ -18,7 +18,7 @@ unsafe impl Sync for PKey {}
 /// Represents a public key, optionally with a private key attached.
 impl PKey {
     /// Create a new `PKey` containing an RSA key.
-    pub fn from_rsa(rsa: RSA) -> Result<PKey, ErrorStack> {
+    pub fn from_rsa(rsa: Rsa) -> Result<PKey, ErrorStack> {
         unsafe {
             let evp = try!(cvt_p(ffi::EVP_PKEY_new()));
             let pkey = PKey(evp);
@@ -29,7 +29,7 @@ impl PKey {
     }
 
     /// Create a new `PKey` containing a DSA key.
-    pub fn from_dsa(dsa: DSA) -> Result<PKey, ErrorStack> {
+    pub fn from_dsa(dsa: Dsa) -> Result<PKey, ErrorStack> {
         unsafe {
             let evp = try!(cvt_p(ffi::EVP_PKEY_new()));
             let pkey = PKey(evp);
@@ -102,7 +102,7 @@ impl PKey {
     }
 
     /// assign RSA key to this pkey
-    pub fn set_rsa(&mut self, rsa: &RSA) -> Result<(), ErrorStack> {
+    pub fn set_rsa(&mut self, rsa: &Rsa) -> Result<(), ErrorStack> {
         unsafe {
             // this needs to be a reference as the set1_RSA ups the reference count
             let rsa_ptr = rsa.as_ptr();
@@ -112,11 +112,11 @@ impl PKey {
     }
 
     /// Get a reference to the interal RSA key for direct access to the key components
-    pub fn rsa(&self) -> Result<RSA, ErrorStack> {
+    pub fn rsa(&self) -> Result<Rsa, ErrorStack> {
         unsafe {
             let rsa = try!(cvt_p(ffi::EVP_PKEY_get1_RSA(self.0)));
             // this is safe as the ffi increments a reference counter to the internal key
-            Ok(RSA::from_ptr(rsa))
+            Ok(Rsa::from_ptr(rsa))
         }
     }
 
@@ -167,19 +167,19 @@ impl Drop for PKey {
 mod tests {
     #[test]
     fn test_private_key_from_pem() {
-        let key = include_bytes!("../../test/key.pem");
+        let key = include_bytes!("../test/key.pem");
         super::PKey::private_key_from_pem(key).unwrap();
     }
 
     #[test]
     fn test_public_key_from_pem() {
-        let key = include_bytes!("../../test/key.pem.pub");
+        let key = include_bytes!("../test/key.pem.pub");
         super::PKey::public_key_from_pem(key).unwrap();
     }
 
     #[test]
     fn test_pem() {
-        let key = include_bytes!("../../test/key.pem");
+        let key = include_bytes!("../test/key.pem");
         let key = super::PKey::private_key_from_pem(key).unwrap();
 
         let priv_key = key.private_key_to_pem().unwrap();
diff --git a/openssl/src/crypto/rand.rs b/openssl/src/rand.rs
index c1c49e7b..c1c49e7b 100644
--- a/openssl/src/crypto/rand.rs
+++ b/openssl/src/rand.rs
diff --git a/openssl/src/crypto/rsa.rs b/openssl/src/rsa.rs
index 1b9e0e76..550ce6e4 100644
--- a/openssl/src/crypto/rsa.rs
+++ b/openssl/src/rsa.rs
@@ -8,7 +8,7 @@ use {cvt, cvt_p, cvt_n};
 use bn::{BigNum, BigNumRef};
 use bio::{MemBio, MemBioSlice};
 use error::ErrorStack;
-use crypto::util::{CallbackState, invoke_passwd_cb};
+use util::{CallbackState, invoke_passwd_cb};
 
 /// Type of encryption padding to use.
 #[derive(Copy, Clone)]
@@ -28,9 +28,9 @@ impl Padding {
     }
 }
 
-pub struct RSA(*mut ffi::RSA);
+pub struct Rsa(*mut ffi::RSA);
 
-impl Drop for RSA {
+impl Drop for Rsa {
     fn drop(&mut self) {
         unsafe {
             ffi::RSA_free(self.0);
@@ -38,12 +38,12 @@ impl Drop for RSA {
     }
 }
 
-impl RSA {
+impl Rsa {
     /// only useful for associating the key material directly with the key, it's safer to use
     /// the supplied load and save methods for DER formatted keys.
-    pub fn from_public_components(n: BigNum, e: BigNum) -> Result<RSA, ErrorStack> {
+    pub fn from_public_components(n: BigNum, e: BigNum) -> Result<Rsa, ErrorStack> {
         unsafe {
-            let rsa = RSA(try!(cvt_p(ffi::RSA_new())));
+            let rsa = Rsa(try!(cvt_p(ffi::RSA_new())));
             try!(cvt(compat::set_key(rsa.0,
                                      n.as_ptr(),
                                      e.as_ptr(),
@@ -61,9 +61,9 @@ impl RSA {
                                    dp: BigNum,
                                    dq: BigNum,
                                    qi: BigNum)
-                                   -> Result<RSA, ErrorStack> {
+                                   -> Result<Rsa, ErrorStack> {
         unsafe {
-            let rsa = RSA(try!(cvt_p(ffi::RSA_new())));
+            let rsa = Rsa(try!(cvt_p(ffi::RSA_new())));
             try!(cvt(compat::set_key(rsa.0, n.as_ptr(), e.as_ptr(), d.as_ptr())));
             mem::forget((n, e, d));
             try!(cvt(compat::set_factors(rsa.0, p.as_ptr(), q.as_ptr())));
@@ -75,16 +75,16 @@ impl RSA {
         }
     }
 
-    pub unsafe fn from_ptr(rsa: *mut ffi::RSA) -> RSA {
-        RSA(rsa)
+    pub unsafe fn from_ptr(rsa: *mut ffi::RSA) -> Rsa {
+        Rsa(rsa)
     }
 
     /// Generates a public/private key pair with the specified size.
     ///
     /// The public exponent will be 65537.
-    pub fn generate(bits: u32) -> Result<RSA, ErrorStack> {
+    pub fn generate(bits: u32) -> Result<Rsa, ErrorStack> {
         unsafe {
-            let rsa = RSA(try!(cvt_p(ffi::RSA_new())));
+            let rsa = Rsa(try!(cvt_p(ffi::RSA_new())));
             let e = try!(BigNum::from_u32(ffi::RSA_F4 as u32));
             try!(cvt(ffi::RSA_generate_key_ex(rsa.0, bits as c_int, e.as_ptr(), ptr::null_mut())));
             Ok(rsa)
@@ -92,19 +92,19 @@ impl RSA {
     }
 
     /// Reads an RSA private key from PEM formatted data.
-    pub fn private_key_from_pem(buf: &[u8]) -> Result<RSA, ErrorStack> {
+    pub fn private_key_from_pem(buf: &[u8]) -> Result<Rsa, ErrorStack> {
         let mem_bio = try!(MemBioSlice::new(buf));
         unsafe {
             let rsa = try!(cvt_p(ffi::PEM_read_bio_RSAPrivateKey(mem_bio.as_ptr(),
                                                                  ptr::null_mut(),
                                                                  None,
                                                                  ptr::null_mut())));
-            Ok(RSA(rsa))
+            Ok(Rsa(rsa))
         }
     }
 
     /// Reads an RSA private key from PEM formatted data and supplies a password callback.
-    pub fn private_key_from_pem_cb<F>(buf: &[u8], pass_cb: F) -> Result<RSA, ErrorStack>
+    pub fn private_key_from_pem_cb<F>(buf: &[u8], pass_cb: F) -> Result<Rsa, ErrorStack>
         where F: FnOnce(&mut [c_char]) -> usize
     {
         let mut cb = CallbackState::new(pass_cb);
@@ -116,19 +116,19 @@ impl RSA {
                                                                  ptr::null_mut(),
                                                                  Some(invoke_passwd_cb::<F>),
                                                                  cb_ptr)));
-            Ok(RSA(rsa))
+            Ok(Rsa(rsa))
         }
     }
 
     /// Reads an RSA public key from PEM formatted data.
-    pub fn public_key_from_pem(buf: &[u8]) -> Result<RSA, ErrorStack> {
+    pub fn public_key_from_pem(buf: &[u8]) -> Result<Rsa, ErrorStack> {
         let mem_bio = try!(MemBioSlice::new(buf));
         unsafe {
             let rsa = try!(cvt_p(ffi::PEM_read_bio_RSA_PUBKEY(mem_bio.as_ptr(),
                                                               ptr::null_mut(),
                                                               None,
                                                               ptr::null_mut())));
-            Ok(RSA(rsa))
+            Ok(Rsa(rsa))
         }
     }
 
@@ -323,7 +323,7 @@ impl RSA {
     }
 }
 
-impl fmt::Debug for RSA {
+impl fmt::Debug for Rsa {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "RSA")
     }
@@ -421,8 +421,8 @@ mod test {
     #[test]
     pub fn test_password() {
         let mut password_queried = false;
-        let key = include_bytes!("../../test/rsa-encrypted.pem");
-        RSA::private_key_from_pem_cb(key, |password| {
+        let key = include_bytes!("../test/rsa-encrypted.pem");
+        Rsa::private_key_from_pem_cb(key, |password| {
             password_queried = true;
             password[0] = b'm' as c_char;
             password[1] = b'y' as c_char;
@@ -438,16 +438,16 @@ mod test {
 
     #[test]
     pub fn test_public_encrypt_private_decrypt_with_padding() {
-        let key = include_bytes!("../../test/rsa.pem.pub");
-        let public_key = RSA::public_key_from_pem(key).unwrap();
+        let key = include_bytes!("../test/rsa.pem.pub");
+        let public_key = Rsa::public_key_from_pem(key).unwrap();
 
         let mut result = vec![0; public_key.size()];
         let original_data = b"This is test";
         let len = public_key.public_encrypt(original_data, &mut result, Padding::pkcs1()).unwrap();
         assert_eq!(len, 256);
 
-        let pkey = include_bytes!("../../test/rsa.pem");
-        let private_key = RSA::private_key_from_pem(pkey).unwrap();
+        let pkey = include_bytes!("../test/rsa.pem");
+        let private_key = Rsa::private_key_from_pem(pkey).unwrap();
         let mut dec_result = vec![0; private_key.size()];
         let len = private_key.private_decrypt(&result, &mut dec_result, Padding::pkcs1()).unwrap();
 
@@ -456,9 +456,9 @@ mod test {
 
     #[test]
    fn test_private_encrypt() {
-        let k0 = super::RSA::generate(512).unwrap();
+        let k0 = super::Rsa::generate(512).unwrap();
         let k0pkey = k0.public_key_to_pem().unwrap();
-        let k1 = super::RSA::public_key_from_pem(&k0pkey).unwrap();
+        let k1 = super::Rsa::public_key_from_pem(&k0pkey).unwrap();
 
         let msg = vec![0xdeu8, 0xadu8, 0xd0u8, 0x0du8];
 
@@ -471,9 +471,9 @@ mod test {
 
    #[test]
    fn test_public_encrypt() {
-       let k0 = super::RSA::generate(512).unwrap();
+       let k0 = super::Rsa::generate(512).unwrap();
        let k0pkey = k0.private_key_to_pem().unwrap();
-       let k1 = super::RSA::private_key_from_pem(&k0pkey).unwrap();
+       let k1 = super::Rsa::private_key_from_pem(&k0pkey).unwrap();
 
        let msg = vec![0xdeu8, 0xadu8, 0xd0u8, 0x0du8];
 
diff --git a/openssl/src/crypto/sign.rs b/openssl/src/sign.rs
index 41009149..a1a37ce6 100644
--- a/openssl/src/crypto/sign.rs
+++ b/openssl/src/sign.rs
@@ -10,13 +10,13 @@
 //! Sign and verify data given an RSA keypair:
 //!
 //! ```rust
-//! use openssl::crypto::sign::{Signer, Verifier};
-//! use openssl::crypto::rsa::RSA;
-//! use openssl::crypto::pkey::PKey;
-//! use openssl::crypto::hash::MessageDigest;
+//! use openssl::sign::{Signer, Verifier};
+//! use openssl::rsa::Rsa;
+//! use openssl::pkey::PKey;
+//! use openssl::hash::MessageDigest;
 //!
 //! // Generate a keypair
-//! let keypair = RSA::generate(2048).unwrap();
+//! let keypair = Rsa::generate(2048).unwrap();
 //! let keypair = PKey::from_rsa(keypair).unwrap();
 //!
 //! let data = b"hello, world!";
@@ -38,9 +38,9 @@
 //! Compute an HMAC (note that `Verifier` cannot be used with HMACs):
 //!
 //! ```rust
-//! use openssl::crypto::sign::Signer;
-//! use openssl::crypto::pkey::PKey;
-//! use openssl::crypto::hash::MessageDigest;
+//! use openssl::sign::Signer;
+//! use openssl::pkey::PKey;
+//! use openssl::hash::MessageDigest;
 //!
 //! // Create a PKey
 //! let key = PKey::hmac(b"my secret").unwrap();
@@ -60,8 +60,8 @@ use std::marker::PhantomData;
 use std::ptr;
 
 use {cvt, cvt_p};
-use crypto::hash::MessageDigest;
-use crypto::pkey::PKey;
+use hash::MessageDigest;
+use pkey::PKey;
 use error::ErrorStack;
 
 #[cfg(ossl110)]
@@ -208,11 +208,11 @@ mod test {
     use serialize::hex::FromHex;
     use std::iter;
 
-    use crypto::hash::MessageDigest;
-    use crypto::sign::{Signer, Verifier};
-    use crypto::rsa::RSA;
-    use crypto::dsa::DSA;
-    use crypto::pkey::PKey;
+    use hash::MessageDigest;
+    use sign::{Signer, Verifier};
+    use rsa::Rsa;
+    use dsa::Dsa;
+    use pkey::PKey;
 
     static INPUT: &'static [u8] =
         &[101, 121, 74, 104, 98, 71, 99, 105, 79, 105, 74, 83, 85, 122, 73, 49, 78, 105, 74, 57,
@@ -240,8 +240,8 @@ mod test {
 
     #[test]
     fn rsa_sign() {
-        let key = include_bytes!("../../test/rsa.pem");
-        let private_key = RSA::private_key_from_pem(key).unwrap();
+        let key = include_bytes!("../test/rsa.pem");
+        let private_key = Rsa::private_key_from_pem(key).unwrap();
         let pkey = PKey::from_rsa(private_key).unwrap();
 
         let mut signer = Signer::new(MessageDigest::sha256(), &pkey).unwrap();
@@ -253,8 +253,8 @@ mod test {
 
     #[test]
     fn rsa_verify_ok() {
-        let key = include_bytes!("../../test/rsa.pem");
-        let private_key = RSA::private_key_from_pem(key).unwrap();
+        let key = include_bytes!("../test/rsa.pem");
+        let private_key = Rsa::private_key_from_pem(key).unwrap();
         let pkey = PKey::from_rsa(private_key).unwrap();
 
         let mut verifier = Verifier::new(MessageDigest::sha256(), &pkey).unwrap();
@@ -264,8 +264,8 @@ mod test {
 
     #[test]
     fn rsa_verify_invalid() {
-        let key = include_bytes!("../../test/rsa.pem");
-        let private_key = RSA::private_key_from_pem(key).unwrap();
+        let key = include_bytes!("../test/rsa.pem");
+        let private_key = Rsa::private_key_from_pem(key).unwrap();
         let pkey = PKey::from_rsa(private_key).unwrap();
 
         let mut verifier = Verifier::new(MessageDigest::sha256(), &pkey).unwrap();
@@ -279,13 +279,13 @@ mod test {
         let input: Vec<u8> = (0..25).cycle().take(1024).collect();
 
         let private_key = {
-            let key = include_bytes!("../../test/dsa.pem");
-            PKey::from_dsa(DSA::private_key_from_pem(key).unwrap()).unwrap()
+            let key = include_bytes!("../test/dsa.pem");
+            PKey::from_dsa(Dsa::private_key_from_pem(key).unwrap()).unwrap()
         };
 
         let public_key = {
-            let key = include_bytes!("../../test/dsa.pem.pub");
-            PKey::from_dsa(DSA::public_key_from_pem(key).unwrap()).unwrap()
+            let key = include_bytes!("../test/dsa.pem.pub");
+            PKey::from_dsa(Dsa::public_key_from_pem(key).unwrap()).unwrap()
         };
 
         let mut signer = Signer::new(MessageDigest::sha1(), &private_key).unwrap();
@@ -302,13 +302,13 @@ mod test {
         let input: Vec<u8> = (0..25).cycle().take(1024).collect();
 
         let private_key = {
-            let key = include_bytes!("../../test/dsa.pem");
-            PKey::from_dsa(DSA::private_key_from_pem(key).unwrap()).unwrap()
+            let key = include_bytes!("../test/dsa.pem");
+            PKey::from_dsa(Dsa::private_key_from_pem(key).unwrap()).unwrap()
         };
 
         let public_key = {
-            let key = include_bytes!("../../test/dsa.pem.pub");
-            PKey::from_dsa(DSA::public_key_from_pem(key).unwrap()).unwrap()
+            let key = include_bytes!("../test/dsa.pem.pub");
+            PKey::from_dsa(Dsa::public_key_from_pem(key).unwrap()).unwrap()
         };
 
         let mut signer = Signer::new(MessageDigest::sha1(), &private_key).unwrap();
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 963f252c..6e5a2c09 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -24,7 +24,7 @@ use dh::DH;
 use x509::{X509StoreContextRef, X509FileType, X509, X509Ref, X509VerifyError};
 #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
 use x509::verify::X509VerifyParamRef;
-use crypto::pkey::PKey;
+use pkey::PKey;
 use error::ErrorStack;
 use opaque::Opaque;
 
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index fada2a8e..45c5b215 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -14,7 +14,7 @@ use std::time::Duration;
 
 use tempdir::TempDir;
 
-use crypto::hash::MessageDigest;
+use hash::MessageDigest;
 use ssl;
 use ssl::SSL_VERIFY_PEER;
 use ssl::{SslMethod, HandshakeError};
@@ -25,7 +25,7 @@ use x509::X509FileType;
 use x509::X509;
 #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
 use x509::verify::X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS;
-use crypto::pkey::PKey;
+use pkey::PKey;
 
 use std::net::UdpSocket;
 
@@ -167,7 +167,7 @@ macro_rules! run_test(
             use ssl::SslMethod;
             use ssl::{SslContext, Ssl, SslStream};
             use ssl::SSL_VERIFY_PEER;
-            use crypto::hash::MessageDigest;
+            use hash::MessageDigest;
             use x509::X509StoreContextRef;
             use serialize::hex::FromHex;
             use super::Server;
@@ -774,7 +774,7 @@ mod dtlsv1 {
     use std::net::TcpStream;
     use std::thread;
 
-    use crypto::hash::MessageDigest;
+    use hash::MessageDigest;
     use ssl::SslMethod;
     use ssl::{SslContext, SslStream};
     use ssl::SSL_VERIFY_PEER;
diff --git a/openssl/src/crypto/symm.rs b/openssl/src/symm.rs
index 65f0addb..65f0addb 100644
--- a/openssl/src/crypto/symm.rs
+++ b/openssl/src/symm.rs
diff --git a/openssl/src/crypto/util.rs b/openssl/src/util.rs
index 68d9b32a..68d9b32a 100644
--- a/openssl/src/crypto/util.rs
+++ b/openssl/src/util.rs
diff --git a/openssl/src/x509/extension.rs b/openssl/src/x509/extension.rs
index 99ef62c1..398bbb3e 100644
--- a/openssl/src/x509/extension.rs
+++ b/openssl/src/x509/extension.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use nid::Nid;
+use nid::{self, Nid};
 
 /// Type-only version of the `Extension` enum.
 ///
@@ -36,10 +36,10 @@ pub enum Extension {
     ///
     /// ```
     /// use openssl::x509::extension::Extension::*;
-    /// use openssl::nid::Nid;
+    /// use openssl::nid;
     ///
     /// # let generator = openssl::x509::X509Generator::new();
-    /// generator.add_extension(OtherNid(Nid::BasicConstraints,"critical,CA:TRUE".to_owned()));
+    /// generator.add_extension(OtherNid(nid::BASIC_CONSTRAINTS,"critical,CA:TRUE".to_owned()));
     /// ```
     OtherNid(Nid, String),
     /// Arbitrary extensions by OID string. See `man ASN1_generate_nconf` for value syntax.
@@ -71,10 +71,10 @@ impl Extension {
 impl ExtensionType {
     pub fn get_nid(&self) -> Option<Nid> {
         match self {
-            &ExtensionType::KeyUsage => Some(Nid::KeyUsage),
-            &ExtensionType::ExtKeyUsage => Some(Nid::ExtendedKeyUsage),
-            &ExtensionType::SubjectAltName => Some(Nid::SubjectAltName),
-            &ExtensionType::IssuerAltName => Some(Nid::IssuerAltName),
+            &ExtensionType::KeyUsage => Some(nid::KEY_USAGE),
+            &ExtensionType::ExtKeyUsage => Some(nid::EXT_KEY_USAGE),
+            &ExtensionType::SubjectAltName => Some(nid::SUBJECT_ALT_NAME),
+            &ExtensionType::IssuerAltName => Some(nid::ISSUER_ALT_NAME),
             &ExtensionType::OtherNid(nid) => Some(nid),
             &ExtensionType::OtherStr(_) => None,
         }
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index db5ef1df..af5c722a 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -15,9 +15,9 @@ use {cvt, cvt_p};
 use asn1::Asn1Time;
 use asn1::Asn1TimeRef;
 use bio::{MemBio, MemBioSlice};
-use crypto::hash::MessageDigest;
-use crypto::pkey::PKey;
-use crypto::rand::rand_bytes;
+use hash::MessageDigest;
+use pkey::PKey;
+use rand::rand_bytes;
 use error::ErrorStack;
 use ffi;
 use nid::Nid;
@@ -130,13 +130,13 @@ impl X509StoreContextRef {
 /// # Example
 ///
 /// ```
-/// use openssl::crypto::hash::MessageDigest;
-/// use openssl::crypto::pkey::PKey;
-/// use openssl::crypto::rsa::RSA;
+/// use openssl::hash::MessageDigest;
+/// use openssl::pkey::PKey;
+/// use openssl::rsa::Rsa;
 /// use openssl::x509::X509Generator;
 /// use openssl::x509::extension::{Extension, KeyUsageOption};
 ///
-/// let rsa = RSA::generate(2048).unwrap();
+/// let rsa = Rsa::generate(2048).unwrap();
 /// let pkey = PKey::from_rsa(rsa).unwrap();
 ///
 /// let gen = X509Generator::new()
@@ -257,7 +257,7 @@ impl X509Generator {
                 Some(nid) => {
                     try!(cvt_p(ffi::X509V3_EXT_conf_nid(ptr::null_mut(),
                                                       mem::transmute(&ctx),
-                                                      nid as c_int,
+                                                      nid.as_raw(),
                                                       value.as_ptr() as *mut c_char)))
                 }
                 None => {
@@ -414,7 +414,7 @@ impl X509Ref {
     pub fn subject_alt_names(&self) -> Option<GeneralNames> {
         unsafe {
             let stack = ffi::X509_get_ext_d2i(self.as_ptr(),
-                                              Nid::SubjectAltName as c_int,
+                                              ffi::NID_subject_alt_name,
                                               ptr::null_mut(),
                                               ptr::null_mut());
             if stack.is_null() {
@@ -553,7 +553,7 @@ impl X509NameRef {
 
     pub fn text_by_nid(&self, nid: Nid) -> Option<SslString> {
         unsafe {
-            let loc = ffi::X509_NAME_get_index_by_NID(self.as_ptr(), nid as c_int, -1);
+            let loc = ffi::X509_NAME_get_index_by_NID(self.as_ptr(), nid.as_raw(), -1);
             if loc == -1 {
                 return None;
             }
diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs
index afb06408..185c4910 100644
--- a/openssl/src/x509/tests.rs
+++ b/openssl/src/x509/tests.rs
@@ -1,14 +1,14 @@
 use serialize::hex::FromHex;
 
-use crypto::hash::MessageDigest;
-use crypto::pkey::PKey;
-use crypto::rsa::RSA;
+use hash::MessageDigest;
+use pkey::PKey;
+use rsa::Rsa;
 use x509::{X509, X509Generator};
 use x509::extension::Extension::{KeyUsage, ExtKeyUsage, SubjectAltName, OtherNid, OtherStr};
 use x509::extension::AltNameOption as SAN;
 use x509::extension::KeyUsageOption::{DigitalSignature, KeyEncipherment};
 use x509::extension::ExtKeyUsageOption::{self, ClientAuth, ServerAuth};
-use nid::Nid;
+use nid;
 
 fn get_generator() -> X509Generator {
     X509Generator::new()
@@ -20,12 +20,12 @@ fn get_generator() -> X509Generator {
                                         ServerAuth,
                                         ExtKeyUsageOption::Other("2.999.1".to_owned())]))
         .add_extension(SubjectAltName(vec![(SAN::DNS, "example.com".to_owned())]))
-        .add_extension(OtherNid(Nid::BasicConstraints, "critical,CA:TRUE".to_owned()))
+        .add_extension(OtherNid(nid::BASIC_CONSTRAINTS, "critical,CA:TRUE".to_owned()))
         .add_extension(OtherStr("2.999.2".to_owned(), "ASN1:UTF8:example value".to_owned()))
 }
 
 fn pkey() -> PKey {
-    let rsa = RSA::generate(2048).unwrap();
+    let rsa = Rsa::generate(2048).unwrap();
     PKey::from_rsa(rsa).unwrap()
 }
 
@@ -48,8 +48,8 @@ fn test_cert_gen() {
 fn test_cert_gen_extension_ordering() {
     let pkey = pkey();
     get_generator()
-        .add_extension(OtherNid(Nid::SubjectKeyIdentifier, "hash".to_owned()))
-        .add_extension(OtherNid(Nid::AuthorityKeyIdentifier, "keyid:always".to_owned()))
+        .add_extension(OtherNid(nid::SUBJECT_KEY_IDENTIFIER, "hash".to_owned()))
+        .add_extension(OtherNid(nid::AUTHORITY_KEY_IDENTIFIER, "keyid:always".to_owned()))
         .sign(&pkey)
         .expect("Failed to generate cert with order-dependent extensions");
 }
@@ -60,9 +60,9 @@ fn test_cert_gen_extension_ordering() {
 fn test_cert_gen_extension_bad_ordering() {
     let pkey = pkey();
     let result = get_generator()
-                     .add_extension(OtherNid(Nid::AuthorityKeyIdentifier,
+                     .add_extension(OtherNid(nid::AUTHORITY_KEY_IDENTIFIER,
                                              "keyid:always".to_owned()))
-                     .add_extension(OtherNid(Nid::SubjectKeyIdentifier, "hash".to_owned()))
+                     .add_extension(OtherNid(nid::SUBJECT_KEY_IDENTIFIER, "hash".to_owned()))
                      .sign(&pkey);
 
     assert!(result.is_err());
@@ -116,7 +116,7 @@ fn test_subject_read_cn() {
     let cert = include_bytes!("../../test/cert.pem");
     let cert = X509::from_pem(cert).ok().expect("Failed to load PEM");
     let subject = cert.subject_name();
-    let cn = match subject.text_by_nid(Nid::CN) {
+    let cn = match subject.text_by_nid(nid::COMMONNAME) {
         Some(x) => x,
         None => panic!("Failed to read CN from cert"),
     };
@@ -130,19 +130,19 @@ fn test_nid_values() {
     let cert = X509::from_pem(cert).ok().expect("Failed to load PEM");
     let subject = cert.subject_name();
 
-    let cn = match subject.text_by_nid(Nid::CN) {
+    let cn = match subject.text_by_nid(nid::COMMONNAME) {
         Some(x) => x,
         None => panic!("Failed to read CN from cert"),
     };
     assert_eq!(&cn as &str, "example.com");
 
-    let email = match subject.text_by_nid(Nid::Email) {
+    let email = match subject.text_by_nid(nid::PKCS9_EMAILADDRESS) {
         Some(x) => x,
         None => panic!("Failed to read subject email address from cert"),
     };
     assert_eq!(&email as &str, "[email protected]");
 
-    let friendly = match subject.text_by_nid(Nid::FriendlyName) {
+    let friendly = match subject.text_by_nid(nid::FRIENDLYNAME) {
         Some(x) => x,
         None => panic!("Failed to read subject friendly name from cert"),
     };
@@ -155,7 +155,7 @@ fn test_nid_uid_value() {
     let cert = X509::from_pem(cert).ok().expect("Failed to load PEM");
     let subject = cert.subject_name();
 
-    let cn = match subject.text_by_nid(Nid::UserId) {
+    let cn = match subject.text_by_nid(nid::USERID) {
         Some(x) => x,
         None => panic!("Failed to read UID from cert"),
     };