Commit 5e0e9fce authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Minor object name edit.

parent 53ec8809

crypto/objects/obj_dat.h

+2 −3
Original line number Diff line number Diff line
@@ -2084,8 +2084,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ 
{"cryptocom","cryptocom",NID_cryptocom,5,&(lvalues[5207]),0},

{"id-HMACGostR3411-94","HMAC GOST 34.11-94",NID_id_HMACGostR3411_94,6,

	&(lvalues[5212]),0},

{"id-Gost28147-89","GOST 28147-89",NID_id_Gost28147_89,6,

	&(lvalues[5218]),0},

{"gost89","GOST 28147-89",NID_id_Gost28147_89,6,&(lvalues[5218]),0},

{"id-Gost28147-89-MAC","GOST 28147-89 MAC",NID_id_Gost28147_89_MAC,6,

	&(lvalues[5224]),0},

{"id-GostR3410-2001DH","GOST R 34.10-2001 DH",NID_id_GostR3410_2001DH,
@@ -2370,6 +2369,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ 
&(nid_objs[509]),/* "generationQualifier" */

&(nid_objs[756]),/* "gost2001" */

&(nid_objs[796]),/* "gost2001cc" */

&(nid_objs[784]),/* "gost89" */

&(nid_objs[757]),/* "gost94" */

&(nid_objs[795]),/* "gost94cc" */

&(nid_objs[163]),/* "hmacWithSHA1" */
@@ -2381,7 +2381,6 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ 
&(nid_objs[473]),/* "homeTelephoneNumber" */

&(nid_objs[466]),/* "host" */

&(nid_objs[442]),/* "iA5StringSyntax" */

&(nid_objs[784]),/* "id-Gost28147-89" */

&(nid_objs[761]),/* "id-Gost28147-89-CryptoPro-A-ParamSet" */

&(nid_objs[762]),/* "id-Gost28147-89-CryptoPro-B-ParamSet" */

&(nid_objs[763]),/* "id-Gost28147-89-CryptoPro-C-ParamSet" */

crypto/objects/obj_mac.h

+1 −1
Original line number Diff line number Diff line
@@ -3350,7 +3350,7 @@ 
#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

crypto/objects/objects.txt

+2 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,8 @@ cryptopro 10 : id-HMACGostR3411-94 : HMAC GOST 34.11-94 
cryptopro 19		: gost2001	: GOST R 34.10-2001

!Cname id-GostR3410-94

cryptopro 20		: gost94	: GOST R 34.10-94

cryptopro 21		: id-Gost28147-89 : GOST 28147-89

!Cname id-Gost28147-89

cryptopro 21		: gost89 		: GOST 28147-89

cryptopro 22		: id-Gost28147-89-MAC	: GOST 28147-89 MAC

!Cname id-GostR3411-94-prf

cryptopro 23		: prf-gostr3411-94	: GOST R 34.11-94 PRF