From a73a1892221e04ddb8ff9ec85ebaa48b5a853de6 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 4 Dec 2020 06:30:28 +0100 Subject: [PATCH] EVP: constify the EVP_PKEY_get_*_param() argument |pkey| Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13436) --- crypto/evp/p_lib.c | 15 +++++++++------ doc/man3/EVP_PKEY_gettable_params.pod | 18 +++++++++++------- include/openssl/evp.h | 15 +++++++++------ ssl/t1_lib.c | 2 -- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index f1eb859cef..af14706939 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -1963,7 +1963,7 @@ int evp_pkey_downgrade(EVP_PKEY *pk) } #endif /* FIPS_MODULE */ -const OSSL_PARAM *EVP_PKEY_gettable_params(EVP_PKEY *pkey) +const OSSL_PARAM *EVP_PKEY_gettable_params(const EVP_PKEY *pkey) { if (pkey == NULL || pkey->keymgmt == NULL @@ -1972,7 +1972,8 @@ const OSSL_PARAM *EVP_PKEY_gettable_params(EVP_PKEY *pkey) return EVP_KEYMGMT_gettable_params(pkey->keymgmt); } -int EVP_PKEY_get_bn_param(EVP_PKEY *pkey, const char *key_name, BIGNUM **bn) +int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name, + BIGNUM **bn) { int ret = 0; OSSL_PARAM params[2]; @@ -2016,7 +2017,7 @@ err: return ret; } -int EVP_PKEY_get_octet_string_param(EVP_PKEY *pkey, const char *key_name, +int EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey, const char *key_name, unsigned char *buf, size_t max_buf_sz, size_t *out_sz) { @@ -2038,7 +2039,7 @@ int EVP_PKEY_get_octet_string_param(EVP_PKEY *pkey, const char *key_name, return 1; } -int EVP_PKEY_get_utf8_string_param(EVP_PKEY *pkey, const char *key_name, +int EVP_PKEY_get_utf8_string_param(const EVP_PKEY *pkey, const char *key_name, char *str, size_t max_buf_sz, size_t *out_sz) { @@ -2060,7 +2061,8 @@ int EVP_PKEY_get_utf8_string_param(EVP_PKEY *pkey, const char *key_name, return 1; } -int EVP_PKEY_get_int_param(EVP_PKEY *pkey, const char *key_name, int *out) +int EVP_PKEY_get_int_param(const EVP_PKEY *pkey, const char *key_name, + int *out) { OSSL_PARAM params[2]; @@ -2078,7 +2080,8 @@ int EVP_PKEY_get_int_param(EVP_PKEY *pkey, const char *key_name, int *out) return 1; } -int EVP_PKEY_get_size_t_param(EVP_PKEY *pkey, const char *key_name, size_t *out) +int EVP_PKEY_get_size_t_param(const EVP_PKEY *pkey, const char *key_name, + size_t *out) { OSSL_PARAM params[2]; diff --git a/doc/man3/EVP_PKEY_gettable_params.pod b/doc/man3/EVP_PKEY_gettable_params.pod index 8f6854a568..8b176f0819 100644 --- a/doc/man3/EVP_PKEY_gettable_params.pod +++ b/doc/man3/EVP_PKEY_gettable_params.pod @@ -12,14 +12,18 @@ EVP_PKEY_get_octet_string_param #include const OSSL_PARAM *EVP_PKEY_gettable_params(EVP_PKEY *pkey); - int EVP_PKEY_get_int_param(EVP_PKEY *pkey, const char *key_name, int *out); - int EVP_PKEY_get_size_t_param(EVP_PKEY *pkey, const char *key_name, size_t *out); - int EVP_PKEY_get_bn_param(EVP_PKEY *pkey, const char *key_name, BIGNUM **bn); - int EVP_PKEY_get_utf8_string_param(EVP_PKEY *pkey, const char *key_name, - char *str, size_t max_buf_sz, size_t *out_sz); - int EVP_PKEY_get_octet_string_param(EVP_PKEY *pkey, const char *key_name, - unsigned char *buf, size_t max_buf_sz, + int EVP_PKEY_get_int_param(const EVP_PKEY *pkey, const char *key_name, + int *out); + int EVP_PKEY_get_size_t_param(const EVP_PKEY *pkey, const char *key_name, + size_t *out); + int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name, + BIGNUM **bn); + int EVP_PKEY_get_utf8_string_param(const EVP_PKEY *pkey, const char *key_name, + char *str, size_t max_buf_sz, size_t *out_sz); + int EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey, const char *key_name, + unsigned char *buf, size_t max_buf_sz, + size_t *out_sz); =head1 DESCRIPTION diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 01708b6cbf..28b6f4f399 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1788,13 +1788,16 @@ int EVP_PKEY_key_fromdata_init(EVP_PKEY_CTX *ctx); int EVP_PKEY_fromdata(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey, OSSL_PARAM param[]); const OSSL_PARAM *EVP_PKEY_param_fromdata_settable(EVP_PKEY_CTX *ctx); const OSSL_PARAM *EVP_PKEY_key_fromdata_settable(EVP_PKEY_CTX *ctx); -const OSSL_PARAM *EVP_PKEY_gettable_params(EVP_PKEY *pkey); -int EVP_PKEY_get_int_param(EVP_PKEY *pkey, const char *key_name, int *out); -int EVP_PKEY_get_size_t_param(EVP_PKEY *pkey, const char *key_name, size_t *out); -int EVP_PKEY_get_bn_param(EVP_PKEY *pkey, const char *key_name, BIGNUM **bn); -int EVP_PKEY_get_utf8_string_param(EVP_PKEY *pkey, const char *key_name, +const OSSL_PARAM *EVP_PKEY_gettable_params(const EVP_PKEY *pkey); +int EVP_PKEY_get_int_param(const EVP_PKEY *pkey, const char *key_name, + int *out); +int EVP_PKEY_get_size_t_param(const EVP_PKEY *pkey, const char *key_name, + size_t *out); +int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name, + BIGNUM **bn); +int EVP_PKEY_get_utf8_string_param(const EVP_PKEY *pkey, const char *key_name, char *str, size_t max_buf_sz, size_t *out_sz); -int EVP_PKEY_get_octet_string_param(EVP_PKEY *pkey, const char *key_name, +int EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey, const char *key_name, unsigned char *buf, size_t max_buf_sz, size_t *out_sz); diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index d88b460c7b..6ad6f1b26f 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -3127,9 +3127,7 @@ static const SIGALG_LOOKUP *find_sig_alg(SSL *s, X509 *x, EVP_PKEY *pkey) { const SIGALG_LOOKUP *lu = NULL; size_t i; -#ifndef OPENSSL_NO_EC int curve = -1; -#endif EVP_PKEY *tmppkey; /* Look for a shared sigalgs matching possible certificates */ -- 2.39.2