Rebuild mac table to avoid duplicates.

3 files changed, 53 insertions, 57 deletions

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 2ea5a7d1b4..5d6fe0bbc6 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -62,7 +62,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 804
+#define NUM_NID 802
 #define NUM_SN 798
 #define NUM_LN 798
 #define NUM_OBJ 760
@@ -821,13 +821,13 @@ static unsigned char lvalues[5345]={
 0x2A,0x85,0x03,0x02,0x02,0x14,0x03,          /* [5270] OBJ_id_GostR3410_94_b */
 0x2A,0x85,0x03,0x02,0x02,0x14,0x04,          /* [5277] OBJ_id_GostR3410_94_bBis */
 0x2A,0x85,0x03,0x02,0x09,0x01,0x06,0x01,     /* [5284] OBJ_id_Gost28147_89_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x03,     /* [5292] OBJ_id_GostR3410_11_94_with_GostR3411_94_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04,     /* [5300] OBJ_id_GostR3410_2001_with_GostR3411_94_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01,     /* [5308] OBJ_id_GostR3410_2001_ParamSet_cc */
-0x2A,0x85,0x03,0x02,0x02,0x09,               /* [5316] OBJ_id_GostR3411_94 */
-0x2A,0x85,0x03,0x02,0x02,0x17,               /* [5322] OBJ_id_GostR3411_94_prf */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x03,     /* [5328] OBJ_id_GostR3410_94_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x04,     /* [5336] OBJ_id_GostR3410_2001_cc */
+0x2A,0x85,0x03,0x02,0x02,0x09,               /* [5292] OBJ_id_GostR3411_94 */
+0x2A,0x85,0x03,0x02,0x02,0x17,               /* [5298] OBJ_id_GostR3411_94_prf */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x03,     /* [5304] OBJ_id_GostR3410_94_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x04,     /* [5312] OBJ_id_GostR3410_2001_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x03,     /* [5320] OBJ_id_GostR3410_11_94_with_GostR3411_94_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04,     /* [5328] OBJ_id_GostR3410_2001_with_GostR3411_94_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01,     /* [5336] OBJ_id_GostR3410_2001_ParamSet_cc */
 };
 
 static ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2106,24 +2106,22 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 	NID_id_GostR3410_94_bBis,7,&(lvalues[5277]),0},
 {"id-Gost28147-89-cc","GOST 28147-89 Cryptocom ParamSet",
 	NID_id_Gost28147_89_cc,8,&(lvalues[5284]),0},
-{NULL,NULL,NID_undef,0,NULL,0},
-{NULL,NULL,NID_undef,0,NULL,0},
+{"md_gost94","GOST R 34.11-94",NID_id_GostR3411_94,6,&(lvalues[5292]),0},
+{"prf-gostr3411-94","GOST R 34.11-94 PRF",NID_id_GostR3411_94_prf,6,
+	&(lvalues[5298]),0},
+{"gost94cc","GOST 34.10-94 Cryptocom",NID_id_GostR3410_94_cc,8,
+	&(lvalues[5304]),0},
+{"gost2001cc","GOST 34.10-2001 Cryptocom",NID_id_GostR3410_2001_cc,8,
+	&(lvalues[5312]),0},
 {"id-GostR3410-11-94-with-GostR3411-94-cc",
 	"GOST R 34.10 with GOST R 34.11-94 Cryptocom",
-	NID_id_GostR3410_11_94_with_GostR3411_94_cc,8,&(lvalues[5292]),0},
+	NID_id_GostR3410_11_94_with_GostR3411_94_cc,8,&(lvalues[5320]),0},
 {"id-GostR3410-2001-with-GostR3411-94-cc",
 	"GOST R 34.10-2001 with GOST R 34.10-94 Cryptocom",
-	NID_id_GostR3410_2001_with_GostR3411_94_cc,8,&(lvalues[5300]),0},
+	NID_id_GostR3410_2001_with_GostR3411_94_cc,8,&(lvalues[5328]),0},
 {"id-GostR3410-2001-ParamSet-cc",
 	"GOST R 3410-2001 Parameter Set Cryptocom",
-	NID_id_GostR3410_2001_ParamSet_cc,8,&(lvalues[5308]),0},
-{"md_gost94","GOST R 34.11-94",NID_id_GostR3411_94,6,&(lvalues[5316]),0},
-{"prf-gostr3411-94","GOST R 34.11-94 PRF",NID_id_GostR3411_94_prf,6,
-	&(lvalues[5322]),0},
-{"gost94cc","GOST 34.10-94 Cryptocom",NID_id_GostR3410_94_cc,8,
-	&(lvalues[5328]),0},
-{"gost2001cc","GOST 34.10-2001 Cryptocom",NID_id_GostR3410_2001_cc,8,
-	&(lvalues[5336]),0},
+	NID_id_GostR3410_2001_ParamSet_cc,8,&(lvalues[5336]),0},
 };
 
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -2370,10 +2368,10 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[156]),/* "friendlyName" */
 &(nid_objs[509]),/* "generationQualifier" */
 &(nid_objs[756]),/* "gost2001" */
-&(nid_objs[803]),/* "gost2001cc" */
+&(nid_objs[798]),/* "gost2001cc" */
 &(nid_objs[784]),/* "gost89" */
 &(nid_objs[757]),/* "gost94" */
-&(nid_objs[802]),/* "gost94cc" */
+&(nid_objs[797]),/* "gost94cc" */
 &(nid_objs[163]),/* "hmacWithSHA1" */
 &(nid_objs[432]),/* "holdInstructionCallIssuer" */
 &(nid_objs[430]),/* "holdInstructionCode" */
@@ -2395,15 +2393,15 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[789]),/* "id-Gost28147-89-None-KeyMeshing" */
 &(nid_objs[760]),/* "id-Gost28147-89-TestParamSet" */
 &(nid_objs[794]),/* "id-Gost28147-89-cc" */
-&(nid_objs[797]),/* "id-GostR3410-11-94-with-GostR3411-94-cc" */
+&(nid_objs[799]),/* "id-GostR3410-11-94-with-GostR3411-94-cc" */
 &(nid_objs[777]),/* "id-GostR3410-2001-CryptoPro-A-ParamSet" */
 &(nid_objs[778]),/* "id-GostR3410-2001-CryptoPro-B-ParamSet" */
 &(nid_objs[779]),/* "id-GostR3410-2001-CryptoPro-C-ParamSet" */
 &(nid_objs[780]),/* "id-GostR3410-2001-CryptoPro-XchA-ParamSet" */
 &(nid_objs[781]),/* "id-GostR3410-2001-CryptoPro-XchB-ParamSet" */
-&(nid_objs[799]),/* "id-GostR3410-2001-ParamSet-cc" */
+&(nid_objs[801]),/* "id-GostR3410-2001-ParamSet-cc" */
 &(nid_objs[776]),/* "id-GostR3410-2001-TestParamSet" */
-&(nid_objs[798]),/* "id-GostR3410-2001-with-GostR3411-94-cc" */
+&(nid_objs[800]),/* "id-GostR3410-2001-with-GostR3411-94-cc" */
 &(nid_objs[786]),/* "id-GostR3410-2001DH" */
 &(nid_objs[769]),/* "id-GostR3410-94-CryptoPro-A-ParamSet" */
 &(nid_objs[770]),/* "id-GostR3410-94-CryptoPro-B-ParamSet" */
@@ -2619,7 +2617,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[460]),/* "mail" */
 &(nid_objs[493]),/* "mailPreferenceOption" */
 &(nid_objs[467]),/* "manager" */
-&(nid_objs[800]),/* "md_gost94" */
+&(nid_objs[795]),/* "md_gost94" */
 &(nid_objs[182]),/* "member-body" */
 &(nid_objs[51]),/* "messageDigest" */
 &(nid_objs[383]),/* "mgmt" */
@@ -2688,7 +2686,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[738]),/* "policyMappings" */
 &(nid_objs[661]),/* "postalCode" */
 &(nid_objs[669]),/* "ppBasis" */
-&(nid_objs[801]),/* "prf-gostr3411-94" */
+&(nid_objs[796]),/* "prf-gostr3411-94" */
 &(nid_objs[406]),/* "prime-field" */
 &(nid_objs[409]),/* "prime192v1" */
 &(nid_objs[410]),/* "prime192v2" */
@@ -2947,19 +2945,19 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[784]),/* "GOST 28147-89" */
 &(nid_objs[794]),/* "GOST 28147-89 Cryptocom ParamSet" */
 &(nid_objs[785]),/* "GOST 28147-89 MAC" */
-&(nid_objs[803]),/* "GOST 34.10-2001 Cryptocom" */
-&(nid_objs[802]),/* "GOST 34.10-94 Cryptocom" */
-&(nid_objs[797]),/* "GOST R 34.10 with GOST R 34.11-94 Cryptocom" */
+&(nid_objs[798]),/* "GOST 34.10-2001 Cryptocom" */
+&(nid_objs[797]),/* "GOST 34.10-94 Cryptocom" */
+&(nid_objs[799]),/* "GOST R 34.10 with GOST R 34.11-94 Cryptocom" */
 &(nid_objs[756]),/* "GOST R 34.10-2001" */
 &(nid_objs[786]),/* "GOST R 34.10-2001 DH" */
-&(nid_objs[798]),/* "GOST R 34.10-2001 with GOST R 34.10-94 Cryptocom" */
+&(nid_objs[800]),/* "GOST R 34.10-2001 with GOST R 34.10-94 Cryptocom" */
 &(nid_objs[757]),/* "GOST R 34.10-94" */
 &(nid_objs[787]),/* "GOST R 34.10-94 DH" */
-&(nid_objs[800]),/* "GOST R 34.11-94" */
-&(nid_objs[801]),/* "GOST R 34.11-94 PRF" */
+&(nid_objs[795]),/* "GOST R 34.11-94" */
+&(nid_objs[796]),/* "GOST R 34.11-94 PRF" */
 &(nid_objs[754]),/* "GOST R 34.11-94 with GOST R 34.10-2001" */
 &(nid_objs[755]),/* "GOST R 34.11-94 with GOST R 34.10-94" */
-&(nid_objs[799]),/* "GOST R 3410-2001 Parameter Set Cryptocom" */
+&(nid_objs[801]),/* "GOST R 3410-2001 Parameter Set Cryptocom" */
 &(nid_objs[783]),/* "HMAC GOST 34.11-94" */
 &(nid_objs[432]),/* "Hold Instruction Call Issuer" */
 &(nid_objs[430]),/* "Hold Instruction Code" */
@@ -4002,13 +4000,13 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[125]),/* OBJ_zlib_compression             1 1 1 1 666 2 */
 &(nid_objs[754]),/* OBJ_id_GostR3411_94_with_GostR3410_2001 1 2 643 2 2 3 */
 &(nid_objs[755]),/* OBJ_id_GostR3411_94_with_GostR3410_94 1 2 643 2 2 4 */
-&(nid_objs[800]),/* OBJ_id_GostR3411_94              1 2 643 2 2 9 */
+&(nid_objs[795]),/* OBJ_id_GostR3411_94              1 2 643 2 2 9 */
 &(nid_objs[783]),/* OBJ_id_HMACGostR3411_94          1 2 643 2 2 10 */
 &(nid_objs[756]),/* OBJ_id_GostR3410_2001            1 2 643 2 2 19 */
 &(nid_objs[757]),/* OBJ_id_GostR3410_94              1 2 643 2 2 20 */
 &(nid_objs[784]),/* OBJ_id_Gost28147_89              1 2 643 2 2 21 */
 &(nid_objs[785]),/* OBJ_id_Gost28147_89_MAC          1 2 643 2 2 22 */
-&(nid_objs[801]),/* OBJ_id_GostR3411_94_prf          1 2 643 2 2 23 */
+&(nid_objs[796]),/* OBJ_id_GostR3411_94_prf          1 2 643 2 2 23 */
 &(nid_objs[786]),/* OBJ_id_GostR3410_2001DH          1 2 643 2 2 98 */
 &(nid_objs[787]),/* OBJ_id_GostR3410_94DH            1 2 643 2 2 99 */
 &(nid_objs[ 1]),/* OBJ_rsadsi                       1 2 840 113549 */
@@ -4082,12 +4080,12 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[508]),/* OBJ_id_hex_multipart_message     1 3 6 1 7 1 1 2 */
 &(nid_objs[57]),/* OBJ_netscape                     2 16 840 1 113730 */
 &(nid_objs[437]),/* OBJ_pilot                        0 9 2342 19200300 100 */
-&(nid_objs[797]),/* OBJ_id_GostR3410_11_94_with_GostR3411_94_cc 1 2 643 2 9 1 3 3 */
-&(nid_objs[798]),/* OBJ_id_GostR3410_2001_with_GostR3411_94_cc 1 2 643 2 9 1 3 4 */
-&(nid_objs[802]),/* OBJ_id_GostR3410_94_cc           1 2 643 2 9 1 5 3 */
-&(nid_objs[803]),/* OBJ_id_GostR3410_2001_cc         1 2 643 2 9 1 5 4 */
+&(nid_objs[799]),/* OBJ_id_GostR3410_11_94_with_GostR3411_94_cc 1 2 643 2 9 1 3 3 */
+&(nid_objs[800]),/* OBJ_id_GostR3410_2001_with_GostR3411_94_cc 1 2 643 2 9 1 3 4 */
+&(nid_objs[797]),/* OBJ_id_GostR3410_94_cc           1 2 643 2 9 1 5 3 */
+&(nid_objs[798]),/* OBJ_id_GostR3410_2001_cc         1 2 643 2 9 1 5 4 */
 &(nid_objs[794]),/* OBJ_id_Gost28147_89_cc           1 2 643 2 9 1 6 1 */
-&(nid_objs[799]),/* OBJ_id_GostR3410_2001_ParamSet_cc 1 2 643 2 9 1 8 1 */
+&(nid_objs[801]),/* OBJ_id_GostR3410_2001_ParamSet_cc 1 2 643 2 9 1 8 1 */
 &(nid_objs[186]),/* OBJ_pkcs1                        1 2 840 113549 1 1 */
 &(nid_objs[27]),/* OBJ_pkcs3                        1 2 840 113549 1 3 */
 &(nid_objs[187]),/* OBJ_pkcs5                        1 2 840 113549 1 5 */
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 075e55af50..7a64e944d8 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -3332,7 +3332,7 @@
 
 #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"
@@ -3362,7 +3362,7 @@
 
 #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"
@@ -3502,26 +3502,26 @@
 
 #define SN_id_GostR3410_94_cc		"gost94cc"
 #define LN_id_GostR3410_94_cc		"GOST 34.10-94 Cryptocom"
-#define NID_id_GostR3410_94_cc		802
+#define NID_id_GostR3410_94_cc		797
 #define OBJ_id_GostR3410_94_cc		OBJ_cryptocom,1L,5L,3L
 
 #define SN_id_GostR3410_2001_cc		"gost2001cc"
 #define LN_id_GostR3410_2001_cc		"GOST 34.10-2001 Cryptocom"
-#define NID_id_GostR3410_2001_cc		803
+#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 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_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 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_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
 
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index ccc314fb37..550d6ee9ea 100644
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -792,12 +792,10 @@ id_GostR3410_94_aBis		791
 id_GostR3410_94_b		792
 id_GostR3410_94_bBis		793
 id_Gost28147_89_cc		794
-id_Gost3410_94_cc		795
-id_Gost3410_2001_cc		796
-id_GostR3410_11_94_with_GostR3411_94_cc		797
-id_GostR3410_2001_with_GostR3411_94_cc		798
-id_GostR3410_2001_ParamSet_cc		799
-id_GostR3411_94		800
-id_GostR3411_94_prf		801
-id_GostR3410_94_cc		802
-id_GostR3410_2001_cc		803
+id_GostR3411_94		795
+id_GostR3411_94_prf		796
+id_GostR3410_94_cc		797
+id_GostR3410_2001_cc		798
+id_GostR3410_11_94_with_GostR3411_94_cc		799
+id_GostR3410_2001_with_GostR3411_94_cc		800
+id_GostR3410_2001_ParamSet_cc		801