resolve conflicts, fix local changes

1 files changed, 2 insertions, 3 deletions

diff --git a/src/lib/libcrypto/evp/c_allc.c b/src/lib/libcrypto/evp/c_allc.c
index 7054d8125d..c5f9268378 100644
--- a/src/lib/libcrypto/evp/c_allc.c
+++ b/src/lib/libcrypto/evp/c_allc.c
@@ -71,6 +71,8 @@ void OpenSSL_add_all_ciphers(void)
         EVP_add_cipher(EVP_des_cfb8());
         EVP_add_cipher(EVP_des_ede_cfb());
         EVP_add_cipher(EVP_des_ede3_cfb());
+        EVP_add_cipher(EVP_des_ede3_cfb1());
+        EVP_add_cipher(EVP_des_ede3_cfb8());
 
         EVP_add_cipher(EVP_des_ofb());
         EVP_add_cipher(EVP_des_ede_ofb());
@@ -219,7 +221,4 @@ void OpenSSL_add_all_ciphers(void)
         EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");
         EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");
 #endif
-
-        PKCS12_PBE_add();
-        PKCS5_PBE_add();
         }