#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
#define SN_id_GostR3411_94 "md_gost94"
#define LN_id_GostR3411_94 "GOST R 34.11-94"
-#define NID_id_GostR3411_94 800
+#define NID_id_GostR3411_94 795
#define OBJ_id_GostR3411_94 OBJ_cryptopro,9L
#define SN_id_HMACGostR3411_94 "id-HMACGostR3411-94"
#define NID_id_GostR3410_94 757
#define OBJ_id_GostR3410_94 OBJ_cryptopro,20L
-#define SN_id_Gost28147_89 "id-Gost28147-89"
+#define SN_id_Gost28147_89 "gost89"
#define LN_id_Gost28147_89 "GOST 28147-89"
#define NID_id_Gost28147_89 784
#define OBJ_id_Gost28147_89 OBJ_cryptopro,21L
#define SN_id_GostR3411_94_prf "prf-gostr3411-94"
#define LN_id_GostR3411_94_prf "GOST R 34.11-94 PRF"
-#define NID_id_GostR3411_94_prf 801
+#define NID_id_GostR3411_94_prf 796
#define OBJ_id_GostR3411_94_prf OBJ_cryptopro,23L
#define SN_id_GostR3410_2001DH "id-GostR3410-2001DH"
#define NID_id_Gost28147_89_cc 794
#define OBJ_id_Gost28147_89_cc OBJ_cryptocom,1L,6L,1L
-#define SN_id_Gost3410_94_cc "gost94cc"
-#define LN_id_Gost3410_94_cc "GOST 34.10-94 Cryptocom"
-#define NID_id_Gost3410_94_cc 795
-#define OBJ_id_Gost3410_94_cc OBJ_cryptocom,1L,5L,3L
+#define SN_id_GostR3410_94_cc "gost94cc"
+#define LN_id_GostR3410_94_cc "GOST 34.10-94 Cryptocom"
+#define NID_id_GostR3410_94_cc 797
+#define OBJ_id_GostR3410_94_cc OBJ_cryptocom,1L,5L,3L
-#define SN_id_Gost3410_2001_cc "gost2001cc"
-#define LN_id_Gost3410_2001_cc "GOST 34.10-2001 Cryptocom"
-#define NID_id_Gost3410_2001_cc 796
-#define OBJ_id_Gost3410_2001_cc OBJ_cryptocom,1L,5L,4L
+#define SN_id_GostR3410_2001_cc "gost2001cc"
+#define LN_id_GostR3410_2001_cc "GOST 34.10-2001 Cryptocom"
+#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 797
-#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 798
-#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"
-#define NID_id_GostR3410_2001_ParamSet_cc 799
+#define NID_id_GostR3410_2001_ParamSet_cc 801
#define OBJ_id_GostR3410_2001_ParamSet_cc OBJ_cryptocom,1L,8L,1L