diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 05:44:51 +0100 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 08:52:38 +0100 |
| commit | 4e17fb006187c1b745eb72474efb3ad797e2a4dc (patch) | |
| tree | 7c27066f73fd50565e52f777712b2409b6a0d562 /include/crypto/evp.h | |
| parent | Add ossl_pem_check_suffix symbol (diff) | |
| download | openssl-4e17fb006187c1b745eb72474efb3ad797e2a4dc.tar.xz openssl-4e17fb006187c1b745eb72474efb3ad797e2a4dc.zip | |
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 'include/crypto/evp.h')
| -rw-r--r-- | include/crypto/evp.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 5dd0db3bae..751b330b43 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -828,10 +828,11 @@ const EVP_CIPHER *evp_get_cipherbyname_ex(OSSL_LIB_CTX *libctx, const EVP_MD *evp_get_digestbyname_ex(OSSL_LIB_CTX *libctx, const char *name); -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); # ifndef FIPS_MODULE /* |