Minor object name edit.
[openssl.git] / crypto / objects / obj_dat.h
index c2a707a9845a8b9253d0c9cad826842557ba211a..6e0c0e2542a64dba781e23558c3a960225a2015a 100644 (file)
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 751
-#define NUM_SN 747
-#define NUM_LN 747
-#define NUM_OBJ 709
+#define NUM_NID 802
+#define NUM_SN 798
+#define NUM_LN 798
+#define NUM_OBJ 760
 
-static unsigned char lvalues[5002]={
+static unsigned char lvalues[5345]={
 0x00,                                        /* [  0] OBJ_undef */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -330,9 +330,9 @@ static unsigned char lvalues[5002]={
 0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x04,     /* [2092] OBJ_ac_auditEntity */
 0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x05,     /* [2100] OBJ_ac_targeting */
 0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x06,     /* [2108] OBJ_aaControls */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x07,     /* [2116] OBJ_sbqp_ipAddrBlock */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x08,     /* [2124] OBJ_sbqp_autonomousSysNum */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x09,     /* [2132] OBJ_sbqp_routerIdentifier */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x07,     /* [2116] OBJ_sbgp_ipAddrBlock */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x08,     /* [2124] OBJ_sbgp_autonomousSysNum */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x09,     /* [2132] OBJ_sbgp_routerIdentifier */
 0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x03,     /* [2140] OBJ_textNotice */
 0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x05,     /* [2148] OBJ_ipsecEndSystem */
 0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x06,     /* [2156] OBJ_ipsecTunnel */
@@ -777,6 +777,57 @@ static unsigned char lvalues[5002]={
 0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x00,     /* [4977] OBJ_id_ppl_anyLanguage */
 0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x01,     /* [4985] OBJ_id_ppl_inheritAll */
 0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x02,     /* [4993] OBJ_Independent */
+0x55,0x1D,0x1C,                              /* [5001] OBJ_issuing_distribution_point */
+0x28,0xCF,0x06,0x03,0x00,0x37,               /* [5004] OBJ_whirlpool */
+0x2A,0x85,0x03,0x02,0x02,                    /* [5010] OBJ_cryptopro */
+0x2A,0x85,0x03,0x02,0x02,0x03,               /* [5015] OBJ_id_GostR3411_94_with_GostR3410_2001 */
+0x2A,0x85,0x03,0x02,0x02,0x04,               /* [5021] OBJ_id_GostR3411_94_with_GostR3410_94 */
+0x2A,0x85,0x03,0x02,0x02,0x13,               /* [5027] OBJ_id_GostR3410_2001 */
+0x2A,0x85,0x03,0x02,0x02,0x14,               /* [5033] OBJ_id_GostR3410_94 */
+0x2A,0x85,0x03,0x02,0x02,0x1E,0x00,          /* [5039] OBJ_id_GostR3411_94_TestParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1E,0x01,          /* [5046] OBJ_id_GostR3411_94_CryptoProParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x00,          /* [5053] OBJ_id_Gost28147_89_TestParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x01,          /* [5060] OBJ_id_Gost28147_89_CryptoPro_A_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x02,          /* [5067] OBJ_id_Gost28147_89_CryptoPro_B_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x03,          /* [5074] OBJ_id_Gost28147_89_CryptoPro_C_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x04,          /* [5081] OBJ_id_Gost28147_89_CryptoPro_D_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x05,          /* [5088] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x06,          /* [5095] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x07,          /* [5102] OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x00,          /* [5109] OBJ_id_GostR3410_94_TestParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x02,          /* [5116] OBJ_id_GostR3410_94_CryptoPro_A_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x03,          /* [5123] OBJ_id_GostR3410_94_CryptoPro_B_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x04,          /* [5130] OBJ_id_GostR3410_94_CryptoPro_C_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x05,          /* [5137] OBJ_id_GostR3410_94_CryptoPro_D_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x21,0x01,          /* [5144] OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x21,0x02,          /* [5151] OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x21,0x03,          /* [5158] OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x23,0x00,          /* [5165] OBJ_id_GostR3410_2001_TestParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x23,0x01,          /* [5172] OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x23,0x02,          /* [5179] OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x23,0x03,          /* [5186] OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x24,0x00,          /* [5193] OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x24,0x01,          /* [5200] OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet */
+0x2A,0x85,0x03,0x02,0x09,                    /* [5207] OBJ_cryptocom */
+0x2A,0x85,0x03,0x02,0x02,0x0A,               /* [5212] OBJ_id_HMACGostR3411_94 */
+0x2A,0x85,0x03,0x02,0x02,0x15,               /* [5218] OBJ_id_Gost28147_89 */
+0x2A,0x85,0x03,0x02,0x02,0x16,               /* [5224] OBJ_id_Gost28147_89_MAC */
+0x2A,0x85,0x03,0x02,0x02,0x62,               /* [5230] OBJ_id_GostR3410_2001DH */
+0x2A,0x85,0x03,0x02,0x02,0x63,               /* [5236] OBJ_id_GostR3410_94DH */
+0x2A,0x85,0x03,0x02,0x02,0x0E,0x01,          /* [5242] OBJ_id_Gost28147_89_CryptoPro_KeyMeshing */
+0x2A,0x85,0x03,0x02,0x02,0x0E,0x00,          /* [5249] OBJ_id_Gost28147_89_None_KeyMeshing */
+0x2A,0x85,0x03,0x02,0x02,0x14,0x01,          /* [5256] OBJ_id_GostR3410_94_a */
+0x2A,0x85,0x03,0x02,0x02,0x14,0x02,          /* [5263] OBJ_id_GostR3410_94_aBis */
+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,0x05,0x03,     /* [5292] OBJ_id_Gost3410_94_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x04,     /* [5300] OBJ_id_Gost3410_2001_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x03,     /* [5308] OBJ_id_GostR3410_11_94_with_GostR3411_94_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04,     /* [5316] OBJ_id_GostR3410_2001_with_GostR3411_94_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01,     /* [5324] OBJ_id_GostR3410_2001_ParamSet_cc */
+0x2A,0x85,0x03,0x02,0x02,0x09,               /* [5332] OBJ_id_GostR3411_94 */
+0x2A,0x85,0x03,0x02,0x02,0x17,               /* [5338] OBJ_id_GostR3411_94_prf */
 };
 
 static ASN1_OBJECT nid_objs[NUM_NID]={
@@ -824,21 +875,21 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"DES-CFB","des-cfb",NID_des_cfb64,5,&(lvalues[192]),0},
 {"DES-CBC","des-cbc",NID_des_cbc,5,&(lvalues[197]),0},
 {"DES-EDE","des-ede",NID_des_ede_ecb,5,&(lvalues[202]),0},
-{"DES-EDE3","des-ede3",NID_des_ede3_ecb,0,NULL},
+{"DES-EDE3","des-ede3",NID_des_ede3_ecb,0,NULL,0},
 {"IDEA-CBC","idea-cbc",NID_idea_cbc,11,&(lvalues[207]),0},
-{"IDEA-CFB","idea-cfb",NID_idea_cfb64,0,NULL},
-{"IDEA-ECB","idea-ecb",NID_idea_ecb,0,NULL},
+{"IDEA-CFB","idea-cfb",NID_idea_cfb64,0,NULL,0},
+{"IDEA-ECB","idea-ecb",NID_idea_ecb,0,NULL,0},
 {"RC2-CBC","rc2-cbc",NID_rc2_cbc,8,&(lvalues[218]),0},
-{"RC2-ECB","rc2-ecb",NID_rc2_ecb,0,NULL},
-{"RC2-CFB","rc2-cfb",NID_rc2_cfb64,0,NULL},
-{"RC2-OFB","rc2-ofb",NID_rc2_ofb64,0,NULL},
+{"RC2-ECB","rc2-ecb",NID_rc2_ecb,0,NULL,0},
+{"RC2-CFB","rc2-cfb",NID_rc2_cfb64,0,NULL,0},
+{"RC2-OFB","rc2-ofb",NID_rc2_ofb64,0,NULL,0},
 {"SHA","sha",NID_sha,5,&(lvalues[226]),0},
 {"RSA-SHA","shaWithRSAEncryption",NID_shaWithRSAEncryption,5,
        &(lvalues[231]),0},
-{"DES-EDE-CBC","des-ede-cbc",NID_des_ede_cbc,0,NULL},
+{"DES-EDE-CBC","des-ede-cbc",NID_des_ede_cbc,0,NULL,0},
 {"DES-EDE3-CBC","des-ede3-cbc",NID_des_ede3_cbc,8,&(lvalues[236]),0},
 {"DES-OFB","des-ofb",NID_des_ofb64,5,&(lvalues[244]),0},
-{"IDEA-OFB","idea-ofb",NID_idea_ofb64,0,NULL},
+{"IDEA-OFB","idea-ofb",NID_idea_ofb64,0,NULL,0},
 {"pkcs9","pkcs9",NID_pkcs9,8,&(lvalues[249]),0},
 {"emailAddress","emailAddress",NID_pkcs9_emailAddress,9,
        &(lvalues[257]),0},
@@ -862,10 +913,10 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
        NID_netscape_cert_extension,8,&(lvalues[345]),0},
 {"nsDataType","Netscape Data Type",NID_netscape_data_type,8,
        &(lvalues[353]),0},
-{"DES-EDE-CFB","des-ede-cfb",NID_des_ede_cfb64,0,NULL},
-{"DES-EDE3-CFB","des-ede3-cfb",NID_des_ede3_cfb64,0,NULL},
-{"DES-EDE-OFB","des-ede-ofb",NID_des_ede_ofb64,0,NULL},
-{"DES-EDE3-OFB","des-ede3-ofb",NID_des_ede3_ofb64,0,NULL},
+{"DES-EDE-CFB","des-ede-cfb",NID_des_ede_cfb64,0,NULL,0},
+{"DES-EDE3-CFB","des-ede3-cfb",NID_des_ede3_cfb64,0,NULL,0},
+{"DES-EDE-OFB","des-ede-ofb",NID_des_ede_ofb64,0,NULL,0},
+{"DES-EDE3-OFB","des-ede3-ofb",NID_des_ede3_ofb64,0,NULL,0},
 {"SHA1","sha1",NID_sha1,5,&(lvalues[361]),0},
 {"RSA-SHA1","sha1WithRSAEncryption",NID_sha1WithRSAEncryption,9,
        &(lvalues[366]),0},
@@ -892,7 +943,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"nsComment","Netscape Comment",NID_netscape_comment,9,&(lvalues[471]),0},
 {"nsCertSequence","Netscape Certificate Sequence",
        NID_netscape_cert_sequence,9,&(lvalues[480]),0},
-{"DESX-CBC","desx-cbc",NID_desx_cbc,0,NULL},
+{"DESX-CBC","desx-cbc",NID_desx_cbc,0,NULL,0},
 {"id-ce","id-ce",NID_id_ce,2,&(lvalues[489]),0},
 {"subjectKeyIdentifier","X509v3 Subject Key Identifier",
        NID_subject_key_identifier,3,&(lvalues[491]),0},
@@ -911,17 +962,17 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"authorityKeyIdentifier","X509v3 Authority Key Identifier",
        NID_authority_key_identifier,3,&(lvalues[515]),0},
 {"BF-CBC","bf-cbc",NID_bf_cbc,9,&(lvalues[518]),0},
-{"BF-ECB","bf-ecb",NID_bf_ecb,0,NULL},
-{"BF-CFB","bf-cfb",NID_bf_cfb64,0,NULL},
-{"BF-OFB","bf-ofb",NID_bf_ofb64,0,NULL},
+{"BF-ECB","bf-ecb",NID_bf_ecb,0,NULL,0},
+{"BF-CFB","bf-cfb",NID_bf_cfb64,0,NULL,0},
+{"BF-OFB","bf-ofb",NID_bf_ofb64,0,NULL,0},
 {"MDC2","mdc2",NID_mdc2,4,&(lvalues[527]),0},
 {"RSA-MDC2","mdc2WithRSA",NID_mdc2WithRSA,4,&(lvalues[531]),0},
-{"RC4-40","rc4-40",NID_rc4_40,0,NULL},
-{"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL},
+{"RC4-40","rc4-40",NID_rc4_40,0,NULL,0},
+{"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL,0},
 {"GN","givenName",NID_givenName,3,&(lvalues[535]),0},
 {"SN","surname",NID_surname,3,&(lvalues[538]),0},
 {"initials","initials",NID_initials,3,&(lvalues[541]),0},
-{NULL,NULL,NID_undef,0,NULL},
+{NULL,NULL,NID_undef,0,NULL,0},
 {"crlDistributionPoints","X509v3 CRL Distribution Points",
        NID_crl_distribution_points,3,&(lvalues[544]),0},
 {"RSA-NP-MD5","md5WithRSA",NID_md5WithRSA,5,&(lvalues[547]),0},
@@ -929,23 +980,23 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"title","title",NID_title,3,&(lvalues[555]),0},
 {"description","description",NID_description,3,&(lvalues[558]),0},
 {"CAST5-CBC","cast5-cbc",NID_cast5_cbc,9,&(lvalues[561]),0},
-{"CAST5-ECB","cast5-ecb",NID_cast5_ecb,0,NULL},
-{"CAST5-CFB","cast5-cfb",NID_cast5_cfb64,0,NULL},
-{"CAST5-OFB","cast5-ofb",NID_cast5_ofb64,0,NULL},
+{"CAST5-ECB","cast5-ecb",NID_cast5_ecb,0,NULL,0},
+{"CAST5-CFB","cast5-cfb",NID_cast5_cfb64,0,NULL,0},
+{"CAST5-OFB","cast5-ofb",NID_cast5_ofb64,0,NULL,0},
 {"pbeWithMD5AndCast5CBC","pbeWithMD5AndCast5CBC",
        NID_pbeWithMD5AndCast5_CBC,9,&(lvalues[570]),0},
 {"DSA-SHA1","dsaWithSHA1",NID_dsaWithSHA1,7,&(lvalues[579]),0},
-{"MD5-SHA1","md5-sha1",NID_md5_sha1,0,NULL},
+{"MD5-SHA1","md5-sha1",NID_md5_sha1,0,NULL,0},
 {"RSA-SHA1-2","sha1WithRSA",NID_sha1WithRSA,5,&(lvalues[586]),0},
 {"DSA","dsaEncryption",NID_dsa,7,&(lvalues[591]),0},
 {"RIPEMD160","ripemd160",NID_ripemd160,5,&(lvalues[598]),0},
-{NULL,NULL,NID_undef,0,NULL},
+{NULL,NULL,NID_undef,0,NULL,0},
 {"RSA-RIPEMD160","ripemd160WithRSA",NID_ripemd160WithRSA,6,
        &(lvalues[603]),0},
 {"RC5-CBC","rc5-cbc",NID_rc5_cbc,8,&(lvalues[609]),0},
-{"RC5-ECB","rc5-ecb",NID_rc5_ecb,0,NULL},
-{"RC5-CFB","rc5-cfb",NID_rc5_cfb64,0,NULL},
-{"RC5-OFB","rc5-ofb",NID_rc5_ofb64,0,NULL},
+{"RC5-ECB","rc5-ecb",NID_rc5_ecb,0,NULL,0},
+{"RC5-CFB","rc5-cfb",NID_rc5_cfb64,0,NULL,0},
+{"RC5-OFB","rc5-ofb",NID_rc5_ofb64,0,NULL,0},
 {"RLE","run length compression",NID_rle_compression,6,&(lvalues[617]),0},
 {"ZLIB","zlib compression",NID_zlib_compression,6,&(lvalues[623]),0},
 {"extendedKeyUsage","X509v3 Extended Key Usage",NID_ext_key_usage,3,
@@ -1009,7 +1060,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"id-qt-cps","Policy Qualifier CPS",NID_id_qt_cps,8,&(lvalues[958]),0},
 {"id-qt-unotice","Policy Qualifier User Notice",NID_id_qt_unotice,8,
        &(lvalues[966]),0},
-{"RC2-64-CBC","rc2-64-cbc",NID_rc2_64_cbc,0,NULL},
+{"RC2-64-CBC","rc2-64-cbc",NID_rc2_64_cbc,0,NULL,0},
 {"SMIME-CAPS","S/MIME Capabilities",NID_SMIMECapabilities,9,
        &(lvalues[974]),0},
 {"PBE-MD2-RC2-64","pbeWithMD2AndRC2-CBC",NID_pbeWithMD2AndRC2_CBC,9,
@@ -1219,12 +1270,12 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
        &(lvalues[2092]),0},
 {"ac-targeting","ac-targeting",NID_ac_targeting,8,&(lvalues[2100]),0},
 {"aaControls","aaControls",NID_aaControls,8,&(lvalues[2108]),0},
-{"sbqp-ipAddrBlock","sbqp-ipAddrBlock",NID_sbqp_ipAddrBlock,8,
+{"sbgp-ipAddrBlock","sbgp-ipAddrBlock",NID_sbgp_ipAddrBlock,8,
        &(lvalues[2116]),0},
-{"sbqp-autonomousSysNum","sbqp-autonomousSysNum",
-       NID_sbqp_autonomousSysNum,8,&(lvalues[2124]),0},
-{"sbqp-routerIdentifier","sbqp-routerIdentifier",
-       NID_sbqp_routerIdentifier,8,&(lvalues[2132]),0},
+{"sbgp-autonomousSysNum","sbgp-autonomousSysNum",
+       NID_sbgp_autonomousSysNum,8,&(lvalues[2124]),0},
+{"sbgp-routerIdentifier","sbgp-routerIdentifier",
+       NID_sbgp_routerIdentifier,8,&(lvalues[2132]),0},
 {"textNotice","textNotice",NID_textNotice,8,&(lvalues[2140]),0},
 {"ipsecEndSystem","IPSec End System",NID_ipsecEndSystem,8,
        &(lvalues[2148]),0},
@@ -1330,7 +1381,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
        &(lvalues[2588]),0},
 {"id-pda-placeOfBirth","id-pda-placeOfBirth",NID_id_pda_placeOfBirth,
        8,&(lvalues[2596]),0},
-{NULL,NULL,NID_undef,0,NULL},
+{NULL,NULL,NID_undef,0,NULL,0},
 {"id-pda-gender","id-pda-gender",NID_id_pda_gender,8,&(lvalues[2604]),0},
 {"id-pda-countryOfCitizenship","id-pda-countryOfCitizenship",
        NID_id_pda_countryOfCitizenship,8,&(lvalues[2612]),0},
@@ -1562,7 +1613,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"generationQualifier","generationQualifier",NID_generationQualifier,
        3,&(lvalues[3877]),0},
 {"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[3880]),0},
-{NULL,NULL,NID_undef,0,NULL},
+{NULL,NULL,NID_undef,0,NULL,0},
 {"id-set","Secure Electronic Transactions",NID_id_set,2,
        &(lvalues[3883]),0},
 {"set-ctype","content types",NID_set_ctype,3,&(lvalues[3885]),0},
@@ -1821,16 +1872,16 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
        10,&(lvalues[4437]),0},
 {"msUPN","Microsoft Universal Principal Name",NID_ms_upn,10,
        &(lvalues[4447]),0},
-{"AES-128-CFB1","aes-128-cfb1",NID_aes_128_cfb1,0,NULL},
-{"AES-192-CFB1","aes-192-cfb1",NID_aes_192_cfb1,0,NULL},
-{"AES-256-CFB1","aes-256-cfb1",NID_aes_256_cfb1,0,NULL},
-{"AES-128-CFB8","aes-128-cfb8",NID_aes_128_cfb8,0,NULL},
-{"AES-192-CFB8","aes-192-cfb8",NID_aes_192_cfb8,0,NULL},
-{"AES-256-CFB8","aes-256-cfb8",NID_aes_256_cfb8,0,NULL},
-{"DES-CFB1","des-cfb1",NID_des_cfb1,0,NULL},
-{"DES-CFB8","des-cfb8",NID_des_cfb8,0,NULL},
-{"DES-EDE3-CFB1","des-ede3-cfb1",NID_des_ede3_cfb1,0,NULL},
-{"DES-EDE3-CFB8","des-ede3-cfb8",NID_des_ede3_cfb8,0,NULL},
+{"AES-128-CFB1","aes-128-cfb1",NID_aes_128_cfb1,0,NULL,0},
+{"AES-192-CFB1","aes-192-cfb1",NID_aes_192_cfb1,0,NULL,0},
+{"AES-256-CFB1","aes-256-cfb1",NID_aes_256_cfb1,0,NULL,0},
+{"AES-128-CFB8","aes-128-cfb8",NID_aes_128_cfb8,0,NULL,0},
+{"AES-192-CFB8","aes-192-cfb8",NID_aes_192_cfb8,0,NULL,0},
+{"AES-256-CFB8","aes-256-cfb8",NID_aes_256_cfb8,0,NULL,0},
+{"DES-CFB1","des-cfb1",NID_des_cfb1,0,NULL,0},
+{"DES-CFB8","des-cfb8",NID_des_cfb8,0,NULL,0},
+{"DES-EDE3-CFB1","des-ede3-cfb1",NID_des_ede3_cfb1,0,NULL,0},
+{"DES-EDE3-CFB8","des-ede3-cfb8",NID_des_ede3_cfb8,0,NULL,0},
 {"streetAddress","streetAddress",NID_streetAddress,3,&(lvalues[4457]),0},
 {"postalCode","postalCode",NID_postalCode,3,&(lvalues[4460]),0},
 {"identified-organization","identified-organization",
@@ -1935,8 +1986,8 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"SHA384","sha384",NID_sha384,9,&(lvalues[4935]),0},
 {"SHA512","sha512",NID_sha512,9,&(lvalues[4944]),0},
 {"SHA224","sha224",NID_sha224,9,&(lvalues[4953]),0},
-{"Oakley-EC2N-3","ipsec3",NID_ipsec3,0,NULL},
-{"Oakley-EC2N-4","ipsec4",NID_ipsec4,0,NULL},
+{"Oakley-EC2N-3","ipsec3",NID_ipsec3,0,NULL,0},
+{"Oakley-EC2N-4","ipsec4",NID_ipsec4,0,NULL,0},
 {"id-ppl","id-ppl",NID_id_ppl,7,&(lvalues[4962]),0},
 {"proxyCertInfo","Proxy Certificate Information",NID_proxyCertInfo,8,
        &(lvalues[4969]),0},
@@ -1945,6 +1996,132 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"id-ppl-inheritAll","Inherit all",NID_id_ppl_inheritAll,8,
        &(lvalues[4985]),0},
 {"id-ppl-independent","Independent",NID_Independent,8,&(lvalues[4993]),0},
+{"issuingDistributionPoint","X509v3 Issuing Distrubution Point",
+       NID_issuing_distribution_point,3,&(lvalues[5001]),0},
+{"whirlpool","whirlpool",NID_whirlpool,6,&(lvalues[5004]),0},
+{"cryptopro","cryptopro",NID_cryptopro,5,&(lvalues[5010]),0},
+{"id-GostR3411-94-with-GostR3410-2001",
+       "GOST R 34.11-94 with GOST R 34.10-2001",
+       NID_id_GostR3411_94_with_GostR3410_2001,6,&(lvalues[5015]),0},
+{"id-GostR3411-94-with-GostR3410-94",
+       "GOST R 34.11-94 with GOST R 34.10-94",
+       NID_id_GostR3411_94_with_GostR3410_94,6,&(lvalues[5021]),0},
+{"gost2001","GOST R 34.10-2001",NID_id_GostR3410_2001,6,
+       &(lvalues[5027]),0},
+{"gost94","GOST R 34.10-94",NID_id_GostR3410_94,6,&(lvalues[5033]),0},
+{"id-GostR3411-94-TestParamSet","id-GostR3411-94-TestParamSet",
+       NID_id_GostR3411_94_TestParamSet,7,&(lvalues[5039]),0},
+{"id-GostR3411-94-CryptoProParamSet",
+       "id-GostR3411-94-CryptoProParamSet",
+       NID_id_GostR3411_94_CryptoProParamSet,7,&(lvalues[5046]),0},
+{"id-Gost28147-89-TestParamSet","id-Gost28147-89-TestParamSet",
+       NID_id_Gost28147_89_TestParamSet,7,&(lvalues[5053]),0},
+{"id-Gost28147-89-CryptoPro-A-ParamSet",
+       "id-Gost28147-89-CryptoPro-A-ParamSet",
+       NID_id_Gost28147_89_CryptoPro_A_ParamSet,7,&(lvalues[5060]),0},
+{"id-Gost28147-89-CryptoPro-B-ParamSet",
+       "id-Gost28147-89-CryptoPro-B-ParamSet",
+       NID_id_Gost28147_89_CryptoPro_B_ParamSet,7,&(lvalues[5067]),0},
+{"id-Gost28147-89-CryptoPro-C-ParamSet",
+       "id-Gost28147-89-CryptoPro-C-ParamSet",
+       NID_id_Gost28147_89_CryptoPro_C_ParamSet,7,&(lvalues[5074]),0},
+{"id-Gost28147-89-CryptoPro-D-ParamSet",
+       "id-Gost28147-89-CryptoPro-D-ParamSet",
+       NID_id_Gost28147_89_CryptoPro_D_ParamSet,7,&(lvalues[5081]),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[5088]),
+       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[5095]),
+       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[5102]),0},
+{"id-GostR3410-94-TestParamSet","id-GostR3410-94-TestParamSet",
+       NID_id_GostR3410_94_TestParamSet,7,&(lvalues[5109]),0},
+{"id-GostR3410-94-CryptoPro-A-ParamSet",
+       "id-GostR3410-94-CryptoPro-A-ParamSet",
+       NID_id_GostR3410_94_CryptoPro_A_ParamSet,7,&(lvalues[5116]),0},
+{"id-GostR3410-94-CryptoPro-B-ParamSet",
+       "id-GostR3410-94-CryptoPro-B-ParamSet",
+       NID_id_GostR3410_94_CryptoPro_B_ParamSet,7,&(lvalues[5123]),0},
+{"id-GostR3410-94-CryptoPro-C-ParamSet",
+       "id-GostR3410-94-CryptoPro-C-ParamSet",
+       NID_id_GostR3410_94_CryptoPro_C_ParamSet,7,&(lvalues[5130]),0},
+{"id-GostR3410-94-CryptoPro-D-ParamSet",
+       "id-GostR3410-94-CryptoPro-D-ParamSet",
+       NID_id_GostR3410_94_CryptoPro_D_ParamSet,7,&(lvalues[5137]),0},
+{"id-GostR3410-94-CryptoPro-XchA-ParamSet",
+       "id-GostR3410-94-CryptoPro-XchA-ParamSet",
+       NID_id_GostR3410_94_CryptoPro_XchA_ParamSet,7,&(lvalues[5144]),0},
+{"id-GostR3410-94-CryptoPro-XchB-ParamSet",
+       "id-GostR3410-94-CryptoPro-XchB-ParamSet",
+       NID_id_GostR3410_94_CryptoPro_XchB_ParamSet,7,&(lvalues[5151]),0},
+{"id-GostR3410-94-CryptoPro-XchC-ParamSet",
+       "id-GostR3410-94-CryptoPro-XchC-ParamSet",
+       NID_id_GostR3410_94_CryptoPro_XchC_ParamSet,7,&(lvalues[5158]),0},
+{"id-GostR3410-2001-TestParamSet","id-GostR3410-2001-TestParamSet",
+       NID_id_GostR3410_2001_TestParamSet,7,&(lvalues[5165]),0},
+{"id-GostR3410-2001-CryptoPro-A-ParamSet",
+       "id-GostR3410-2001-CryptoPro-A-ParamSet",
+       NID_id_GostR3410_2001_CryptoPro_A_ParamSet,7,&(lvalues[5172]),0},
+{"id-GostR3410-2001-CryptoPro-B-ParamSet",
+       "id-GostR3410-2001-CryptoPro-B-ParamSet",
+       NID_id_GostR3410_2001_CryptoPro_B_ParamSet,7,&(lvalues[5179]),0},
+{"id-GostR3410-2001-CryptoPro-C-ParamSet",
+       "id-GostR3410-2001-CryptoPro-C-ParamSet",
+       NID_id_GostR3410_2001_CryptoPro_C_ParamSet,7,&(lvalues[5186]),0},
+{"id-GostR3410-2001-CryptoPro-XchA-ParamSet",
+       "id-GostR3410-2001-CryptoPro-XchA-ParamSet",
+       NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet,7,&(lvalues[5193]),0},
+       
+{"id-GostR3410-2001-CryptoPro-XchB-ParamSet",
+       "id-GostR3410-2001-CryptoPro-XchB-ParamSet",
+       NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet,7,&(lvalues[5200]),0},
+       
+{"cryptocom","cryptocom",NID_cryptocom,5,&(lvalues[5207]),0},
+{"id-HMACGostR3411-94","HMAC GOST 34.11-94",NID_id_HMACGostR3411_94,6,
+       &(lvalues[5212]),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,
+       6,&(lvalues[5230]),0},
+{"id-GostR3410-94DH","GOST R 34.10-94 DH",NID_id_GostR3410_94DH,6,
+       &(lvalues[5236]),0},
+{"id-Gost28147-89-CryptoPro-KeyMeshing",
+       "id-Gost28147-89-CryptoPro-KeyMeshing",
+       NID_id_Gost28147_89_CryptoPro_KeyMeshing,7,&(lvalues[5242]),0},
+{"id-Gost28147-89-None-KeyMeshing","id-Gost28147-89-None-KeyMeshing",
+       NID_id_Gost28147_89_None_KeyMeshing,7,&(lvalues[5249]),0},
+{"id-GostR3410-94-a","id-GostR3410-94-a",NID_id_GostR3410_94_a,7,
+       &(lvalues[5256]),0},
+{"id-GostR3410-94-aBis","id-GostR3410-94-aBis",
+       NID_id_GostR3410_94_aBis,7,&(lvalues[5263]),0},
+{"id-GostR3410-94-b","id-GostR3410-94-b",NID_id_GostR3410_94_b,7,
+       &(lvalues[5270]),0},
+{"id-GostR3410-94-bBis","id-GostR3410-94-bBis",
+       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},
+{"gost94cc","GOST 34.10-94 Cryptocom",NID_id_Gost3410_94_cc,8,
+       &(lvalues[5292]),0},
+{"gost2001cc","GOST 34.10-2001 Cryptocom",NID_id_Gost3410_2001_cc,8,
+       &(lvalues[5300]),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[5308]),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[5316]),0},
+{"id-GostR3410-2001-ParamSet-cc",
+       "GOST R 3410-2001 Parameter Set Cryptocom",
+       NID_id_GostR3410_2001_ParamSet_cc,8,&(lvalues[5324]),0},
+{"md_gost94","GOST R 34.11-94",NID_id_GostR3411_94,6,&(lvalues[5332]),0},
+{"prf-gostr3411-94","GOST R 34.11-94 PRF",NID_id_GostR3411_94_prf,6,
+       &(lvalues[5338]),0},
 };
 
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -2154,6 +2331,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[153]),/* "crlBag" */
 &(nid_objs[103]),/* "crlDistributionPoints" */
 &(nid_objs[88]),/* "crlNumber" */
+&(nid_objs[782]),/* "cryptocom" */
+&(nid_objs[753]),/* "cryptopro" */
 &(nid_objs[500]),/* "dITRedirect" */
 &(nid_objs[451]),/* "dNSDomain" */
 &(nid_objs[495]),/* "dSAQuality" */
@@ -2188,6 +2367,11 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[490]),/* "friendlyCountryName" */
 &(nid_objs[156]),/* "friendlyName" */
 &(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" */
 &(nid_objs[432]),/* "holdInstructionCallIssuer" */
 &(nid_objs[430]),/* "holdInstructionCode" */
@@ -2197,6 +2381,46 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[473]),/* "homeTelephoneNumber" */
 &(nid_objs[466]),/* "host" */
 &(nid_objs[442]),/* "iA5StringSyntax" */
+&(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" */
+&(nid_objs[764]),/* "id-Gost28147-89-CryptoPro-D-ParamSet" */
+&(nid_objs[788]),/* "id-Gost28147-89-CryptoPro-KeyMeshing" */
+&(nid_objs[766]),/* "id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet" */
+&(nid_objs[765]),/* "id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet" */
+&(nid_objs[767]),/* "id-Gost28147-89-CryptoPro-RIC-1-ParamSet" */
+&(nid_objs[785]),/* "id-Gost28147-89-MAC" */
+&(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[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[776]),/* "id-GostR3410-2001-TestParamSet" */
+&(nid_objs[798]),/* "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" */
+&(nid_objs[771]),/* "id-GostR3410-94-CryptoPro-C-ParamSet" */
+&(nid_objs[772]),/* "id-GostR3410-94-CryptoPro-D-ParamSet" */
+&(nid_objs[773]),/* "id-GostR3410-94-CryptoPro-XchA-ParamSet" */
+&(nid_objs[774]),/* "id-GostR3410-94-CryptoPro-XchB-ParamSet" */
+&(nid_objs[775]),/* "id-GostR3410-94-CryptoPro-XchC-ParamSet" */
+&(nid_objs[768]),/* "id-GostR3410-94-TestParamSet" */
+&(nid_objs[790]),/* "id-GostR3410-94-a" */
+&(nid_objs[791]),/* "id-GostR3410-94-aBis" */
+&(nid_objs[792]),/* "id-GostR3410-94-b" */
+&(nid_objs[793]),/* "id-GostR3410-94-bBis" */
+&(nid_objs[787]),/* "id-GostR3410-94DH" */
+&(nid_objs[759]),/* "id-GostR3411-94-CryptoProParamSet" */
+&(nid_objs[758]),/* "id-GostR3411-94-TestParamSet" */
+&(nid_objs[754]),/* "id-GostR3411-94-with-GostR3410-2001" */
+&(nid_objs[755]),/* "id-GostR3411-94-with-GostR3410-94" */
+&(nid_objs[783]),/* "id-HMACGostR3411-94" */
 &(nid_objs[266]),/* "id-aca" */
 &(nid_objs[355]),/* "id-aca-accessIdentity" */
 &(nid_objs[354]),/* "id-aca-authenticationInfo" */
@@ -2382,6 +2606,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[295]),/* "ipsecTunnel" */
 &(nid_objs[296]),/* "ipsecUser" */
 &(nid_objs[86]),/* "issuerAltName" */
+&(nid_objs[751]),/* "issuingDistributionPoint" */
 &(nid_objs[492]),/* "janetMailbox" */
 &(nid_objs[150]),/* "keyBag" */
 &(nid_objs[83]),/* "keyUsage" */
@@ -2392,6 +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[182]),/* "member-body" */
 &(nid_objs[51]),/* "messageDigest" */
 &(nid_objs[383]),/* "mgmt" */
@@ -2460,6 +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[406]),/* "prime-field" */
 &(nid_objs[409]),/* "prime192v1" */
 &(nid_objs[410]),/* "prime192v2" */
@@ -2485,9 +2712,9 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[ 1]),/* "rsadsi" */
 &(nid_objs[482]),/* "sOARecord" */
 &(nid_objs[155]),/* "safeContentsBag" */
-&(nid_objs[291]),/* "sbqp-autonomousSysNum" */
-&(nid_objs[290]),/* "sbqp-ipAddrBlock" */
-&(nid_objs[292]),/* "sbqp-routerIdentifier" */
+&(nid_objs[291]),/* "sbgp-autonomousSysNum" */
+&(nid_objs[290]),/* "sbgp-ipAddrBlock" */
+&(nid_objs[292]),/* "sbgp-routerIdentifier" */
 &(nid_objs[159]),/* "sdsiCertificate" */
 &(nid_objs[690]),/* "secp112r1" */
 &(nid_objs[691]),/* "secp112r2" */
@@ -2692,6 +2919,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[726]),/* "wap-wsg-idm-ecid-wtls7" */
 &(nid_objs[727]),/* "wap-wsg-idm-ecid-wtls8" */
 &(nid_objs[728]),/* "wap-wsg-idm-ecid-wtls9" */
+&(nid_objs[752]),/* "whirlpool" */
 &(nid_objs[503]),/* "x500UniqueIdentifier" */
 &(nid_objs[158]),/* "x509Certificate" */
 &(nid_objs[160]),/* "x509Crl" */
@@ -2714,6 +2942,23 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[384]),/* "Experimental" */
 &(nid_objs[372]),/* "Extended OCSP Status" */
 &(nid_objs[172]),/* "Extension Request" */
+&(nid_objs[784]),/* "GOST 28147-89" */
+&(nid_objs[794]),/* "GOST 28147-89 Cryptocom ParamSet" */
+&(nid_objs[785]),/* "GOST 28147-89 MAC" */
+&(nid_objs[796]),/* "GOST 34.10-2001 Cryptocom" */
+&(nid_objs[795]),/* "GOST 34.10-94 Cryptocom" */
+&(nid_objs[797]),/* "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[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[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[783]),/* "HMAC GOST 34.11-94" */
 &(nid_objs[432]),/* "Hold Instruction Call Issuer" */
 &(nid_objs[430]),/* "Hold Instruction Code" */
 &(nid_objs[431]),/* "Hold Instruction None" */
@@ -2797,6 +3042,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[126]),/* "X509v3 Extended Key Usage" */
 &(nid_objs[739]),/* "X509v3 Inhibit Any Policy" */
 &(nid_objs[86]),/* "X509v3 Issuer Alternative Name" */
+&(nid_objs[751]),/* "X509v3 Issuing Distrubution Point" */
 &(nid_objs[83]),/* "X509v3 Key Usage" */
 &(nid_objs[736]),/* "X509v3 Name Constraints" */
 &(nid_objs[403]),/* "X509v3 No Revocation Available" */
@@ -2881,6 +3127,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[53]),/* "countersignature" */
 &(nid_objs[14]),/* "countryName" */
 &(nid_objs[153]),/* "crlBag" */
+&(nid_objs[782]),/* "cryptocom" */
+&(nid_objs[753]),/* "cryptopro" */
 &(nid_objs[500]),/* "dITRedirect" */
 &(nid_objs[451]),/* "dNSDomain" */
 &(nid_objs[495]),/* "dSAQuality" */
@@ -2944,6 +3192,36 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[466]),/* "host" */
 &(nid_objs[442]),/* "iA5StringSyntax" */
 &(nid_objs[381]),/* "iana" */
+&(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" */
+&(nid_objs[764]),/* "id-Gost28147-89-CryptoPro-D-ParamSet" */
+&(nid_objs[788]),/* "id-Gost28147-89-CryptoPro-KeyMeshing" */
+&(nid_objs[766]),/* "id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet" */
+&(nid_objs[765]),/* "id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet" */
+&(nid_objs[767]),/* "id-Gost28147-89-CryptoPro-RIC-1-ParamSet" */
+&(nid_objs[789]),/* "id-Gost28147-89-None-KeyMeshing" */
+&(nid_objs[760]),/* "id-Gost28147-89-TestParamSet" */
+&(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[776]),/* "id-GostR3410-2001-TestParamSet" */
+&(nid_objs[769]),/* "id-GostR3410-94-CryptoPro-A-ParamSet" */
+&(nid_objs[770]),/* "id-GostR3410-94-CryptoPro-B-ParamSet" */
+&(nid_objs[771]),/* "id-GostR3410-94-CryptoPro-C-ParamSet" */
+&(nid_objs[772]),/* "id-GostR3410-94-CryptoPro-D-ParamSet" */
+&(nid_objs[773]),/* "id-GostR3410-94-CryptoPro-XchA-ParamSet" */
+&(nid_objs[774]),/* "id-GostR3410-94-CryptoPro-XchB-ParamSet" */
+&(nid_objs[775]),/* "id-GostR3410-94-CryptoPro-XchC-ParamSet" */
+&(nid_objs[768]),/* "id-GostR3410-94-TestParamSet" */
+&(nid_objs[790]),/* "id-GostR3410-94-a" */
+&(nid_objs[791]),/* "id-GostR3410-94-aBis" */
+&(nid_objs[792]),/* "id-GostR3410-94-b" */
+&(nid_objs[793]),/* "id-GostR3410-94-bBis" */
+&(nid_objs[759]),/* "id-GostR3411-94-CryptoProParamSet" */
+&(nid_objs[758]),/* "id-GostR3411-94-TestParamSet" */
 &(nid_objs[266]),/* "id-aca" */
 &(nid_objs[355]),/* "id-aca-accessIdentity" */
 &(nid_objs[354]),/* "id-aca-authenticationInfo" */
@@ -3240,9 +3518,9 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[124]),/* "run length compression" */
 &(nid_objs[482]),/* "sOARecord" */
 &(nid_objs[155]),/* "safeContentsBag" */
-&(nid_objs[291]),/* "sbqp-autonomousSysNum" */
-&(nid_objs[290]),/* "sbqp-ipAddrBlock" */
-&(nid_objs[292]),/* "sbqp-routerIdentifier" */
+&(nid_objs[291]),/* "sbgp-autonomousSysNum" */
+&(nid_objs[290]),/* "sbgp-ipAddrBlock" */
+&(nid_objs[292]),/* "sbgp-routerIdentifier" */
 &(nid_objs[159]),/* "sdsiCertificate" */
 &(nid_objs[690]),/* "secp112r1" */
 &(nid_objs[691]),/* "secp112r2" */
@@ -3441,6 +3719,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[726]),/* "wap-wsg-idm-ecid-wtls7" */
 &(nid_objs[727]),/* "wap-wsg-idm-ecid-wtls8" */
 &(nid_objs[728]),/* "wap-wsg-idm-ecid-wtls9" */
+&(nid_objs[752]),/* "whirlpool" */
 &(nid_objs[503]),/* "x500UniqueIdentifier" */
 &(nid_objs[158]),/* "x509Certificate" */
 &(nid_objs[160]),/* "x509Crl" */
@@ -3502,6 +3781,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[430]),/* OBJ_hold_instruction_code        2 5 29 23 */
 &(nid_objs[142]),/* OBJ_invalidity_date              2 5 29 24 */
 &(nid_objs[140]),/* OBJ_delta_crl                    2 5 29 27 */
+&(nid_objs[751]),/* OBJ_issuing_distribution_point   2 5 29 28 */
 &(nid_objs[736]),/* OBJ_name_constraints             2 5 29 30 */
 &(nid_objs[103]),/* OBJ_crl_distribution_points      2 5 29 31 */
 &(nid_objs[89]),/* OBJ_certificate_policies         2 5 29 32 */
@@ -3643,6 +3923,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[637]),/* OBJ_set_brand_Diners             2 23 42 8 30 */
 &(nid_objs[638]),/* OBJ_set_brand_AmericanExpress    2 23 42 8 34 */
 &(nid_objs[639]),/* OBJ_set_brand_JCB                2 23 42 8 35 */
+&(nid_objs[753]),/* OBJ_cryptopro                    1 2 643 2 2 */
+&(nid_objs[782]),/* OBJ_cryptocom                    1 2 643 2 9 */
 &(nid_objs[184]),/* OBJ_X9_57                        1 2 840 10040 */
 &(nid_objs[405]),/* OBJ_ansi_X9_62                   1 2 840 10045 */
 &(nid_objs[389]),/* OBJ_Enterprises                  1 3 6 1 4 1 */
@@ -3713,8 +3995,20 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[729]),/* OBJ_wap_wsg_idm_ecid_wtls10      2 23 43 13 4 10 */
 &(nid_objs[730]),/* OBJ_wap_wsg_idm_ecid_wtls11      2 23 43 13 4 11 */
 &(nid_objs[731]),/* OBJ_wap_wsg_idm_ecid_wtls12      2 23 43 13 4 12 */
+&(nid_objs[752]),/* OBJ_whirlpool                    1 0 10118 3 0 55 */
 &(nid_objs[124]),/* OBJ_rle_compression              1 1 1 1 666 1 */
 &(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[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[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 */
 &(nid_objs[185]),/* OBJ_X9cm                         1 2 840 10040 4 */
 &(nid_objs[127]),/* OBJ_id_pkix                      1 3 6 1 5 5 7 */
@@ -3727,6 +4021,36 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[634]),/* OBJ_setAttr_TokICCsig            2 23 42 3 3 5 1 */
 &(nid_objs[635]),/* OBJ_setAttr_SecDevSig            2 23 42 3 3 5 2 */
 &(nid_objs[436]),/* OBJ_ucl                          0 9 2342 19200300 */
+&(nid_objs[789]),/* OBJ_id_Gost28147_89_None_KeyMeshing 1 2 643 2 2 14 0 */
+&(nid_objs[788]),/* OBJ_id_Gost28147_89_CryptoPro_KeyMeshing 1 2 643 2 2 14 1 */
+&(nid_objs[790]),/* OBJ_id_GostR3410_94_a            1 2 643 2 2 20 1 */
+&(nid_objs[791]),/* OBJ_id_GostR3410_94_aBis         1 2 643 2 2 20 2 */
+&(nid_objs[792]),/* OBJ_id_GostR3410_94_b            1 2 643 2 2 20 3 */
+&(nid_objs[793]),/* OBJ_id_GostR3410_94_bBis         1 2 643 2 2 20 4 */
+&(nid_objs[758]),/* OBJ_id_GostR3411_94_TestParamSet 1 2 643 2 2 30 0 */
+&(nid_objs[759]),/* OBJ_id_GostR3411_94_CryptoProParamSet 1 2 643 2 2 30 1 */
+&(nid_objs[760]),/* OBJ_id_Gost28147_89_TestParamSet 1 2 643 2 2 31 0 */
+&(nid_objs[761]),/* OBJ_id_Gost28147_89_CryptoPro_A_ParamSet 1 2 643 2 2 31 1 */
+&(nid_objs[762]),/* OBJ_id_Gost28147_89_CryptoPro_B_ParamSet 1 2 643 2 2 31 2 */
+&(nid_objs[763]),/* OBJ_id_Gost28147_89_CryptoPro_C_ParamSet 1 2 643 2 2 31 3 */
+&(nid_objs[764]),/* OBJ_id_Gost28147_89_CryptoPro_D_ParamSet 1 2 643 2 2 31 4 */
+&(nid_objs[765]),/* OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet 1 2 643 2 2 31 5 */
+&(nid_objs[766]),/* OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet 1 2 643 2 2 31 6 */
+&(nid_objs[767]),/* OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet 1 2 643 2 2 31 7 */
+&(nid_objs[768]),/* OBJ_id_GostR3410_94_TestParamSet 1 2 643 2 2 32 0 */
+&(nid_objs[769]),/* OBJ_id_GostR3410_94_CryptoPro_A_ParamSet 1 2 643 2 2 32 2 */
+&(nid_objs[770]),/* OBJ_id_GostR3410_94_CryptoPro_B_ParamSet 1 2 643 2 2 32 3 */
+&(nid_objs[771]),/* OBJ_id_GostR3410_94_CryptoPro_C_ParamSet 1 2 643 2 2 32 4 */
+&(nid_objs[772]),/* OBJ_id_GostR3410_94_CryptoPro_D_ParamSet 1 2 643 2 2 32 5 */
+&(nid_objs[773]),/* OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet 1 2 643 2 2 33 1 */
+&(nid_objs[774]),/* OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet 1 2 643 2 2 33 2 */
+&(nid_objs[775]),/* OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet 1 2 643 2 2 33 3 */
+&(nid_objs[776]),/* OBJ_id_GostR3410_2001_TestParamSet 1 2 643 2 2 35 0 */
+&(nid_objs[777]),/* OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet 1 2 643 2 2 35 1 */
+&(nid_objs[778]),/* OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet 1 2 643 2 2 35 2 */
+&(nid_objs[779]),/* OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet 1 2 643 2 2 35 3 */
+&(nid_objs[780]),/* OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet 1 2 643 2 2 36 0 */
+&(nid_objs[781]),/* OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet 1 2 643 2 2 36 1 */
 &(nid_objs[ 2]),/* OBJ_pkcs                         1 2 840 113549 1 */
 &(nid_objs[431]),/* OBJ_hold_instruction_none        1 2 840 10040 2 1 */
 &(nid_objs[432]),/* OBJ_hold_instruction_call_issuer 1 2 840 10040 2 2 */
@@ -3756,6 +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[795]),/* OBJ_id_Gost3410_94_cc            1 2 643 2 9 1 5 3 */
+&(nid_objs[796]),/* OBJ_id_Gost3410_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[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 */
@@ -3820,9 +4150,9 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[287]),/* OBJ_ac_auditEntity               1 3 6 1 5 5 7 1 4 */
 &(nid_objs[288]),/* OBJ_ac_targeting                 1 3 6 1 5 5 7 1 5 */
 &(nid_objs[289]),/* OBJ_aaControls                   1 3 6 1 5 5 7 1 6 */
-&(nid_objs[290]),/* OBJ_sbqp_ipAddrBlock             1 3 6 1 5 5 7 1 7 */
-&(nid_objs[291]),/* OBJ_sbqp_autonomousSysNum        1 3 6 1 5 5 7 1 8 */
-&(nid_objs[292]),/* OBJ_sbqp_routerIdentifier        1 3 6 1 5 5 7 1 9 */
+&(nid_objs[290]),/* OBJ_sbgp_ipAddrBlock             1 3 6 1 5 5 7 1 7 */
+&(nid_objs[291]),/* OBJ_sbgp_autonomousSysNum        1 3 6 1 5 5 7 1 8 */
+&(nid_objs[292]),/* OBJ_sbgp_routerIdentifier        1 3 6 1 5 5 7 1 9 */
 &(nid_objs[397]),/* OBJ_ac_proxying                  1 3 6 1 5 5 7 1 10 */
 &(nid_objs[398]),/* OBJ_sinfo_access                 1 3 6 1 5 5 7 1 11 */
 &(nid_objs[747]),/* OBJ_proxyCertInfo                1 3 6 1 5 5 7 1 14 */