diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-26 01:08:45 +0100 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-28 08:25:49 +0100 |
| commit | 36fae6e85a12c46b48d82762911c74e53ec0cc13 (patch) | |
| tree | c7807d0bb33d82ee69931bc54f3ab9c7cd2f790e /crypto/pkcs12 | |
| parent | apps: add addition argument to KDF derive call (diff) | |
| download | openssl-36fae6e85a12c46b48d82762911c74e53ec0cc13.tar.xz openssl-36fae6e85a12c46b48d82762911c74e53ec0cc13.zip | |
crypto: add additional argument to KDF derive calls
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index 7c4056a8f8..8c7be88cd2 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -105,7 +105,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, BIO_printf(trc_out, "\n"); } OSSL_TRACE_END(PKCS12_KEYGEN); - if (EVP_KDF_derive(ctx, out, (size_t)n)) { + if (EVP_KDF_derive(ctx, out, (size_t)n, NULL)) { res = 1; OSSL_TRACE_BEGIN(PKCS12_KEYGEN) { BIO_printf(trc_out, "Output KEY (length %d)\n", n); |