resolve conflicts

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index c9d932d205..f8c32d825e 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -61,6 +61,7 @@
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 #include <openssl/x509.h>
+#include "evp_locl.h"
 
 /* Password based encryption (PBE) functions */
 
@@ -87,6 +88,10 @@ static const EVP_PBE_CTL builtin_pbe[] =
         {EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndRC2_CBC,
                         NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen},
 
+#ifndef OPENSSL_NO_HMAC
+        {EVP_PBE_TYPE_OUTER, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen},
+#endif
+
         {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC4,
                         NID_rc4, NID_sha1, PKCS12_PBE_keyivgen},
         {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC4,