diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-01-24 20:37:09 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-01-26 15:51:50 +0100 |
| commit | ba0a6d1deb20d81bbf89b365c5c73879cbe0fae7 (patch) | |
| tree | f7eb202d844136c8f427c3eed9f5bc92d6be755d /crypto/rsa | |
| parent | 7b0f64b121860be91506906a2dc024e352b3d216 (diff) | |
| download | openssl-new-ba0a6d1deb20d81bbf89b365c5c73879cbe0fae7.tar.gz | |
Clean away unnecessary length related OSSL_PARAM key names
This cleans away old misunderstandings of what can be done with OSSL_PARAM.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13946)
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa_lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index f4e3ff423e..cdac22158d 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -1207,7 +1207,7 @@ int EVP_PKEY_CTX_set0_rsa_oaep_label(EVP_PKEY_CTX *ctx, void *label, int llen) int EVP_PKEY_CTX_get0_rsa_oaep_label(EVP_PKEY_CTX *ctx, unsigned char **label) { - OSSL_PARAM rsa_params[3], *p = rsa_params; + OSSL_PARAM rsa_params[2], *p = rsa_params; size_t labellen; if (ctx == NULL || !EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)) { @@ -1228,13 +1228,12 @@ int EVP_PKEY_CTX_get0_rsa_oaep_label(EVP_PKEY_CTX *ctx, unsigned char **label) *p++ = OSSL_PARAM_construct_octet_ptr(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, (void **)label, 0); - *p++ = OSSL_PARAM_construct_size_t(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL_LEN, - &labellen); *p++ = OSSL_PARAM_construct_end(); if (!EVP_PKEY_CTX_get_params(ctx, rsa_params)) return -1; + labellen = rsa_params[0].return_size; if (labellen > INT_MAX) return -1; |