Fix from stable branch.

[openssl.git] / crypto / objects / obj_mac.num

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 1a200207ffa3849e82108eb3f9f3749ac6e98693..796de154454644a613e5c997a00544e706624de3 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -769,66 +769,83 @@ 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
+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
+id_Gost28147_89_MAC                                    851