resolve conflicts

1 files changed, 27 insertions, 0 deletions

diff --git a/src/lib/libcrypto/objects/obj_mac.num b/src/lib/libcrypto/objects/obj_mac.num
index 8c50aac27f..1d0a7c802d 100644
--- a/src/lib/libcrypto/objects/obj_mac.num
+++ b/src/lib/libcrypto/objects/obj_mac.num
@@ -890,3 +890,30 @@ houseIdentifier		889
 supportedAlgorithms             890
 deltaRevocationList             891
 dmdName         892
+id_alg_PWRI_KEK         893
+cmac            894
+aes_128_gcm             895
+aes_128_ccm             896
+id_aes128_wrap_pad              897
+aes_192_gcm             898
+aes_192_ccm             899
+id_aes192_wrap_pad              900
+aes_256_gcm             901
+aes_256_ccm             902
+id_aes256_wrap_pad              903
+aes_128_ctr             904
+aes_192_ctr             905
+aes_256_ctr             906
+id_camellia128_wrap             907
+id_camellia192_wrap             908
+id_camellia256_wrap             909
+anyExtendedKeyUsage             910
+mgf1            911
+rsassaPss               912
+aes_128_xts             913
+aes_256_xts             914
+rc4_hmac_md5            915
+aes_128_cbc_hmac_sha1           916
+aes_192_cbc_hmac_sha1           917
+aes_256_cbc_hmac_sha1           918
+rsaesOaep               919