Produce meaningful error if sanity check fails.

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

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 9942868e6d11708a83776a284359968ac30e9527..a373bc0c882a2220dd4e1b5264b3bccc0cf82d14 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -829,6 +829,10 @@
 #define NID_id_smime_ct_DVCSResponseData               211
 #define OBJ_id_smime_ct_DVCSResponseData               OBJ_id_smime_ct,8L
 
+#define SN_id_smime_ct_compressedData          "id-smime-ct-compressedData"
+#define NID_id_smime_ct_compressedData         851
+#define OBJ_id_smime_ct_compressedData         OBJ_id_smime_ct,9L
+
 #define SN_id_smime_aa_receiptRequest          "id-smime-aa-receiptRequest"
 #define NID_id_smime_aa_receiptRequest         212
 #define OBJ_id_smime_aa_receiptRequest         OBJ_id_smime_aa,1L
@@ -2396,7 +2400,7 @@
 #define SN_zlib_compression            "ZLIB"
 #define LN_zlib_compression            "zlib compression"
 #define NID_zlib_compression           125
-#define OBJ_zlib_compression           1L,1L,1L,1L,666L,2L
+#define OBJ_zlib_compression           OBJ_id_smime_alg,8L
 
 #define OBJ_csor               2L,16L,840L,1L,101L,3L
 
@@ -2504,6 +2508,18 @@
 #define LN_des_ede3_cfb8               "des-ede3-cfb8"
 #define NID_des_ede3_cfb8              659
 
+#define SN_id_aes128_wrap              "id-aes128-wrap"
+#define NID_id_aes128_wrap             852
+#define OBJ_id_aes128_wrap             OBJ_aes,5L
+
+#define SN_id_aes192_wrap              "id-aes192-wrap"
+#define NID_id_aes192_wrap             853
+#define OBJ_id_aes192_wrap             OBJ_aes,25L
+
+#define SN_id_aes256_wrap              "id-aes256-wrap"
+#define NID_id_aes256_wrap             854
+#define OBJ_id_aes256_wrap             OBJ_aes,45L
+
 #define OBJ_nist_hashalgs              OBJ_nistAlgorithms,2L
 
 #define SN_sha256              "SHA256"
@@ -3451,10 +3467,10 @@
 #define SN_gost89_cnt          "gost89-cnt"
 #define NID_gost89_cnt         809
 
-#define SN_id_Gost28147_89_MAC                                 "gost-mac"
-#define LN_id_Gost28147_89_MAC                                 "GOST 28147-89 MAC"
-#define NID_id_Gost28147_89_MAC                                        810
-#define OBJ_id_Gost28147_89_MAC                                        OBJ_cryptopro,22L
+#define SN_id_Gost28147_89_MAC         "gost-mac"
+#define LN_id_Gost28147_89_MAC         "GOST 28147-89 MAC"
+#define NID_id_Gost28147_89_MAC                810
+#define OBJ_id_Gost28147_89_MAC                OBJ_cryptopro,22L
 
 #define SN_id_GostR3411_94_prf         "prf-gostr3411-94"
 #define LN_id_GostR3411_94_prf         "GOST R 34.11-94 PRF"