diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-24 10:42:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-01 09:25:20 +0100 |
| commit | d8652be06e2778e8898453a391deb7253e1a35a2 (patch) | |
| tree | fe40e22edb39642aa7ae633320c1900388f2e7ee /providers/implementations/kdfs/scrypt.c | |
| parent | aedac96c1172ca9a9efe72e027e935504b599e2f (diff) | |
Run the withlibctx.pl script
Automatically rename all instances of _with_libctx() to _ex() as per
our coding style.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)
Diffstat (limited to 'providers/implementations/kdfs/scrypt.c')
| -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 b4cebd0646..23d6f7b4ad 100644 --- a/providers/implementations/kdfs/scrypt.c +++ b/providers/implementations/kdfs/scrypt.c @@ -488,15 +488,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_with_libctx(pass, passlen, salt, saltlen, 1, sha256, - (int)Blen, B, libctx, propq) == 0) + if (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_with_libctx(pass, passlen, B, (int)Blen, 1, sha256, - keylen, key, libctx, propq) == 0) + if (pkcs5_pbkdf2_hmac_ex(pass, passlen, B, (int)Blen, 1, sha256, keylen, + key, libctx, propq) == 0) goto err; rv = 1; err: |