Commit 98d8baab authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add caRepository OID and sync object NIDs with OpenSSL 0.9.8.

parent c1d2e00e

crypto/objects/obj_dat.h

+394 −390

File changed.

Preview size limit exceeded, changes collapsed.

crypto/objects/obj_mac.h

+80 −75
Original line number Diff line number Diff line
@@ -99,12 +99,12 @@ 


#define SN_hmac_md5		"HMAC-MD5"

#define LN_hmac_md5		"hmac-md5"

#define NID_hmac_md5		844

#define NID_hmac_md5		780

#define OBJ_hmac_md5		OBJ_identified_organization,6L,1L,5L,5L,8L,1L,1L



#define SN_hmac_sha1		"HMAC-SHA1"

#define LN_hmac_sha1		"hmac-sha1"

#define NID_hmac_sha1		845

#define NID_hmac_sha1		781

#define OBJ_hmac_sha1		OBJ_identified_organization,6L,1L,5L,5L,8L,1L,2L



#define SN_certicom_arc		"certicom-arc"
@@ -316,27 +316,27 @@ 
#define OBJ_ecdsa_with_SHA1		OBJ_X9_62_id_ecSigType,1L



#define SN_ecdsa_with_Recommended		"ecdsa-with-Recommended"

#define NID_ecdsa_with_Recommended		827

#define NID_ecdsa_with_Recommended		786

#define OBJ_ecdsa_with_Recommended		OBJ_X9_62_id_ecSigType,2L



#define SN_ecdsa_with_Specified		"ecdsa-with-Specified"

#define NID_ecdsa_with_Specified		828

#define NID_ecdsa_with_Specified		787

#define OBJ_ecdsa_with_Specified		OBJ_X9_62_id_ecSigType,3L



#define SN_ecdsa_with_SHA224		"ecdsa-with-SHA224"

#define NID_ecdsa_with_SHA224		829

#define NID_ecdsa_with_SHA224		788

#define OBJ_ecdsa_with_SHA224		OBJ_ecdsa_with_Specified,1L



#define SN_ecdsa_with_SHA256		"ecdsa-with-SHA256"

#define NID_ecdsa_with_SHA256		830

#define NID_ecdsa_with_SHA256		789

#define OBJ_ecdsa_with_SHA256		OBJ_ecdsa_with_Specified,2L



#define SN_ecdsa_with_SHA384		"ecdsa-with-SHA384"

#define NID_ecdsa_with_SHA384		831

#define NID_ecdsa_with_SHA384		790

#define OBJ_ecdsa_with_SHA384		OBJ_ecdsa_with_Specified,3L



#define SN_ecdsa_with_SHA512		"ecdsa-with-SHA512"

#define NID_ecdsa_with_SHA512		832

#define NID_ecdsa_with_SHA512		791

#define OBJ_ecdsa_with_SHA512		OBJ_ecdsa_with_Specified,4L



#define OBJ_secg_ellipticCurve		OBJ_certicom_arc,0L
@@ -534,12 +534,12 @@ 


#define SN_id_PasswordBasedMAC		"id-PasswordBasedMAC"

#define LN_id_PasswordBasedMAC		"password based MAC"

#define NID_id_PasswordBasedMAC		846

#define NID_id_PasswordBasedMAC		782

#define OBJ_id_PasswordBasedMAC		OBJ_ISO_US,113533L,7L,66L,13L



#define SN_id_DHBasedMac		"id-DHBasedMac"

#define LN_id_DHBasedMac		"Diffie-Hellman based MAC"

#define NID_id_DHBasedMac		847

#define NID_id_DHBasedMac		783

#define OBJ_id_DHBasedMac		OBJ_ISO_US,113533L,7L,66L,30L



#define SN_rsadsi		"rsadsi"
@@ -1120,7 +1120,7 @@ 
#define NID_md5_sha1		114



#define LN_hmacWithMD5		"hmacWithMD5"

#define NID_hmacWithMD5		772

#define NID_hmacWithMD5		792

#define OBJ_hmacWithMD5		OBJ_rsadsi,2L,6L



#define LN_hmacWithSHA1		"hmacWithSHA1"
@@ -1128,19 +1128,19 @@ 
#define OBJ_hmacWithSHA1		OBJ_rsadsi,2L,7L



#define LN_hmacWithSHA224		"hmacWithSHA224"

#define NID_hmacWithSHA224		773

#define NID_hmacWithSHA224		793

#define OBJ_hmacWithSHA224		OBJ_rsadsi,2L,8L



#define LN_hmacWithSHA256		"hmacWithSHA256"

#define NID_hmacWithSHA256		774

#define NID_hmacWithSHA256		794

#define OBJ_hmacWithSHA256		OBJ_rsadsi,2L,9L



#define LN_hmacWithSHA384		"hmacWithSHA384"

#define NID_hmacWithSHA384		775

#define NID_hmacWithSHA384		795

#define OBJ_hmacWithSHA384		OBJ_rsadsi,2L,10L



#define LN_hmacWithSHA512		"hmacWithSHA512"

#define NID_hmacWithSHA512		776

#define NID_hmacWithSHA512		796

#define OBJ_hmacWithSHA512		OBJ_rsadsi,2L,11L



#define SN_rc2_cbc		"RC2-CBC"
@@ -1578,7 +1578,7 @@ 
#define OBJ_id_it_origPKIMessage		OBJ_id_it,15L



#define SN_id_it_suppLangTags		"id-it-suppLangTags"

#define NID_id_it_suppLangTags		849

#define NID_id_it_suppLangTags		784

#define OBJ_id_it_suppLangTags		OBJ_id_it,16L



#define SN_id_regCtrl		"id-regCtrl"
@@ -1816,6 +1816,11 @@ 
#define NID_ad_dvcs		364

#define OBJ_ad_dvcs		OBJ_id_ad,4L



#define SN_caRepository		"caRepository"

#define LN_caRepository		"CA Respository"

#define NID_caRepository		785

#define OBJ_caRepository		OBJ_id_ad,5L



#define OBJ_id_pkix_OCSP		OBJ_ad_OCSP



#define SN_id_pkix_OCSP_basic		"basicOCSPResponse"
@@ -2524,11 +2529,11 @@ 
#define OBJ_dsa_with_sha2		OBJ_nistAlgorithms,3L



#define SN_dsa_with_SHA224		"dsa_with_SHA224"

#define NID_dsa_with_SHA224		833

#define NID_dsa_with_SHA224		797

#define OBJ_dsa_with_SHA224		OBJ_dsa_with_sha2,1L



#define SN_dsa_with_SHA256		"dsa_with_SHA256"

#define NID_dsa_with_SHA256		834

#define NID_dsa_with_SHA256		798

#define OBJ_dsa_with_SHA256		OBJ_dsa_with_sha2,2L



#define SN_hold_instruction_code		"holdInstructionCode"
@@ -3397,223 +3402,223 @@ 
#define NID_ipsec4		750



#define SN_whirlpool		"whirlpool"

#define NID_whirlpool		777

#define NID_whirlpool		799

#define OBJ_whirlpool		OBJ_iso,0L,10118L,3L,0L,55L



#define SN_cryptopro		"cryptopro"

#define NID_cryptopro		778

#define NID_cryptopro		800

#define OBJ_cryptopro		OBJ_member_body,643L,2L,2L



#define SN_cryptocom		"cryptocom"

#define NID_cryptocom		779

#define NID_cryptocom		801

#define OBJ_cryptocom		OBJ_member_body,643L,2L,9L



#define SN_id_GostR3411_94_with_GostR3410_2001		"id-GostR3411-94-with-GostR3410-2001"

#define LN_id_GostR3411_94_with_GostR3410_2001		"GOST R 34.11-94 with GOST R 34.10-2001"

#define NID_id_GostR3411_94_with_GostR3410_2001		780

#define NID_id_GostR3411_94_with_GostR3410_2001		802

#define OBJ_id_GostR3411_94_with_GostR3410_2001		OBJ_cryptopro,3L



#define SN_id_GostR3411_94_with_GostR3410_94		"id-GostR3411-94-with-GostR3410-94"

#define LN_id_GostR3411_94_with_GostR3410_94		"GOST R 34.11-94 with GOST R 34.10-94"

#define NID_id_GostR3411_94_with_GostR3410_94		781

#define NID_id_GostR3411_94_with_GostR3410_94		803

#define OBJ_id_GostR3411_94_with_GostR3410_94		OBJ_cryptopro,4L



#define SN_id_GostR3411_94		"md_gost94"

#define LN_id_GostR3411_94		"GOST R 34.11-94"

#define NID_id_GostR3411_94		782

#define NID_id_GostR3411_94		804

#define OBJ_id_GostR3411_94		OBJ_cryptopro,9L



#define SN_id_HMACGostR3411_94		"id-HMACGostR3411-94"

#define LN_id_HMACGostR3411_94		"HMAC GOST 34.11-94"

#define NID_id_HMACGostR3411_94		783

#define NID_id_HMACGostR3411_94		805

#define OBJ_id_HMACGostR3411_94		OBJ_cryptopro,10L



#define SN_id_GostR3410_2001		"gost2001"

#define LN_id_GostR3410_2001		"GOST R 34.10-2001"

#define NID_id_GostR3410_2001		784

#define NID_id_GostR3410_2001		806

#define OBJ_id_GostR3410_2001		OBJ_cryptopro,19L



#define SN_id_GostR3410_94		"gost94"

#define LN_id_GostR3410_94		"GOST R 34.10-94"

#define NID_id_GostR3410_94		785

#define NID_id_GostR3410_94		807

#define OBJ_id_GostR3410_94		OBJ_cryptopro,20L



#define SN_id_Gost28147_89		"gost89"

#define LN_id_Gost28147_89		"GOST 28147-89"

#define NID_id_Gost28147_89		786

#define NID_id_Gost28147_89		808

#define OBJ_id_Gost28147_89		OBJ_cryptopro,21L



#define SN_gost89_cnt		"gost89-cnt"

#define NID_gost89_cnt		835

#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					850

#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"

#define NID_id_GostR3411_94_prf		788

#define NID_id_GostR3411_94_prf		811

#define OBJ_id_GostR3411_94_prf		OBJ_cryptopro,23L



#define SN_id_GostR3410_2001DH		"id-GostR3410-2001DH"

#define LN_id_GostR3410_2001DH		"GOST R 34.10-2001 DH"

#define NID_id_GostR3410_2001DH		789

#define NID_id_GostR3410_2001DH		812

#define OBJ_id_GostR3410_2001DH		OBJ_cryptopro,98L



#define SN_id_GostR3410_94DH		"id-GostR3410-94DH"

#define LN_id_GostR3410_94DH		"GOST R 34.10-94 DH"

#define NID_id_GostR3410_94DH		790

#define NID_id_GostR3410_94DH		813

#define OBJ_id_GostR3410_94DH		OBJ_cryptopro,99L



#define SN_id_Gost28147_89_CryptoPro_KeyMeshing		"id-Gost28147-89-CryptoPro-KeyMeshing"

#define NID_id_Gost28147_89_CryptoPro_KeyMeshing		791

#define NID_id_Gost28147_89_CryptoPro_KeyMeshing		814

#define OBJ_id_Gost28147_89_CryptoPro_KeyMeshing		OBJ_cryptopro,14L,1L



#define SN_id_Gost28147_89_None_KeyMeshing		"id-Gost28147-89-None-KeyMeshing"

#define NID_id_Gost28147_89_None_KeyMeshing		792

#define NID_id_Gost28147_89_None_KeyMeshing		815

#define OBJ_id_Gost28147_89_None_KeyMeshing		OBJ_cryptopro,14L,0L



#define SN_id_GostR3411_94_TestParamSet		"id-GostR3411-94-TestParamSet"

#define NID_id_GostR3411_94_TestParamSet		793

#define NID_id_GostR3411_94_TestParamSet		816

#define OBJ_id_GostR3411_94_TestParamSet		OBJ_cryptopro,30L,0L



#define SN_id_GostR3411_94_CryptoProParamSet		"id-GostR3411-94-CryptoProParamSet"

#define NID_id_GostR3411_94_CryptoProParamSet		794

#define NID_id_GostR3411_94_CryptoProParamSet		817

#define OBJ_id_GostR3411_94_CryptoProParamSet		OBJ_cryptopro,30L,1L



#define SN_id_Gost28147_89_TestParamSet		"id-Gost28147-89-TestParamSet"

#define NID_id_Gost28147_89_TestParamSet		795

#define NID_id_Gost28147_89_TestParamSet		818

#define OBJ_id_Gost28147_89_TestParamSet		OBJ_cryptopro,31L,0L



#define SN_id_Gost28147_89_CryptoPro_A_ParamSet		"id-Gost28147-89-CryptoPro-A-ParamSet"

#define NID_id_Gost28147_89_CryptoPro_A_ParamSet		796

#define NID_id_Gost28147_89_CryptoPro_A_ParamSet		819

#define OBJ_id_Gost28147_89_CryptoPro_A_ParamSet		OBJ_cryptopro,31L,1L



#define SN_id_Gost28147_89_CryptoPro_B_ParamSet		"id-Gost28147-89-CryptoPro-B-ParamSet"

#define NID_id_Gost28147_89_CryptoPro_B_ParamSet		797

#define NID_id_Gost28147_89_CryptoPro_B_ParamSet		820

#define OBJ_id_Gost28147_89_CryptoPro_B_ParamSet		OBJ_cryptopro,31L,2L



#define SN_id_Gost28147_89_CryptoPro_C_ParamSet		"id-Gost28147-89-CryptoPro-C-ParamSet"

#define NID_id_Gost28147_89_CryptoPro_C_ParamSet		798

#define NID_id_Gost28147_89_CryptoPro_C_ParamSet		821

#define OBJ_id_Gost28147_89_CryptoPro_C_ParamSet		OBJ_cryptopro,31L,3L



#define SN_id_Gost28147_89_CryptoPro_D_ParamSet		"id-Gost28147-89-CryptoPro-D-ParamSet"

#define NID_id_Gost28147_89_CryptoPro_D_ParamSet		799

#define NID_id_Gost28147_89_CryptoPro_D_ParamSet		822

#define OBJ_id_Gost28147_89_CryptoPro_D_ParamSet		OBJ_cryptopro,31L,4L



#define SN_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet"

#define NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		800

#define NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		823

#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		OBJ_cryptopro,31L,5L



#define SN_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet"

#define NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		801

#define NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		824

#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		OBJ_cryptopro,31L,6L



#define SN_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		"id-Gost28147-89-CryptoPro-RIC-1-ParamSet"

#define NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		802

#define NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		825

#define OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		OBJ_cryptopro,31L,7L



#define SN_id_GostR3410_94_TestParamSet		"id-GostR3410-94-TestParamSet"

#define NID_id_GostR3410_94_TestParamSet		803

#define NID_id_GostR3410_94_TestParamSet		826

#define OBJ_id_GostR3410_94_TestParamSet		OBJ_cryptopro,32L,0L



#define SN_id_GostR3410_94_CryptoPro_A_ParamSet		"id-GostR3410-94-CryptoPro-A-ParamSet"

#define NID_id_GostR3410_94_CryptoPro_A_ParamSet		804

#define NID_id_GostR3410_94_CryptoPro_A_ParamSet		827

#define OBJ_id_GostR3410_94_CryptoPro_A_ParamSet		OBJ_cryptopro,32L,2L



#define SN_id_GostR3410_94_CryptoPro_B_ParamSet		"id-GostR3410-94-CryptoPro-B-ParamSet"

#define NID_id_GostR3410_94_CryptoPro_B_ParamSet		805

#define NID_id_GostR3410_94_CryptoPro_B_ParamSet		828

#define OBJ_id_GostR3410_94_CryptoPro_B_ParamSet		OBJ_cryptopro,32L,3L



#define SN_id_GostR3410_94_CryptoPro_C_ParamSet		"id-GostR3410-94-CryptoPro-C-ParamSet"

#define NID_id_GostR3410_94_CryptoPro_C_ParamSet		806

#define NID_id_GostR3410_94_CryptoPro_C_ParamSet		829

#define OBJ_id_GostR3410_94_CryptoPro_C_ParamSet		OBJ_cryptopro,32L,4L



#define SN_id_GostR3410_94_CryptoPro_D_ParamSet		"id-GostR3410-94-CryptoPro-D-ParamSet"

#define NID_id_GostR3410_94_CryptoPro_D_ParamSet		807

#define NID_id_GostR3410_94_CryptoPro_D_ParamSet		830

#define OBJ_id_GostR3410_94_CryptoPro_D_ParamSet		OBJ_cryptopro,32L,5L



#define SN_id_GostR3410_94_CryptoPro_XchA_ParamSet		"id-GostR3410-94-CryptoPro-XchA-ParamSet"

#define NID_id_GostR3410_94_CryptoPro_XchA_ParamSet		808

#define NID_id_GostR3410_94_CryptoPro_XchA_ParamSet		831

#define OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet		OBJ_cryptopro,33L,1L



#define SN_id_GostR3410_94_CryptoPro_XchB_ParamSet		"id-GostR3410-94-CryptoPro-XchB-ParamSet"

#define NID_id_GostR3410_94_CryptoPro_XchB_ParamSet		809

#define NID_id_GostR3410_94_CryptoPro_XchB_ParamSet		832

#define OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet		OBJ_cryptopro,33L,2L



#define SN_id_GostR3410_94_CryptoPro_XchC_ParamSet		"id-GostR3410-94-CryptoPro-XchC-ParamSet"

#define NID_id_GostR3410_94_CryptoPro_XchC_ParamSet		810

#define NID_id_GostR3410_94_CryptoPro_XchC_ParamSet		833

#define OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet		OBJ_cryptopro,33L,3L



#define SN_id_GostR3410_2001_TestParamSet		"id-GostR3410-2001-TestParamSet"

#define NID_id_GostR3410_2001_TestParamSet		811

#define NID_id_GostR3410_2001_TestParamSet		834

#define OBJ_id_GostR3410_2001_TestParamSet		OBJ_cryptopro,35L,0L



#define SN_id_GostR3410_2001_CryptoPro_A_ParamSet		"id-GostR3410-2001-CryptoPro-A-ParamSet"

#define NID_id_GostR3410_2001_CryptoPro_A_ParamSet		812

#define NID_id_GostR3410_2001_CryptoPro_A_ParamSet		835

#define OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet		OBJ_cryptopro,35L,1L



#define SN_id_GostR3410_2001_CryptoPro_B_ParamSet		"id-GostR3410-2001-CryptoPro-B-ParamSet"

#define NID_id_GostR3410_2001_CryptoPro_B_ParamSet		813

#define NID_id_GostR3410_2001_CryptoPro_B_ParamSet		836

#define OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet		OBJ_cryptopro,35L,2L



#define SN_id_GostR3410_2001_CryptoPro_C_ParamSet		"id-GostR3410-2001-CryptoPro-C-ParamSet"

#define NID_id_GostR3410_2001_CryptoPro_C_ParamSet		814

#define NID_id_GostR3410_2001_CryptoPro_C_ParamSet		837

#define OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet		OBJ_cryptopro,35L,3L



#define SN_id_GostR3410_2001_CryptoPro_XchA_ParamSet		"id-GostR3410-2001-CryptoPro-XchA-ParamSet"

#define NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet		815

#define NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet		838

#define OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet		OBJ_cryptopro,36L,0L



#define SN_id_GostR3410_2001_CryptoPro_XchB_ParamSet		"id-GostR3410-2001-CryptoPro-XchB-ParamSet"

#define NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet		816

#define NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet		839

#define OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet		OBJ_cryptopro,36L,1L



#define SN_id_GostR3410_94_a		"id-GostR3410-94-a"

#define NID_id_GostR3410_94_a		817

#define NID_id_GostR3410_94_a		840

#define OBJ_id_GostR3410_94_a		OBJ_id_GostR3410_94,1L



#define SN_id_GostR3410_94_aBis		"id-GostR3410-94-aBis"

#define NID_id_GostR3410_94_aBis		818

#define NID_id_GostR3410_94_aBis		841

#define OBJ_id_GostR3410_94_aBis		OBJ_id_GostR3410_94,2L



#define SN_id_GostR3410_94_b		"id-GostR3410-94-b"

#define NID_id_GostR3410_94_b		819

#define NID_id_GostR3410_94_b		842

#define OBJ_id_GostR3410_94_b		OBJ_id_GostR3410_94,3L



#define SN_id_GostR3410_94_bBis		"id-GostR3410-94-bBis"

#define NID_id_GostR3410_94_bBis		820

#define NID_id_GostR3410_94_bBis		843

#define OBJ_id_GostR3410_94_bBis		OBJ_id_GostR3410_94,4L



#define SN_id_Gost28147_89_cc		"id-Gost28147-89-cc"

#define LN_id_Gost28147_89_cc		"GOST 28147-89 Cryptocom ParamSet"

#define NID_id_Gost28147_89_cc		821

#define NID_id_Gost28147_89_cc		844

#define OBJ_id_Gost28147_89_cc		OBJ_cryptocom,1L,6L,1L



#define SN_id_GostR3410_94_cc		"gost94cc"

#define LN_id_GostR3410_94_cc		"GOST 34.10-94 Cryptocom"

#define NID_id_GostR3410_94_cc		822

#define NID_id_GostR3410_94_cc		845

#define OBJ_id_GostR3410_94_cc		OBJ_cryptocom,1L,5L,3L



#define SN_id_GostR3410_2001_cc		"gost2001cc"

#define LN_id_GostR3410_2001_cc		"GOST 34.10-2001 Cryptocom"

#define NID_id_GostR3410_2001_cc		823

#define NID_id_GostR3410_2001_cc		846

#define OBJ_id_GostR3410_2001_cc		OBJ_cryptocom,1L,5L,4L



#define SN_id_GostR3411_94_with_GostR3410_94_cc		"id-GostR3411-94-with-GostR3410-94-cc"

#define LN_id_GostR3411_94_with_GostR3410_94_cc		"GOST R 34.11-94 with GOST R 34.10-94 Cryptocom"

#define NID_id_GostR3411_94_with_GostR3410_94_cc		824

#define NID_id_GostR3411_94_with_GostR3410_94_cc		847

#define OBJ_id_GostR3411_94_with_GostR3410_94_cc		OBJ_cryptocom,1L,3L,3L



#define SN_id_GostR3411_94_with_GostR3410_2001_cc		"id-GostR3411-94-with-GostR3410-2001-cc"

#define LN_id_GostR3411_94_with_GostR3410_2001_cc		"GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom"

#define NID_id_GostR3411_94_with_GostR3410_2001_cc		825

#define NID_id_GostR3411_94_with_GostR3410_2001_cc		848

#define OBJ_id_GostR3411_94_with_GostR3410_2001_cc		OBJ_cryptocom,1L,3L,4L



#define SN_id_GostR3410_2001_ParamSet_cc		"id-GostR3410-2001-ParamSet-cc"

#define LN_id_GostR3410_2001_ParamSet_cc		"GOST R 3410-2001 Parameter Set Cryptocom"

#define NID_id_GostR3410_2001_ParamSet_cc		826

#define NID_id_GostR3410_2001_ParamSet_cc		849

#define OBJ_id_GostR3410_2001_ParamSet_cc		OBJ_cryptocom,1L,8L,1L



#define SN_camellia_128_cbc		"CAMELLIA-128-CBC"
@@ -3706,30 +3711,30 @@ 


#define SN_kisa		"KISA"

#define LN_kisa		"kisa"

#define NID_kisa		837

#define NID_kisa		773

#define OBJ_kisa		OBJ_member_body,410L,200004L



#define SN_seed_ecb		"SEED-ECB"

#define LN_seed_ecb		"seed-ecb"

#define NID_seed_ecb		838

#define NID_seed_ecb		776

#define OBJ_seed_ecb		OBJ_kisa,1L,3L



#define SN_seed_cbc		"SEED-CBC"

#define LN_seed_cbc		"seed-cbc"

#define NID_seed_cbc		839

#define NID_seed_cbc		777

#define OBJ_seed_cbc		OBJ_kisa,1L,4L



#define SN_seed_cfb128		"SEED-CFB"

#define LN_seed_cfb128		"seed-cfb"

#define NID_seed_cfb128		840

#define NID_seed_cfb128		779

#define OBJ_seed_cfb128		OBJ_kisa,1L,5L



#define SN_seed_ofb128		"SEED-OFB"

#define LN_seed_ofb128		"seed-ofb"

#define NID_seed_ofb128		841

#define NID_seed_ofb128		778

#define OBJ_seed_ofb128		OBJ_kisa,1L,6L



#define SN_hmac		"HMAC"

#define LN_hmac		"hmac"

#define NID_hmac		836

#define NID_hmac		850

crypto/objects/obj_mac.num

+79 −79
Original line number Diff line number Diff line
@@ -769,82 +769,82 @@ camellia_256_ofb128 768 
subject_directory_attributes		769

issuing_distribution_point		770

certificate_issuer		771

hmacWithMD5		772

hmacWithSHA224		773

hmacWithSHA256		774

hmacWithSHA384		775

hmacWithSHA512		776

whirlpool		777

cryptopro		778

cryptocom		779

id_GostR3411_94_with_GostR3410_2001		780

id_GostR3411_94_with_GostR3410_94		781

id_GostR3411_94		782

id_HMACGostR3411_94		783

id_GostR3410_2001		784

id_GostR3410_94		785

id_Gost28147_89		786

id_Gost28147_89_MAC		787

id_GostR3411_94_prf		788

id_GostR3410_2001DH		789

id_GostR3410_94DH		790

id_Gost28147_89_CryptoPro_KeyMeshing		791

id_Gost28147_89_None_KeyMeshing		792

id_GostR3411_94_TestParamSet		793

id_GostR3411_94_CryptoProParamSet		794

id_Gost28147_89_TestParamSet		795

id_Gost28147_89_CryptoPro_A_ParamSet		796

id_Gost28147_89_CryptoPro_B_ParamSet		797

id_Gost28147_89_CryptoPro_C_ParamSet		798

id_Gost28147_89_CryptoPro_D_ParamSet		799

id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		800

id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		801

id_Gost28147_89_CryptoPro_RIC_1_ParamSet		802

id_GostR3410_94_TestParamSet		803

id_GostR3410_94_CryptoPro_A_ParamSet		804

id_GostR3410_94_CryptoPro_B_ParamSet		805

id_GostR3410_94_CryptoPro_C_ParamSet		806

id_GostR3410_94_CryptoPro_D_ParamSet		807

id_GostR3410_94_CryptoPro_XchA_ParamSet		808

id_GostR3410_94_CryptoPro_XchB_ParamSet		809

id_GostR3410_94_CryptoPro_XchC_ParamSet		810

id_GostR3410_2001_TestParamSet		811

id_GostR3410_2001_CryptoPro_A_ParamSet		812

id_GostR3410_2001_CryptoPro_B_ParamSet		813

id_GostR3410_2001_CryptoPro_C_ParamSet		814

id_GostR3410_2001_CryptoPro_XchA_ParamSet		815

id_GostR3410_2001_CryptoPro_XchB_ParamSet		816

id_GostR3410_94_a		817

id_GostR3410_94_aBis		818

id_GostR3410_94_b		819

id_GostR3410_94_bBis		820

id_Gost28147_89_cc		821

id_GostR3410_94_cc		822

id_GostR3410_2001_cc		823

id_GostR3411_94_with_GostR3410_94_cc		824

id_GostR3411_94_with_GostR3410_2001_cc		825

id_GostR3410_2001_ParamSet_cc		826

ecdsa_with_Recommended		827

ecdsa_with_Specified		828

ecdsa_with_SHA224		829

ecdsa_with_SHA256		830

ecdsa_with_SHA384		831

ecdsa_with_SHA512		832

dsa_with_SHA224		833

dsa_with_SHA256		834

gost89_cnt		835

hmac		836

kisa		837

seed_ecb		838

seed_cbc		839

seed_cfb128		840

seed_ofb128		841

id_Gost28147_89_MAC		842

id_Gost28147_89_MAC		843

hmac_md5		844

hmac_sha1		845

id_PasswordBasedMAC		846

id_DHBasedMac		847

id_Gost28147_89_MAC		848

id_it_suppLangTags		849

id_Gost28147_89_MAC					850
 
korea		772

kisa		773

kftc		774

npki_alg		775

seed_ecb		776

seed_cbc		777

seed_ofb128		778

seed_cfb128		779

hmac_md5		780

hmac_sha1		781

id_PasswordBasedMAC		782

id_DHBasedMac		783

id_it_suppLangTags		784

caRepository		785

ecdsa_with_Recommended		786

ecdsa_with_Specified		787

ecdsa_with_SHA224		788

ecdsa_with_SHA256		789

ecdsa_with_SHA384		790

ecdsa_with_SHA512		791

hmacWithMD5		792

hmacWithSHA224		793

hmacWithSHA256		794

hmacWithSHA384		795

hmacWithSHA512		796

dsa_with_SHA224		797

dsa_with_SHA256		798

whirlpool		799

cryptopro		800

cryptocom		801

id_GostR3411_94_with_GostR3410_2001		802

id_GostR3411_94_with_GostR3410_94		803

id_GostR3411_94		804

id_HMACGostR3411_94		805

id_GostR3410_2001		806

id_GostR3410_94		807

id_Gost28147_89		808

gost89_cnt		809

id_Gost28147_89_MAC					810

id_GostR3411_94_prf		811

id_GostR3410_2001DH		812

id_GostR3410_94DH		813

id_Gost28147_89_CryptoPro_KeyMeshing		814

id_Gost28147_89_None_KeyMeshing		815

id_GostR3411_94_TestParamSet		816

id_GostR3411_94_CryptoProParamSet		817

id_Gost28147_89_TestParamSet		818

id_Gost28147_89_CryptoPro_A_ParamSet		819

id_Gost28147_89_CryptoPro_B_ParamSet		820

id_Gost28147_89_CryptoPro_C_ParamSet		821

id_Gost28147_89_CryptoPro_D_ParamSet		822

id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		823

id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		824

id_Gost28147_89_CryptoPro_RIC_1_ParamSet		825

id_GostR3410_94_TestParamSet		826

id_GostR3410_94_CryptoPro_A_ParamSet		827

id_GostR3410_94_CryptoPro_B_ParamSet		828

id_GostR3410_94_CryptoPro_C_ParamSet		829

id_GostR3410_94_CryptoPro_D_ParamSet		830

id_GostR3410_94_CryptoPro_XchA_ParamSet		831

id_GostR3410_94_CryptoPro_XchB_ParamSet		832

id_GostR3410_94_CryptoPro_XchC_ParamSet		833

id_GostR3410_2001_TestParamSet		834

id_GostR3410_2001_CryptoPro_A_ParamSet		835

id_GostR3410_2001_CryptoPro_B_ParamSet		836

id_GostR3410_2001_CryptoPro_C_ParamSet		837

id_GostR3410_2001_CryptoPro_XchA_ParamSet		838

id_GostR3410_2001_CryptoPro_XchB_ParamSet		839

id_GostR3410_94_a		840

id_GostR3410_94_aBis		841

id_GostR3410_94_b		842

id_GostR3410_94_bBis		843

id_Gost28147_89_cc		844

id_GostR3410_94_cc		845

id_GostR3410_2001_cc		846

id_GostR3411_94_with_GostR3410_94_cc		847

id_GostR3411_94_with_GostR3410_2001_cc		848

id_GostR3410_2001_ParamSet_cc		849

hmac		850

crypto/objects/obj_xref.h

+13 −13
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ static const nid_triple sigoid_srt[] = 
	{NID_sha384WithRSAEncryption, NID_sha384, NID_rsaEncryption},

	{NID_sha512WithRSAEncryption, NID_sha512, NID_rsaEncryption},

	{NID_sha224WithRSAEncryption, NID_sha224, NID_rsaEncryption},

	{NID_id_GostR3411_94_with_GostR3410_2001, NID_id_GostR3411_94, NID_id_GostR3410_2001},

	{NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94, NID_id_GostR3410_94},

	{NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94, NID_id_GostR3410_94_cc},

	{NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94, NID_id_GostR3410_2001_cc},

	{NID_ecdsa_with_Recommended, NID_undef, NID_X9_62_id_ecPublicKey},

	{NID_ecdsa_with_Specified, NID_undef, NID_X9_62_id_ecPublicKey},

	{NID_ecdsa_with_SHA224, NID_sha224, NID_X9_62_id_ecPublicKey},
@@ -32,12 +28,16 @@ static const nid_triple sigoid_srt[] = 
	{NID_ecdsa_with_SHA512, NID_sha512, NID_X9_62_id_ecPublicKey},

	{NID_dsa_with_SHA224, NID_sha224, NID_dsa},

	{NID_dsa_with_SHA256, NID_sha256, NID_dsa},

	{NID_id_GostR3411_94_with_GostR3410_2001, NID_id_GostR3411_94, NID_id_GostR3410_2001},

	{NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94, NID_id_GostR3410_94},

	{NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94, NID_id_GostR3410_94_cc},

	{NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94, NID_id_GostR3410_2001_cc},

	};



static const nid_triple * const sigoid_srt_xref[] =

	{

	&sigoid_srt[21],

	&sigoid_srt[22],

	&sigoid_srt[17],

	&sigoid_srt[18],

	&sigoid_srt[0],

	&sigoid_srt[1],

	&sigoid_srt[7],
@@ -52,18 +52,18 @@ static const nid_triple * const sigoid_srt_xref[] = 
	&sigoid_srt[10],

	&sigoid_srt[11],

	&sigoid_srt[13],

	&sigoid_srt[28],

	&sigoid_srt[24],

	&sigoid_srt[20],

	&sigoid_srt[14],

	&sigoid_srt[25],

	&sigoid_srt[21],

	&sigoid_srt[15],

	&sigoid_srt[26],

	&sigoid_srt[22],

	&sigoid_srt[16],

	&sigoid_srt[27],

	&sigoid_srt[23],

	&sigoid_srt[17],

	&sigoid_srt[18],

	&sigoid_srt[19],

	&sigoid_srt[20],

	&sigoid_srt[25],

	&sigoid_srt[26],

	&sigoid_srt[27],

	&sigoid_srt[28],

	};

crypto/objects/objects.txt

+1 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ id-ad 2 : caIssuers : CA Issuers 
id-ad 3			: ad_timestamping	: AD Time Stamping

!Cname ad-dvcs

id-ad 4			: AD_DVCS		: ad dvcs

id-ad 5			: caRepository		: CA Respository





!Alias id-pkix-OCSP ad-OCSP