resolve conflicts

1 files changed, 115 insertions, 0 deletions

diff --git a/src/lib/libcrypto/objects/obj_mac.num b/src/lib/libcrypto/objects/obj_mac.num
index 84555d936e..47815b1e4e 100644
--- a/src/lib/libcrypto/objects/obj_mac.num
+++ b/src/lib/libcrypto/objects/obj_mac.num
@@ -673,3 +673,118 @@ sha256		672
 sha384          673
 sha512          674
 sha224          675
+identified_organization         676
+certicom_arc            677
+wap             678
+wap_wsg         679
+X9_62_id_characteristic_two_basis               680
+X9_62_onBasis           681
+X9_62_tpBasis           682
+X9_62_ppBasis           683
+X9_62_c2pnb163v1                684
+X9_62_c2pnb163v2                685
+X9_62_c2pnb163v3                686
+X9_62_c2pnb176v1                687
+X9_62_c2tnb191v1                688
+X9_62_c2tnb191v2                689
+X9_62_c2tnb191v3                690
+X9_62_c2onb191v4                691
+X9_62_c2onb191v5                692
+X9_62_c2pnb208w1                693
+X9_62_c2tnb239v1                694
+X9_62_c2tnb239v2                695
+X9_62_c2tnb239v3                696
+X9_62_c2onb239v4                697
+X9_62_c2onb239v5                698
+X9_62_c2pnb272w1                699
+X9_62_c2pnb304w1                700
+X9_62_c2tnb359v1                701
+X9_62_c2pnb368w1                702
+X9_62_c2tnb431r1                703
+secp112r1               704
+secp112r2               705
+secp128r1               706
+secp128r2               707
+secp160k1               708
+secp160r1               709
+secp160r2               710
+secp192k1               711
+secp224k1               712
+secp224r1               713
+secp256k1               714
+secp384r1               715
+secp521r1               716
+sect113r1               717
+sect113r2               718
+sect131r1               719
+sect131r2               720
+sect163k1               721
+sect163r1               722
+sect163r2               723
+sect193r1               724
+sect193r2               725
+sect233k1               726
+sect233r1               727
+sect239k1               728
+sect283k1               729
+sect283r1               730
+sect409k1               731
+sect409r1               732
+sect571k1               733
+sect571r1               734
+wap_wsg_idm_ecid_wtls1          735
+wap_wsg_idm_ecid_wtls3          736
+wap_wsg_idm_ecid_wtls4          737
+wap_wsg_idm_ecid_wtls5          738
+wap_wsg_idm_ecid_wtls6          739
+wap_wsg_idm_ecid_wtls7          740
+wap_wsg_idm_ecid_wtls8          741
+wap_wsg_idm_ecid_wtls9          742
+wap_wsg_idm_ecid_wtls10         743
+wap_wsg_idm_ecid_wtls11         744
+wap_wsg_idm_ecid_wtls12         745
+any_policy              746
+policy_mappings         747
+inhibit_any_policy              748
+ipsec3          749
+ipsec4          750
+camellia_128_cbc                751
+camellia_192_cbc                752
+camellia_256_cbc                753
+camellia_128_ecb                754
+camellia_192_ecb                755
+camellia_256_ecb                756
+camellia_128_cfb128             757
+camellia_192_cfb128             758
+camellia_256_cfb128             759
+camellia_128_cfb1               760
+camellia_192_cfb1               761
+camellia_256_cfb1               762
+camellia_128_cfb8               763
+camellia_192_cfb8               764
+camellia_256_cfb8               765
+camellia_128_ofb128             766
+camellia_192_ofb128             767
+camellia_256_ofb128             768
+subject_directory_attributes            769
+issuing_distribution_point              770
+certificate_issuer              771
+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
+id_smime_ct_compressedData              786
+id_ct_asciiTextWithCRLF         787
+id_aes128_wrap          788
+id_aes192_wrap          789
+id_aes256_wrap          790