aboutsummaryrefslogtreecommitdiff
path: root/crypto/evp/p5_crpt.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-05-14 18:40:53 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-05-14 18:40:53 +0000
commit856640b54f3d22a34d6565e9c78c441a15222577 (patch)
tree35a38e34a4e988d6ef7f8d369a99297baedb3112 /crypto/evp/p5_crpt.c
parent76240b3a394c116a4307b7234ca57eea8e2d412d (diff)
downloadopenssl-856640b54f3d22a34d6565e9c78c441a15222577.zip
openssl-856640b54f3d22a34d6565e9c78c441a15222577.tar.gz
openssl-856640b54f3d22a34d6565e9c78c441a15222577.tar.bz2
Extend PBE code to support non default PKCS#5 v2.0 PRFs.
Diffstat (limited to 'crypto/evp/p5_crpt.c')
-rw-r--r--crypto/evp/p5_crpt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c
index 48d5001..185a153 100644
--- a/crypto/evp/p5_crpt.c
+++ b/crypto/evp/p5_crpt.c
@@ -97,6 +97,7 @@ EVP_PBE_alg_add(NID_pbeWithSHA1AndRC2_CBC, EVP_rc2_64_cbc(), EVP_sha1(),
#endif
#ifndef OPENSSL_NO_HMAC
EVP_PBE_alg_add(NID_pbes2, NULL, NULL, PKCS5_v2_PBE_keyivgen);
+EVP_PBE_alg_add_type(EVP_PBE_TYPE_PRF, NID_hmacWithSHA1, -1, NID_sha1, 0);
#endif
}