Commit 9981a51e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Stage 1 GOST ciphersuite support. 

Submitted by: ran@cryptocom.ru
Reviewed by: steve@openssl.org
parent ebb326af

apps/ciphers.c

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ int MAIN(int argc, char **argv) 
	STDout = BIO_push(tmpbio, STDout);

	}

#endif

	if (!load_config(bio_err, NULL))

		goto end;



	argc--;

	argv++;

crypto/objects/obj_dat.h

+6 −3
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ 
 * [including the GNU Public Licence.]

 */



#define NUM_NID 835

#define NUM_SN 831

#define NUM_LN 831

#define NUM_NID 836

#define NUM_SN 832

#define NUM_LN 832

#define NUM_OBJ 787



static unsigned char lvalues[5560]={
@@ -2208,6 +2208,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ 
	&(lvalues[5541]),0},

{"dsa_with_SHA256","dsa_with_SHA256",NID_dsa_with_SHA256,9,

	&(lvalues[5550]),0},

{"gost89-cnt","gost89-cnt",NID_gost89_cnt,0,NULL,0},

};



static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -2483,6 +2484,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ 
&(nid_objs[784]),/* "gost2001" */

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

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

&(nid_objs[835]),/* "gost89-cnt" */

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

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

&(nid_objs[772]),/* "hmacWithMD5" */
@@ -3333,6 +3335,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ 
&(nid_objs[509]),/* "generationQualifier" */

&(nid_objs[601]),/* "generic cryptogram" */

&(nid_objs[99]),/* "givenName" */

&(nid_objs[835]),/* "gost89-cnt" */

&(nid_objs[772]),/* "hmacWithMD5" */

&(nid_objs[163]),/* "hmacWithSHA1" */

&(nid_objs[773]),/* "hmacWithSHA224" */

crypto/objects/obj_mac.h

+3 −0
Original line number Diff line number Diff line
@@ -3419,6 +3419,9 @@ 
#define NID_id_Gost28147_89		786

#define OBJ_id_Gost28147_89		OBJ_cryptopro,21L



#define SN_gost89_cnt		"gost89-cnt"

#define NID_gost89_cnt		835



#define SN_id_Gost28147_89_MAC		"id-Gost28147-89-MAC"

#define LN_id_Gost28147_89_MAC		"GOST 28147-89 MAC"

#define NID_id_Gost28147_89_MAC		787

crypto/objects/obj_mac.num

+1 −0
Original line number Diff line number Diff line
@@ -832,3 +832,4 @@ ecdsa_with_SHA384 831 
ecdsa_with_SHA512		832

dsa_with_SHA224		833

dsa_with_SHA256		834

gost89_cnt		835

crypto/objects/objects.txt

+1 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,7 @@ cryptopro 19 : gost2001 : GOST R 34.10-2001 
cryptopro 20		: gost94	: GOST R 34.10-94

!Cname id-Gost28147-89

cryptopro 21		: gost89 		: GOST 28147-89

			: gost89-cnt

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