Produce meaningful error if sanity check fails.

Delete trailing whitespace from objects.txt

Delete duplicate NIDs.

crypto/objects/obj_mac.h

@@ -2509,15 +2509,15 @@
 #define NID_des_ede3_cfb8		659
 
 #define SN_id_aes128_wrap		"id-aes128-wrap"
-#define NID_id_aes128_wrap		853
+#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		854
+#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		855
+#define NID_id_aes256_wrap		854
 #define OBJ_id_aes256_wrap		OBJ_aes,45L
 
 #define OBJ_nist_hashalgs		OBJ_nistAlgorithms,2L
@@ -3467,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					856
-#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"

crypto/objects/obj_mac.num

@@ -849,8 +849,6 @@ id_GostR3411_94_with_GostR3410_2001_cc		848
 id_GostR3410_2001_ParamSet_cc		849
 hmac		850
 id_smime_ct_compressedData		851
-id_Gost28147_89_MAC		852
-id_aes128_wrap		853
-id_aes192_wrap		854
-id_aes256_wrap		855
-id_Gost28147_89_MAC					856
+id_aes128_wrap		852
+id_aes192_wrap		853
+id_aes256_wrap		854

crypto/objects/objects.pl

@@ -15,7 +15,7 @@ while(<NUMIN>)
 	if (defined($nidn{$mynum}))
 		{ die "$ARGV[1]:$o:There's already an object with NID ",$mynum," on line ",$order{$mynum},"\n"; }
 	if (defined($nid{$Cname}))
-		{ die "$ARGV[1]:$o:There's already an object with name ",$mynum," on line ",$order{$nid{$Cname}},"\n"; }
+		{ die "$ARGV[1]:$o:There's already an object with name ",$Cname," on line ",$order{$nid{$Cname}},"\n"; }
 	$nid{$Cname} = $mynum;
 	$nidn{$mynum} = $Cname;
 	$order{$mynum} = $o;
@@ -104,6 +104,7 @@ while (<IN>)
 		$max_nid++;
 		$nid{$Cname} = $max_nid;
 		$nidn{$max_nid} = $Cname;
+print STDERR "Added OID $Cname\n";
 		}
 	$Cname="";
 	}

crypto/objects/objects.txt

@@ -1107,7 +1107,7 @@ cryptopro 20		: gost94	: GOST R 34.10-94
 !Cname id-Gost28147-89
 cryptopro 21		: gost89 		: GOST 28147-89
 			: gost89-cnt
-!Cname id-Gost28147-89-MAC			
+!Cname id-Gost28147-89-MAC
 cryptopro 22		: gost-mac	: GOST 28147-89 MAC
 !Cname id-GostR3411-94-prf
 cryptopro 23		: prf-gostr3411-94	: GOST R 34.11-94 PRF