summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2021-03-09 14:44:51 +1000
committerShane Lontis <shane.lontis@oracle.com>2021-03-18 17:52:38 +1000
commit4e17fb006187c1b745eb72474efb3ad797e2a4dc (patch)
tree7c27066f73fd50565e52f777712b2409b6a0d562 /include
parentb78c016649d13c48429c132e56314117f8f3d9d7 (diff)
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')
-rw-r--r--include/crypto/evp.h9
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
/*