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 /providers | |
| parent | b78c016649d13c48429c132e56314117f8f3d9d7 (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 'providers')
| -rw-r--r-- | providers/implementations/kdfs/scrypt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c index 12c57bb1a4..2bbea0c7cc 100644 --- a/providers/implementations/kdfs/scrypt.c +++ b/providers/implementations/kdfs/scrypt.c @@ -493,15 +493,15 @@ static int scrypt_alg(const char *pass, size_t passlen, X = (uint32_t *)(B + Blen); T = X + 32 * r; V = T + 32 * r; - if (pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, 1, sha256, (int)Blen, - B, libctx, propq) == 0) + if (ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, 1, sha256, + (int)Blen, B, libctx, propq) == 0) goto err; for (i = 0; i < p; i++) scryptROMix(B + 128 * r * i, r, N, X, T, V); - if (pkcs5_pbkdf2_hmac_ex(pass, passlen, B, (int)Blen, 1, sha256, keylen, - key, libctx, propq) == 0) + if (ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, B, (int)Blen, 1, sha256, + keylen, key, libctx, propq) == 0) goto err; rv = 1; err: |