diff options
| author | Pauli <paul.dale@oracle.com> | 2020-02-10 13:29:49 +1000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-02-21 13:04:25 +0100 |
| commit | 2ee0dfa684d5fbda5758136807e2732bd4f85139 (patch) | |
| tree | 5560e23cc1c6316981d61bc19a105cd54c198d5f /crypto/evp/pkey_kdf.c | |
| parent | 7b5108dff4cfde059ca278147a188fb6254603d1 (diff) | |
| download | openssl-2ee0dfa684d5fbda5758136807e2732bd4f85139.zip openssl-2ee0dfa684d5fbda5758136807e2732bd4f85139.tar.gz openssl-2ee0dfa684d5fbda5758136807e2732bd4f85139.tar.bz2 | |
Params: add argument to the _from_text calls to indicate if the param exists.
The extra argument is a integer pointer and is optional.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11049)
Diffstat (limited to 'crypto/evp/pkey_kdf.c')
| -rw-r--r-- | crypto/evp/pkey_kdf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/pkey_kdf.c b/crypto/evp/pkey_kdf.c index 818c89e..86c2fac 100644 --- a/crypto/evp/pkey_kdf.c +++ b/crypto/evp/pkey_kdf.c @@ -224,7 +224,7 @@ static int pkey_kdf_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, type = OSSL_KDF_PARAM_SCRYPT_N; if (!OSSL_PARAM_allocate_from_text(¶ms[0], defs, type, - value, strlen(value))) + value, strlen(value), NULL)) return 0; /* |