Extend PBE code to support non default PKCS#5 v2.0 PRFs.

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

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 7a64e944d82cee773c4e3e8418560615a9be2728..93ca25323b0cffd04b634b4e5d5f19d193ce162a 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1075,6 +1075,10 @@
 #define LN_md5_sha1            "md5-sha1"
 #define NID_md5_sha1           114
 
+#define LN_hmacWithMD5         "hmacWithMD5"
+#define NID_hmacWithMD5                802
+#define OBJ_hmacWithMD5                OBJ_rsadsi,2L,6L
+
 #define LN_hmacWithSHA1                "hmacWithSHA1"
 #define NID_hmacWithSHA1               163
 #define OBJ_hmacWithSHA1               OBJ_rsadsi,2L,7L
@@ -3510,15 +3514,15 @@
 #define NID_id_GostR3410_2001_cc               798
 #define OBJ_id_GostR3410_2001_cc               OBJ_cryptocom,1L,5L,4L
 
-#define SN_id_GostR3410_11_94_with_GostR3411_94_cc             "id-GostR3410-11-94-with-GostR3411-94-cc"
-#define LN_id_GostR3410_11_94_with_GostR3411_94_cc             "GOST R 34.10 with GOST R 34.11-94 Cryptocom"
-#define NID_id_GostR3410_11_94_with_GostR3411_94_cc            799
-#define OBJ_id_GostR3410_11_94_with_GostR3411_94_cc            OBJ_cryptocom,1L,3L,3L
+#define SN_id_GostR3411_94_with_GostR3410_94_cc                "id-GostR3411-94-with-GostR3410-94-cc"
+#define LN_id_GostR3411_94_with_GostR3410_94_cc                "GOST R 34.11-94 with GOST R 34.10-94 Cryptocom"
+#define NID_id_GostR3411_94_with_GostR3410_94_cc               799
+#define OBJ_id_GostR3411_94_with_GostR3410_94_cc               OBJ_cryptocom,1L,3L,3L
 
-#define SN_id_GostR3410_2001_with_GostR3411_94_cc              "id-GostR3410-2001-with-GostR3411-94-cc"
-#define LN_id_GostR3410_2001_with_GostR3411_94_cc              "GOST R 34.10-2001 with GOST R 34.10-94 Cryptocom"
-#define NID_id_GostR3410_2001_with_GostR3411_94_cc             800
-#define OBJ_id_GostR3410_2001_with_GostR3411_94_cc             OBJ_cryptocom,1L,3L,4L
+#define SN_id_GostR3411_94_with_GostR3410_2001_cc              "id-GostR3411-94-with-GostR3410-2001-cc"
+#define LN_id_GostR3411_94_with_GostR3410_2001_cc              "GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom"
+#define NID_id_GostR3411_94_with_GostR3410_2001_cc             800
+#define OBJ_id_GostR3411_94_with_GostR3410_2001_cc             OBJ_cryptocom,1L,3L,4L
 
 #define SN_id_GostR3410_2001_ParamSet_cc               "id-GostR3410-2001-ParamSet-cc"
 #define LN_id_GostR3410_2001_ParamSet_cc               "GOST R 3410-2001 Parameter Set Cryptocom"