Commit 400ca0e4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add OIDs for compressedData content type and zlib compression.

parent 9536b85c

crypto/objects/obj_dat.h

+102 −89
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ 
 * [including the GNU Public Licence.]

 */



#define NUM_NID 851

#define NUM_SN 844

#define NUM_LN 844

#define NUM_OBJ 798

#define NUM_NID 854

#define NUM_SN 846

#define NUM_LN 846

#define NUM_OBJ 800



static const unsigned char lvalues[5648]={

static const unsigned char lvalues[5670]={

0x00,                                        /* [  0] OBJ_undef */

0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */

0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -826,46 +826,48 @@ static const unsigned char lvalues[5648]={ 
0x2A,0x85,0x03,0x02,0x02,0x13,               /* [5347] OBJ_id_GostR3410_2001 */

0x2A,0x85,0x03,0x02,0x02,0x14,               /* [5353] OBJ_id_GostR3410_94 */

0x2A,0x85,0x03,0x02,0x02,0x15,               /* [5359] OBJ_id_Gost28147_89 */

0x2A,0x85,0x03,0x02,0x02,0x16,               /* [5365] OBJ_id_Gost28147_89_MAC */

0x2A,0x85,0x03,0x02,0x02,0x17,               /* [5371] OBJ_id_GostR3411_94_prf */

0x2A,0x85,0x03,0x02,0x02,0x62,               /* [5377] OBJ_id_GostR3410_2001DH */

0x2A,0x85,0x03,0x02,0x02,0x63,               /* [5383] OBJ_id_GostR3410_94DH */

0x2A,0x85,0x03,0x02,0x02,0x0E,0x01,          /* [5389] OBJ_id_Gost28147_89_CryptoPro_KeyMeshing */

0x2A,0x85,0x03,0x02,0x02,0x0E,0x00,          /* [5396] OBJ_id_Gost28147_89_None_KeyMeshing */

0x2A,0x85,0x03,0x02,0x02,0x1E,0x00,          /* [5403] OBJ_id_GostR3411_94_TestParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1E,0x01,          /* [5410] OBJ_id_GostR3411_94_CryptoProParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x00,          /* [5417] OBJ_id_Gost28147_89_TestParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x01,          /* [5424] OBJ_id_Gost28147_89_CryptoPro_A_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x02,          /* [5431] OBJ_id_Gost28147_89_CryptoPro_B_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x03,          /* [5438] OBJ_id_Gost28147_89_CryptoPro_C_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x04,          /* [5445] OBJ_id_Gost28147_89_CryptoPro_D_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x05,          /* [5452] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x06,          /* [5459] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x07,          /* [5466] OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x00,          /* [5473] OBJ_id_GostR3410_94_TestParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x02,          /* [5480] OBJ_id_GostR3410_94_CryptoPro_A_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x03,          /* [5487] OBJ_id_GostR3410_94_CryptoPro_B_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x04,          /* [5494] OBJ_id_GostR3410_94_CryptoPro_C_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x05,          /* [5501] OBJ_id_GostR3410_94_CryptoPro_D_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x21,0x01,          /* [5508] OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x21,0x02,          /* [5515] OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x21,0x03,          /* [5522] OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x23,0x00,          /* [5529] OBJ_id_GostR3410_2001_TestParamSet */

0x2A,0x85,0x03,0x02,0x02,0x23,0x01,          /* [5536] OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x23,0x02,          /* [5543] OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x23,0x03,          /* [5550] OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x24,0x00,          /* [5557] OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x24,0x01,          /* [5564] OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x14,0x01,          /* [5571] OBJ_id_GostR3410_94_a */

0x2A,0x85,0x03,0x02,0x02,0x14,0x02,          /* [5578] OBJ_id_GostR3410_94_aBis */

0x2A,0x85,0x03,0x02,0x02,0x14,0x03,          /* [5585] OBJ_id_GostR3410_94_b */

0x2A,0x85,0x03,0x02,0x02,0x14,0x04,          /* [5592] OBJ_id_GostR3410_94_bBis */

0x2A,0x85,0x03,0x02,0x09,0x01,0x06,0x01,     /* [5599] OBJ_id_Gost28147_89_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x03,     /* [5607] OBJ_id_GostR3410_94_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x04,     /* [5615] OBJ_id_GostR3410_2001_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x03,     /* [5623] OBJ_id_GostR3411_94_with_GostR3410_94_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04,     /* [5631] OBJ_id_GostR3411_94_with_GostR3410_2001_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01,     /* [5639] OBJ_id_GostR3410_2001_ParamSet_cc */

0x2A,0x85,0x03,0x02,0x02,0x17,               /* [5365] OBJ_id_GostR3411_94_prf */

0x2A,0x85,0x03,0x02,0x02,0x62,               /* [5371] OBJ_id_GostR3410_2001DH */

0x2A,0x85,0x03,0x02,0x02,0x63,               /* [5377] OBJ_id_GostR3410_94DH */

0x2A,0x85,0x03,0x02,0x02,0x0E,0x01,          /* [5383] OBJ_id_Gost28147_89_CryptoPro_KeyMeshing */

0x2A,0x85,0x03,0x02,0x02,0x0E,0x00,          /* [5390] OBJ_id_Gost28147_89_None_KeyMeshing */

0x2A,0x85,0x03,0x02,0x02,0x1E,0x00,          /* [5397] OBJ_id_GostR3411_94_TestParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1E,0x01,          /* [5404] OBJ_id_GostR3411_94_CryptoProParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x00,          /* [5411] OBJ_id_Gost28147_89_TestParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x01,          /* [5418] OBJ_id_Gost28147_89_CryptoPro_A_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x02,          /* [5425] OBJ_id_Gost28147_89_CryptoPro_B_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x03,          /* [5432] OBJ_id_Gost28147_89_CryptoPro_C_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x04,          /* [5439] OBJ_id_Gost28147_89_CryptoPro_D_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x05,          /* [5446] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x06,          /* [5453] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x1F,0x07,          /* [5460] OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x00,          /* [5467] OBJ_id_GostR3410_94_TestParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x02,          /* [5474] OBJ_id_GostR3410_94_CryptoPro_A_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x03,          /* [5481] OBJ_id_GostR3410_94_CryptoPro_B_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x04,          /* [5488] OBJ_id_GostR3410_94_CryptoPro_C_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x20,0x05,          /* [5495] OBJ_id_GostR3410_94_CryptoPro_D_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x21,0x01,          /* [5502] OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x21,0x02,          /* [5509] OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x21,0x03,          /* [5516] OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x23,0x00,          /* [5523] OBJ_id_GostR3410_2001_TestParamSet */

0x2A,0x85,0x03,0x02,0x02,0x23,0x01,          /* [5530] OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x23,0x02,          /* [5537] OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x23,0x03,          /* [5544] OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x24,0x00,          /* [5551] OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x24,0x01,          /* [5558] OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet */

0x2A,0x85,0x03,0x02,0x02,0x14,0x01,          /* [5565] OBJ_id_GostR3410_94_a */

0x2A,0x85,0x03,0x02,0x02,0x14,0x02,          /* [5572] OBJ_id_GostR3410_94_aBis */

0x2A,0x85,0x03,0x02,0x02,0x14,0x03,          /* [5579] OBJ_id_GostR3410_94_b */

0x2A,0x85,0x03,0x02,0x02,0x14,0x04,          /* [5586] OBJ_id_GostR3410_94_bBis */

0x2A,0x85,0x03,0x02,0x09,0x01,0x06,0x01,     /* [5593] OBJ_id_Gost28147_89_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x03,     /* [5601] OBJ_id_GostR3410_94_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x04,     /* [5609] OBJ_id_GostR3410_2001_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x03,     /* [5617] OBJ_id_GostR3411_94_with_GostR3410_94_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04,     /* [5625] OBJ_id_GostR3411_94_with_GostR3410_2001_cc */

0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01,     /* [5633] OBJ_id_GostR3410_2001_ParamSet_cc */

0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x09,/* [5641] OBJ_id_smime_ct_compressedData */

0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x08,/* [5652] OBJ_id_smime_alg_zlibCompress */

0x2A,0x85,0x03,0x02,0x02,0x16,               /* [5663] OBJ_id_Gost28147_89_MAC */

};



static const ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2129,115 +2131,120 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ 
{"gost94","GOST R 34.10-94",NID_id_GostR3410_94,6,&(lvalues[5353]),0},

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

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

{"gost-mac","GOST 28147-89 MAC",NID_id_Gost28147_89_MAC,6,

	&(lvalues[5365]),0},

{NULL,NULL,NID_undef,0,NULL,0},

{"prf-gostr3411-94","GOST R 34.11-94 PRF",NID_id_GostR3411_94_prf,6,

	&(lvalues[5371]),0},

	&(lvalues[5365]),0},

{"id-GostR3410-2001DH","GOST R 34.10-2001 DH",NID_id_GostR3410_2001DH,

	6,&(lvalues[5377]),0},

	6,&(lvalues[5371]),0},

{"id-GostR3410-94DH","GOST R 34.10-94 DH",NID_id_GostR3410_94DH,6,

	&(lvalues[5383]),0},

	&(lvalues[5377]),0},

{"id-Gost28147-89-CryptoPro-KeyMeshing",

	"id-Gost28147-89-CryptoPro-KeyMeshing",

	NID_id_Gost28147_89_CryptoPro_KeyMeshing,7,&(lvalues[5389]),0},

	NID_id_Gost28147_89_CryptoPro_KeyMeshing,7,&(lvalues[5383]),0},

{"id-Gost28147-89-None-KeyMeshing","id-Gost28147-89-None-KeyMeshing",

	NID_id_Gost28147_89_None_KeyMeshing,7,&(lvalues[5396]),0},

	NID_id_Gost28147_89_None_KeyMeshing,7,&(lvalues[5390]),0},

{"id-GostR3411-94-TestParamSet","id-GostR3411-94-TestParamSet",

	NID_id_GostR3411_94_TestParamSet,7,&(lvalues[5403]),0},

	NID_id_GostR3411_94_TestParamSet,7,&(lvalues[5397]),0},

{"id-GostR3411-94-CryptoProParamSet",

	"id-GostR3411-94-CryptoProParamSet",

	NID_id_GostR3411_94_CryptoProParamSet,7,&(lvalues[5410]),0},

	NID_id_GostR3411_94_CryptoProParamSet,7,&(lvalues[5404]),0},

{"id-Gost28147-89-TestParamSet","id-Gost28147-89-TestParamSet",

	NID_id_Gost28147_89_TestParamSet,7,&(lvalues[5417]),0},

	NID_id_Gost28147_89_TestParamSet,7,&(lvalues[5411]),0},

{"id-Gost28147-89-CryptoPro-A-ParamSet",

	"id-Gost28147-89-CryptoPro-A-ParamSet",

	NID_id_Gost28147_89_CryptoPro_A_ParamSet,7,&(lvalues[5424]),0},

	NID_id_Gost28147_89_CryptoPro_A_ParamSet,7,&(lvalues[5418]),0},

{"id-Gost28147-89-CryptoPro-B-ParamSet",

	"id-Gost28147-89-CryptoPro-B-ParamSet",

	NID_id_Gost28147_89_CryptoPro_B_ParamSet,7,&(lvalues[5431]),0},

	NID_id_Gost28147_89_CryptoPro_B_ParamSet,7,&(lvalues[5425]),0},

{"id-Gost28147-89-CryptoPro-C-ParamSet",

	"id-Gost28147-89-CryptoPro-C-ParamSet",

	NID_id_Gost28147_89_CryptoPro_C_ParamSet,7,&(lvalues[5438]),0},

	NID_id_Gost28147_89_CryptoPro_C_ParamSet,7,&(lvalues[5432]),0},

{"id-Gost28147-89-CryptoPro-D-ParamSet",

	"id-Gost28147-89-CryptoPro-D-ParamSet",

	NID_id_Gost28147_89_CryptoPro_D_ParamSet,7,&(lvalues[5445]),0},

	NID_id_Gost28147_89_CryptoPro_D_ParamSet,7,&(lvalues[5439]),0},

{"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet",

	"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet",

	NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet,7,&(lvalues[5452]),

	NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet,7,&(lvalues[5446]),

	0},

{"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet",

	"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet",

	NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet,7,&(lvalues[5459]),

	NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet,7,&(lvalues[5453]),

	0},

{"id-Gost28147-89-CryptoPro-RIC-1-ParamSet",

	"id-Gost28147-89-CryptoPro-RIC-1-ParamSet",

	NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet,7,&(lvalues[5466]),0},

	NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet,7,&(lvalues[5460]),0},

{"id-GostR3410-94-TestParamSet","id-GostR3410-94-TestParamSet",

	NID_id_GostR3410_94_TestParamSet,7,&(lvalues[5473]),0},

	NID_id_GostR3410_94_TestParamSet,7,&(lvalues[5467]),0},

{"id-GostR3410-94-CryptoPro-A-ParamSet",

	"id-GostR3410-94-CryptoPro-A-ParamSet",

	NID_id_GostR3410_94_CryptoPro_A_ParamSet,7,&(lvalues[5480]),0},

	NID_id_GostR3410_94_CryptoPro_A_ParamSet,7,&(lvalues[5474]),0},

{"id-GostR3410-94-CryptoPro-B-ParamSet",

	"id-GostR3410-94-CryptoPro-B-ParamSet",

	NID_id_GostR3410_94_CryptoPro_B_ParamSet,7,&(lvalues[5487]),0},

	NID_id_GostR3410_94_CryptoPro_B_ParamSet,7,&(lvalues[5481]),0},

{"id-GostR3410-94-CryptoPro-C-ParamSet",

	"id-GostR3410-94-CryptoPro-C-ParamSet",

	NID_id_GostR3410_94_CryptoPro_C_ParamSet,7,&(lvalues[5494]),0},

	NID_id_GostR3410_94_CryptoPro_C_ParamSet,7,&(lvalues[5488]),0},

{"id-GostR3410-94-CryptoPro-D-ParamSet",

	"id-GostR3410-94-CryptoPro-D-ParamSet",

	NID_id_GostR3410_94_CryptoPro_D_ParamSet,7,&(lvalues[5501]),0},

	NID_id_GostR3410_94_CryptoPro_D_ParamSet,7,&(lvalues[5495]),0},

{"id-GostR3410-94-CryptoPro-XchA-ParamSet",

	"id-GostR3410-94-CryptoPro-XchA-ParamSet",

	NID_id_GostR3410_94_CryptoPro_XchA_ParamSet,7,&(lvalues[5508]),0},

	NID_id_GostR3410_94_CryptoPro_XchA_ParamSet,7,&(lvalues[5502]),0},

{"id-GostR3410-94-CryptoPro-XchB-ParamSet",

	"id-GostR3410-94-CryptoPro-XchB-ParamSet",

	NID_id_GostR3410_94_CryptoPro_XchB_ParamSet,7,&(lvalues[5515]),0},

	NID_id_GostR3410_94_CryptoPro_XchB_ParamSet,7,&(lvalues[5509]),0},

{"id-GostR3410-94-CryptoPro-XchC-ParamSet",

	"id-GostR3410-94-CryptoPro-XchC-ParamSet",

	NID_id_GostR3410_94_CryptoPro_XchC_ParamSet,7,&(lvalues[5522]),0},

	NID_id_GostR3410_94_CryptoPro_XchC_ParamSet,7,&(lvalues[5516]),0},

{"id-GostR3410-2001-TestParamSet","id-GostR3410-2001-TestParamSet",

	NID_id_GostR3410_2001_TestParamSet,7,&(lvalues[5529]),0},

	NID_id_GostR3410_2001_TestParamSet,7,&(lvalues[5523]),0},

{"id-GostR3410-2001-CryptoPro-A-ParamSet",

	"id-GostR3410-2001-CryptoPro-A-ParamSet",

	NID_id_GostR3410_2001_CryptoPro_A_ParamSet,7,&(lvalues[5536]),0},

	NID_id_GostR3410_2001_CryptoPro_A_ParamSet,7,&(lvalues[5530]),0},

{"id-GostR3410-2001-CryptoPro-B-ParamSet",

	"id-GostR3410-2001-CryptoPro-B-ParamSet",

	NID_id_GostR3410_2001_CryptoPro_B_ParamSet,7,&(lvalues[5543]),0},

	NID_id_GostR3410_2001_CryptoPro_B_ParamSet,7,&(lvalues[5537]),0},

{"id-GostR3410-2001-CryptoPro-C-ParamSet",

	"id-GostR3410-2001-CryptoPro-C-ParamSet",

	NID_id_GostR3410_2001_CryptoPro_C_ParamSet,7,&(lvalues[5550]),0},

	NID_id_GostR3410_2001_CryptoPro_C_ParamSet,7,&(lvalues[5544]),0},

{"id-GostR3410-2001-CryptoPro-XchA-ParamSet",

	"id-GostR3410-2001-CryptoPro-XchA-ParamSet",

	NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet,7,&(lvalues[5557]),0},

	NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet,7,&(lvalues[5551]),0},

	

{"id-GostR3410-2001-CryptoPro-XchB-ParamSet",

	"id-GostR3410-2001-CryptoPro-XchB-ParamSet",

	NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet,7,&(lvalues[5564]),0},

	NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet,7,&(lvalues[5558]),0},

	

{"id-GostR3410-94-a","id-GostR3410-94-a",NID_id_GostR3410_94_a,7,

	&(lvalues[5571]),0},

	&(lvalues[5565]),0},

{"id-GostR3410-94-aBis","id-GostR3410-94-aBis",

	NID_id_GostR3410_94_aBis,7,&(lvalues[5578]),0},

	NID_id_GostR3410_94_aBis,7,&(lvalues[5572]),0},

{"id-GostR3410-94-b","id-GostR3410-94-b",NID_id_GostR3410_94_b,7,

	&(lvalues[5585]),0},

	&(lvalues[5579]),0},

{"id-GostR3410-94-bBis","id-GostR3410-94-bBis",

	NID_id_GostR3410_94_bBis,7,&(lvalues[5592]),0},

	NID_id_GostR3410_94_bBis,7,&(lvalues[5586]),0},

{"id-Gost28147-89-cc","GOST 28147-89 Cryptocom ParamSet",

	NID_id_Gost28147_89_cc,8,&(lvalues[5599]),0},

	NID_id_Gost28147_89_cc,8,&(lvalues[5593]),0},

{"gost94cc","GOST 34.10-94 Cryptocom",NID_id_GostR3410_94_cc,8,

	&(lvalues[5607]),0},

	&(lvalues[5601]),0},

{"gost2001cc","GOST 34.10-2001 Cryptocom",NID_id_GostR3410_2001_cc,8,

	&(lvalues[5615]),0},

	&(lvalues[5609]),0},

{"id-GostR3411-94-with-GostR3410-94-cc",

	"GOST R 34.11-94 with GOST R 34.10-94 Cryptocom",

	NID_id_GostR3411_94_with_GostR3410_94_cc,8,&(lvalues[5623]),0},

	NID_id_GostR3411_94_with_GostR3410_94_cc,8,&(lvalues[5617]),0},

{"id-GostR3411-94-with-GostR3410-2001-cc",

	"GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom",

	NID_id_GostR3411_94_with_GostR3410_2001_cc,8,&(lvalues[5631]),0},

	NID_id_GostR3411_94_with_GostR3410_2001_cc,8,&(lvalues[5625]),0},

{"id-GostR3410-2001-ParamSet-cc",

	"GOST R 3410-2001 Parameter Set Cryptocom",

	NID_id_GostR3410_2001_ParamSet_cc,8,&(lvalues[5639]),0},

	NID_id_GostR3410_2001_ParamSet_cc,8,&(lvalues[5633]),0},

{"HMAC","hmac",NID_hmac,0,NULL,0},

{"id-smime-ct-compressedData","id-smime-ct-compressedData",

	NID_id_smime_ct_compressedData,11,&(lvalues[5641]),0},

{"id-smime-alg-zlibCompress","id-smime-alg-zlibCompress",

	NID_id_smime_alg_zlibCompress,11,&(lvalues[5652]),0},

{"gost-mac","GOST 28147-89 MAC",NID_id_Gost28147_89_MAC,6,

	&(lvalues[5663]),0},

};



static const unsigned int sn_objs[NUM_SN]={
@@ -2519,7 +2526,7 @@ static const unsigned int sn_objs[NUM_SN]={ 
490,	/* "friendlyCountryName" */

156,	/* "friendlyName" */

509,	/* "generationQualifier" */

810,	/* "gost-mac" */

853,	/* "gost-mac" */

806,	/* "gost2001" */

846,	/* "gost2001cc" */

808,	/* "gost89" */
@@ -2727,6 +2734,7 @@ static const unsigned int sn_objs[NUM_SN]={ 
241,	/* "id-smime-alg-ESDHwith3DES" */

242,	/* "id-smime-alg-ESDHwithRC2" */

244,	/* "id-smime-alg-RC2wrap" */

852,	/* "id-smime-alg-zlibCompress" */

193,	/* "id-smime-cd" */

248,	/* "id-smime-cd-ldap" */

190,	/* "id-smime-ct" */
@@ -2735,6 +2743,7 @@ static const unsigned int sn_objs[NUM_SN]={ 
208,	/* "id-smime-ct-TDTInfo" */

207,	/* "id-smime-ct-TSTInfo" */

205,	/* "id-smime-ct-authData" */

851,	/* "id-smime-ct-compressedData" */

209,	/* "id-smime-ct-contentInfo" */

206,	/* "id-smime-ct-publishCert" */

204,	/* "id-smime-ct-receipt" */
@@ -3108,7 +3117,7 @@ static const unsigned int ln_objs[NUM_LN]={ 
172,	/* "Extension Request" */

808,	/* "GOST 28147-89" */

844,	/* "GOST 28147-89 Cryptocom ParamSet" */

810,	/* "GOST 28147-89 MAC" */

853,	/* "GOST 28147-89 MAC" */

846,	/* "GOST 34.10-2001 Cryptocom" */

845,	/* "GOST 34.10-94 Cryptocom" */

806,	/* "GOST R 34.10-2001" */
@@ -3563,6 +3572,7 @@ static const unsigned int ln_objs[NUM_LN]={ 
241,	/* "id-smime-alg-ESDHwith3DES" */

242,	/* "id-smime-alg-ESDHwithRC2" */

244,	/* "id-smime-alg-RC2wrap" */

852,	/* "id-smime-alg-zlibCompress" */

193,	/* "id-smime-cd" */

248,	/* "id-smime-cd-ldap" */

190,	/* "id-smime-ct" */
@@ -3571,6 +3581,7 @@ static const unsigned int ln_objs[NUM_LN]={ 
208,	/* "id-smime-ct-TDTInfo" */

207,	/* "id-smime-ct-TSTInfo" */

205,	/* "id-smime-ct-authData" */

851,	/* "id-smime-ct-compressedData" */

209,	/* "id-smime-ct-contentInfo" */

206,	/* "id-smime-ct-publishCert" */

204,	/* "id-smime-ct-receipt" */
@@ -4216,7 +4227,7 @@ static const unsigned int obj_objs[NUM_OBJ]={ 
806,	/* OBJ_id_GostR3410_2001            1 2 643 2 2 19 */

807,	/* OBJ_id_GostR3410_94              1 2 643 2 2 20 */

808,	/* OBJ_id_Gost28147_89              1 2 643 2 2 21 */

810,	/* OBJ_id_Gost28147_89_MAC          1 2 643 2 2 22 */

853,	/* OBJ_id_Gost28147_89_MAC          1 2 643 2 2 22 */

811,	/* OBJ_id_GostR3411_94_prf          1 2 643 2 2 23 */

812,	/* OBJ_id_GostR3410_2001DH          1 2 643 2 2 98 */

813,	/* OBJ_id_GostR3410_94DH            1 2 643 2 2 99 */
@@ -4681,6 +4692,7 @@ static const unsigned int obj_objs[NUM_OBJ]={ 
209,	/* OBJ_id_smime_ct_contentInfo      1 2 840 113549 1 9 16 1 6 */

210,	/* OBJ_id_smime_ct_DVCSRequestData  1 2 840 113549 1 9 16 1 7 */

211,	/* OBJ_id_smime_ct_DVCSResponseData 1 2 840 113549 1 9 16 1 8 */

851,	/* OBJ_id_smime_ct_compressedData   1 2 840 113549 1 9 16 1 9 */

212,	/* OBJ_id_smime_aa_receiptRequest   1 2 840 113549 1 9 16 2 1 */

213,	/* OBJ_id_smime_aa_securityLabel    1 2 840 113549 1 9 16 2 2 */

214,	/* OBJ_id_smime_aa_mlExpandHistory  1 2 840 113549 1 9 16 2 3 */
@@ -4717,6 +4729,7 @@ static const unsigned int obj_objs[NUM_OBJ]={ 
245,	/* OBJ_id_smime_alg_ESDH            1 2 840 113549 1 9 16 3 5 */

246,	/* OBJ_id_smime_alg_CMS3DESwrap     1 2 840 113549 1 9 16 3 6 */

247,	/* OBJ_id_smime_alg_CMSRC2wrap      1 2 840 113549 1 9 16 3 7 */

852,	/* OBJ_id_smime_alg_zlibCompress    1 2 840 113549 1 9 16 3 8 */

248,	/* OBJ_id_smime_cd_ldap             1 2 840 113549 1 9 16 4 1 */

249,	/* OBJ_id_smime_spq_ets_sqt_uri     1 2 840 113549 1 9 16 5 1 */

250,	/* OBJ_id_smime_spq_ets_sqt_unotice 1 2 840 113549 1 9 16 5 2 */

crypto/objects/obj_mac.h

+9 −1
Original line number Diff line number Diff line
@@ -829,6 +829,10 @@ 
#define NID_id_smime_ct_DVCSResponseData		211

#define OBJ_id_smime_ct_DVCSResponseData		OBJ_id_smime_ct,8L



#define SN_id_smime_ct_compressedData		"id-smime-ct-compressedData"

#define NID_id_smime_ct_compressedData		851

#define OBJ_id_smime_ct_compressedData		OBJ_id_smime_ct,9L



#define SN_id_smime_aa_receiptRequest		"id-smime-aa-receiptRequest"

#define NID_id_smime_aa_receiptRequest		212

#define OBJ_id_smime_aa_receiptRequest		OBJ_id_smime_aa,1L
@@ -973,6 +977,10 @@ 
#define NID_id_smime_alg_CMSRC2wrap		247

#define OBJ_id_smime_alg_CMSRC2wrap		OBJ_id_smime_alg,7L



#define SN_id_smime_alg_zlibCompress		"id-smime-alg-zlibCompress"

#define NID_id_smime_alg_zlibCompress		852

#define OBJ_id_smime_alg_zlibCompress		OBJ_id_smime_alg,8L



#define SN_id_smime_cd_ldap		"id-smime-cd-ldap"

#define NID_id_smime_cd_ldap		248

#define OBJ_id_smime_cd_ldap		OBJ_id_smime_cd,1L
@@ -3453,7 +3461,7 @@ 


#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 NID_id_Gost28147_89_MAC					853

#define OBJ_id_Gost28147_89_MAC					OBJ_cryptopro,22L



#define SN_id_GostR3411_94_prf		"prf-gostr3411-94"

crypto/objects/obj_mac.num

+4 −1
Original line number Diff line number Diff line
@@ -848,3 +848,6 @@ id_GostR3411_94_with_GostR3410_94_cc 847 
id_GostR3411_94_with_GostR3410_2001_cc		848

id_GostR3410_2001_ParamSet_cc		849

hmac		850

id_smime_ct_compressedData		851

id_smime_alg_zlibCompress		852

id_Gost28147_89_MAC					853

crypto/objects/objects.txt

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ id-smime-ct 5 : id-smime-ct-TDTInfo 
id-smime-ct 6		: id-smime-ct-contentInfo

id-smime-ct 7		: id-smime-ct-DVCSRequestData

id-smime-ct 8		: id-smime-ct-DVCSResponseData

id-smime-ct 9		: id-smime-ct-compressedData



# S/MIME Attributes

id-smime-aa 1		: id-smime-aa-receiptRequest
@@ -297,6 +298,7 @@ id-smime-alg 4 : id-smime-alg-RC2wrap 
id-smime-alg 5		: id-smime-alg-ESDH

id-smime-alg 6		: id-smime-alg-CMS3DESwrap

id-smime-alg 7		: id-smime-alg-CMSRC2wrap

id-smime-alg 8		: id-smime-alg-zlibCompress



# S/MIME Certificate Distribution

id-smime-cd 1		: id-smime-cd-ldap