diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 14:44:51 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:38 +1000 |
| commit | 4e17fb006187c1b745eb72474efb3ad797e2a4dc (patch) | |
| tree | 7c27066f73fd50565e52f777712b2409b6a0d562 /crypto/evp/p5_crpt2.c | |
| parent | b78c016649d13c48429c132e56314117f8f3d9d7 (diff) | |
| download | openssl-new-4e17fb006187c1b745eb72474efb3ad797e2a4dc.tar.gz | |
Add ossl_pkcs5_pbkdf2_hmac_ex symbol
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/evp/p5_crpt2.c')
| -rw-r--r-- | crypto/evp/p5_crpt2.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index d55199cccf..183c1f6074 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -19,10 +19,11 @@ #include "crypto/evp.h" #include "evp_local.h" -int pkcs5_pbkdf2_hmac_ex(const char *pass, int passlen, - const unsigned char *salt, int saltlen, int iter, - const EVP_MD *digest, int keylen, unsigned char *out, - OSSL_LIB_CTX *libctx, const char *propq) +int ossl_pkcs5_pbkdf2_hmac_ex(const char *pass, int passlen, + const unsigned char *salt, int saltlen, int iter, + const EVP_MD *digest, int keylen, + unsigned char *out, + OSSL_LIB_CTX *libctx, const char *propq) { const char *empty = ""; int rv = 1, mode = 1; @@ -82,8 +83,8 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, const EVP_MD *digest, int keylen, unsigned char *out) { - return pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, digest, - keylen, out, NULL, NULL); + return ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, digest, + keylen, out, NULL, NULL); } |