Sync OID numbers with 1.0.2 branch.

[openssl.git] / crypto / objects / obj_mac.h

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 9c28af9fb4c409fd2a93f59449cd28102006086e..841b02a546161e5071f5fb1c49b868ee4ee290c8 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -592,7 +592,7 @@
 
 #define SN_pSpecified          "PSPECIFIED"
 #define LN_pSpecified          "pSpecified"
-#define NID_pSpecified         938
+#define NID_pSpecified         935
 #define OBJ_pSpecified         OBJ_pkcs1,9L
 
 #define SN_rsassaPss           "RSASSA-PSS"
@@ -4037,15 +4037,15 @@
 
 #define SN_aes_128_cbc_hmac_sha256             "AES-128-CBC-HMAC-SHA256"
 #define LN_aes_128_cbc_hmac_sha256             "aes-128-cbc-hmac-sha256"
-#define NID_aes_128_cbc_hmac_sha256            935
+#define NID_aes_128_cbc_hmac_sha256            948
 
 #define SN_aes_192_cbc_hmac_sha256             "AES-192-CBC-HMAC-SHA256"
 #define LN_aes_192_cbc_hmac_sha256             "aes-192-cbc-hmac-sha256"
-#define NID_aes_192_cbc_hmac_sha256            936
+#define NID_aes_192_cbc_hmac_sha256            949
 
 #define SN_aes_256_cbc_hmac_sha256             "AES-256-CBC-HMAC-SHA256"
 #define LN_aes_256_cbc_hmac_sha256             "aes-256-cbc-hmac-sha256"
-#define NID_aes_256_cbc_hmac_sha256            937
+#define NID_aes_256_cbc_hmac_sha256            950
 
 #define SN_dhpublicnumber              "dhpublicnumber"
 #define LN_dhpublicnumber              "X9.42 DH"
@@ -4113,48 +4113,48 @@
 #define OBJ_secg_scheme                OBJ_certicom_arc,1L
 
 #define SN_dhSinglePass_stdDH_sha1kdf_scheme           "dhSinglePass-stdDH-sha1kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha1kdf_scheme          939
+#define NID_dhSinglePass_stdDH_sha1kdf_scheme          936
 #define OBJ_dhSinglePass_stdDH_sha1kdf_scheme          OBJ_x9_63_scheme,2L
 
 #define SN_dhSinglePass_stdDH_sha224kdf_scheme         "dhSinglePass-stdDH-sha224kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha224kdf_scheme                940
+#define NID_dhSinglePass_stdDH_sha224kdf_scheme                937
 #define OBJ_dhSinglePass_stdDH_sha224kdf_scheme                OBJ_secg_scheme,11L,0L
 
 #define SN_dhSinglePass_stdDH_sha256kdf_scheme         "dhSinglePass-stdDH-sha256kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha256kdf_scheme                941
+#define NID_dhSinglePass_stdDH_sha256kdf_scheme                938
 #define OBJ_dhSinglePass_stdDH_sha256kdf_scheme                OBJ_secg_scheme,11L,1L
 
 #define SN_dhSinglePass_stdDH_sha384kdf_scheme         "dhSinglePass-stdDH-sha384kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha384kdf_scheme                942
+#define NID_dhSinglePass_stdDH_sha384kdf_scheme                939
 #define OBJ_dhSinglePass_stdDH_sha384kdf_scheme                OBJ_secg_scheme,11L,2L
 
 #define SN_dhSinglePass_stdDH_sha512kdf_scheme         "dhSinglePass-stdDH-sha512kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha512kdf_scheme                943
+#define NID_dhSinglePass_stdDH_sha512kdf_scheme                940
 #define OBJ_dhSinglePass_stdDH_sha512kdf_scheme                OBJ_secg_scheme,11L,3L
 
 #define SN_dhSinglePass_cofactorDH_sha1kdf_scheme              "dhSinglePass-cofactorDH-sha1kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha1kdf_scheme             944
+#define NID_dhSinglePass_cofactorDH_sha1kdf_scheme             941
 #define OBJ_dhSinglePass_cofactorDH_sha1kdf_scheme             OBJ_x9_63_scheme,3L
 
 #define SN_dhSinglePass_cofactorDH_sha224kdf_scheme            "dhSinglePass-cofactorDH-sha224kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha224kdf_scheme           945
+#define NID_dhSinglePass_cofactorDH_sha224kdf_scheme           942
 #define OBJ_dhSinglePass_cofactorDH_sha224kdf_scheme           OBJ_secg_scheme,14L,0L
 
 #define SN_dhSinglePass_cofactorDH_sha256kdf_scheme            "dhSinglePass-cofactorDH-sha256kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha256kdf_scheme           946
+#define NID_dhSinglePass_cofactorDH_sha256kdf_scheme           943
 #define OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme           OBJ_secg_scheme,14L,1L
 
 #define SN_dhSinglePass_cofactorDH_sha384kdf_scheme            "dhSinglePass-cofactorDH-sha384kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha384kdf_scheme           947
+#define NID_dhSinglePass_cofactorDH_sha384kdf_scheme           944
 #define OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme           OBJ_secg_scheme,14L,2L
 
 #define SN_dhSinglePass_cofactorDH_sha512kdf_scheme            "dhSinglePass-cofactorDH-sha512kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha512kdf_scheme           948
+#define NID_dhSinglePass_cofactorDH_sha512kdf_scheme           945
 #define OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme           OBJ_secg_scheme,14L,3L
 
 #define SN_dh_std_kdf          "dh-std-kdf"
-#define NID_dh_std_kdf         949
+#define NID_dh_std_kdf         946
 
 #define SN_dh_cofactor_kdf             "dh-cofactor-kdf"
-#define NID_dh_cofactor_kdf            950
+#define NID_dh_cofactor_kdf            947