From 04fc853ee33b9206062b1d0b233faddf2f4a8609 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sun, 23 Oct 2016 09:16:20 -0700 Subject: [PATCH] Remove NIDs only defined in 1.0.2+ --- openssl-sys/src/lib.rs | 39 --------------------------------------- openssl/src/nid.rs | 40 +--------------------------------------- 2 files changed, 1 insertion(+), 78 deletions(-) diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index dfe2fae0..10e3e895 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -240,7 +240,6 @@ pub const NID_md5WithRSAEncryption: c_int = 8; pub const NID_sha1WithRSAEncryption: c_int = 65; pub const NID_rsaesOaep: c_int = 919; pub const NID_mgf1: c_int = 911; -pub const NID_pSpecified: c_int = 935; pub const NID_rsassaPss: c_int = 912; pub const NID_sha256WithRSAEncryption: c_int = 668; pub const NID_sha384WithRSAEncryption: c_int = 669; @@ -692,7 +691,6 @@ pub const NID_mime_mhs_headings: c_int = 505; pub const NID_mime_mhs_bodies: c_int = 506; pub const NID_id_hex_partial_message: c_int = 507; pub const NID_id_hex_multipart_message: c_int = 508; -pub const NID_rle_compression: c_int = 124; pub const NID_zlib_compression: c_int = 125; pub const NID_aes_128_ecb: c_int = 418; pub const NID_aes_128_cbc: c_int = 419; @@ -1032,43 +1030,6 @@ pub const NID_rc4_hmac_md5: c_int = 915; pub const NID_aes_128_cbc_hmac_sha1: c_int = 916; pub const NID_aes_192_cbc_hmac_sha1: c_int = 917; pub const NID_aes_256_cbc_hmac_sha1: c_int = 918; -pub const NID_aes_128_cbc_hmac_sha256: c_int = 948; -pub const NID_aes_192_cbc_hmac_sha256: c_int = 949; -pub const NID_aes_256_cbc_hmac_sha256: c_int = 950; -pub const NID_dhpublicnumber: c_int = 920; -pub const NID_brainpoolP160r1: c_int = 921; -pub const NID_brainpoolP160t1: c_int = 922; -pub const NID_brainpoolP192r1: c_int = 923; -pub const NID_brainpoolP192t1: c_int = 924; -pub const NID_brainpoolP224r1: c_int = 925; -pub const NID_brainpoolP224t1: c_int = 926; -pub const NID_brainpoolP256r1: c_int = 927; -pub const NID_brainpoolP256t1: c_int = 928; -pub const NID_brainpoolP320r1: c_int = 929; -pub const NID_brainpoolP320t1: c_int = 930; -pub const NID_brainpoolP384r1: c_int = 931; -pub const NID_brainpoolP384t1: c_int = 932; -pub const NID_brainpoolP512r1: c_int = 933; -pub const NID_brainpoolP512t1: c_int = 934; -pub const NID_dhSinglePass_stdDH_sha1kdf_scheme: c_int = 936; -pub const NID_dhSinglePass_stdDH_sha224kdf_scheme: c_int = 937; -pub const NID_dhSinglePass_stdDH_sha256kdf_scheme: c_int = 938; -pub const NID_dhSinglePass_stdDH_sha384kdf_scheme: c_int = 939; -pub const NID_dhSinglePass_stdDH_sha512kdf_scheme: c_int = 940; -pub const NID_dhSinglePass_cofactorDH_sha1kdf_scheme: c_int = 941; -pub const NID_dhSinglePass_cofactorDH_sha224kdf_scheme: c_int = 942; -pub const NID_dhSinglePass_cofactorDH_sha256kdf_scheme: c_int = 943; -pub const NID_dhSinglePass_cofactorDH_sha384kdf_scheme: c_int = 944; -pub const NID_dhSinglePass_cofactorDH_sha512kdf_scheme: c_int = 945; -pub const NID_dh_std_kdf: c_int = 946; -pub const NID_dh_cofactor_kdf: c_int = 947; -pub const NID_ct_precert_scts: c_int = 951; -pub const NID_ct_precert_poison: c_int = 952; -pub const NID_ct_precert_signer: c_int = 953; -pub const NID_ct_cert_scts: c_int = 954; -pub const NID_jurisdictionLocalityName: c_int = 955; -pub const NID_jurisdictionStateOrProvinceName: c_int = 956; -pub const NID_jurisdictionCountryName: c_int = 957; pub const PKCS5_SALT_LEN: c_int = 8; diff --git a/openssl/src/nid.rs b/openssl/src/nid.rs index 480aa91a..b58e3a3d 100644 --- a/openssl/src/nid.rs +++ b/openssl/src/nid.rs @@ -137,7 +137,6 @@ 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 PSPECIFIED: Nid = Nid(ffi::NID_pSpecified); pub const RSASSAPSS: Nid = Nid(ffi::NID_rsassaPss); pub const SHA256WITHRSAENCRYPTION: Nid = Nid(ffi::NID_sha256WithRSAEncryption); pub const SHA384WITHRSAENCRYPTION: Nid = Nid(ffi::NID_sha384WithRSAEncryption); @@ -589,7 +588,6 @@ 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 RLE_COMPRESSION: Nid = Nid(ffi::NID_rle_compression); 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); @@ -929,40 +927,4 @@ 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); -pub const AES_128_CBC_HMAC_SHA256: Nid = Nid(ffi::NID_aes_128_cbc_hmac_sha256); -pub const AES_192_CBC_HMAC_SHA256: Nid = Nid(ffi::NID_aes_192_cbc_hmac_sha256); -pub const AES_256_CBC_HMAC_SHA256: Nid = Nid(ffi::NID_aes_256_cbc_hmac_sha256); -pub const DHPUBLICNUMBER: Nid = Nid(ffi::NID_dhpublicnumber); -pub const BRAINPOOLP160R1: Nid = Nid(ffi::NID_brainpoolP160r1); -pub const BRAINPOOLP160T1: Nid = Nid(ffi::NID_brainpoolP160t1); -pub const BRAINPOOLP192R1: Nid = Nid(ffi::NID_brainpoolP192r1); -pub const BRAINPOOLP192T1: Nid = Nid(ffi::NID_brainpoolP192t1); -pub const BRAINPOOLP224R1: Nid = Nid(ffi::NID_brainpoolP224r1); -pub const BRAINPOOLP224T1: Nid = Nid(ffi::NID_brainpoolP224t1); -pub const BRAINPOOLP256R1: Nid = Nid(ffi::NID_brainpoolP256r1); -pub const BRAINPOOLP256T1: Nid = Nid(ffi::NID_brainpoolP256t1); -pub const BRAINPOOLP320R1: Nid = Nid(ffi::NID_brainpoolP320r1); -pub const BRAINPOOLP320T1: Nid = Nid(ffi::NID_brainpoolP320t1); -pub const BRAINPOOLP384R1: Nid = Nid(ffi::NID_brainpoolP384r1); -pub const BRAINPOOLP384T1: Nid = Nid(ffi::NID_brainpoolP384t1); -pub const BRAINPOOLP512R1: Nid = Nid(ffi::NID_brainpoolP512r1); -pub const BRAINPOOLP512T1: Nid = Nid(ffi::NID_brainpoolP512t1); -pub const DHSINGLEPASS_STDDH_SHA1KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_stdDH_sha1kdf_scheme); -pub const DHSINGLEPASS_STDDH_SHA224KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_stdDH_sha224kdf_scheme); -pub const DHSINGLEPASS_STDDH_SHA256KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_stdDH_sha256kdf_scheme); -pub const DHSINGLEPASS_STDDH_SHA384KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_stdDH_sha384kdf_scheme); -pub const DHSINGLEPASS_STDDH_SHA512KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_stdDH_sha512kdf_scheme); -pub const DHSINGLEPASS_COFACTORDH_SHA1KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_cofactorDH_sha1kdf_scheme); -pub const DHSINGLEPASS_COFACTORDH_SHA224KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_cofactorDH_sha224kdf_scheme); -pub const DHSINGLEPASS_COFACTORDH_SHA256KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_cofactorDH_sha256kdf_scheme); -pub const DHSINGLEPASS_COFACTORDH_SHA384KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_cofactorDH_sha384kdf_scheme); -pub const DHSINGLEPASS_COFACTORDH_SHA512KDF_SCHEME: Nid = Nid(ffi::NID_dhSinglePass_cofactorDH_sha512kdf_scheme); -pub const DH_STD_KDF: Nid = Nid(ffi::NID_dh_std_kdf); -pub const DH_COFACTOR_KDF: Nid = Nid(ffi::NID_dh_cofactor_kdf); -pub const CT_PRECERT_SCTS: Nid = Nid(ffi::NID_ct_precert_scts); -pub const CT_PRECERT_POISON: Nid = Nid(ffi::NID_ct_precert_poison); -pub const CT_PRECERT_SIGNER: Nid = Nid(ffi::NID_ct_precert_signer); -pub const CT_CERT_SCTS: Nid = Nid(ffi::NID_ct_cert_scts); -pub const JURISDICTIONLOCALITYNAME: Nid = Nid(ffi::NID_jurisdictionLocalityName); -pub const JURISDICTIONSTATEORPROVINCENAME: Nid = Nid(ffi::NID_jurisdictionStateOrProvinceName); -pub const JURISDICTIONCOUNTRYNAME: Nid = Nid(ffi::NID_jurisdictionCountryName); +