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 /crypto/evp/p5_crpt2.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 'crypto/evp/p5_crpt2.c')
| -rw-r--r-- | crypto/evp/p5_crpt2.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index 7b8f99d511..b827899445 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -19,11 +19,10 @@ #include "crypto/evp.h" #include "evp_local.h" -int pkcs5_pbkdf2_hmac_with_libctx(const char *pass, int passlen, - const unsigned char *salt, int saltlen, - int iter, const EVP_MD *digest, int keylen, - unsigned char *out, - OPENSSL_CTX *libctx, const char *propq) +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, + OPENSSL_CTX *libctx, const char *propq) { const char *empty = ""; int rv = 1, mode = 1; @@ -84,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_with_libctx(pass, passlen, salt, saltlen, iter, - digest, keylen, out, NULL, NULL); + return pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, digest, + keylen, out, NULL, NULL); } |