diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
| commit | 426a154a830ca2d9bae74612741ff86332f5c66e (patch) | |
| tree | 7937e26cb4336f7a8bfd41a8238859a89e83e4b3 /lib/libcrypto/evp/evp_pbe.c | |
| parent | 1ab62f029308adf86f7a805afd722d5170be8c34 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/evp/evp_pbe.c')
| -rw-r--r-- | lib/libcrypto/evp/evp_pbe.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/libcrypto/evp/evp_pbe.c b/lib/libcrypto/evp/evp_pbe.c index c9d932d2053..f8c32d825e7 100644 --- a/lib/libcrypto/evp/evp_pbe.c +++ b/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, |