root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

EVP: constify the EVP_PKEY_get_*_param() argument |pkey| 

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13436)
This commit is contained in:
Richard Levitte 2020-12-04 06:30:28 +01:00
parent 8d4b5260d2
commit a73a189222
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/evp/p_lib.c
View File

@ -1963,7 +1963,7 @@ int evp_pkey_downgrade(EVP_PKEY *pk)
} }
#endif /* FIPS_MODULE */ #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 if (pkey == NULL
|| pkey->keymgmt == 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); 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; int ret = 0;
OSSL_PARAM params[2]; OSSL_PARAM params[2];
@ -2016,7 +2017,7 @@ err:
return ret; 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, unsigned char *buf, size_t max_buf_sz,
size_t *out_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; 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, char *str, size_t max_buf_sz,
size_t *out_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; 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]; 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; 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]; OSSL_PARAM params[2];

18
doc/man3/EVP_PKEY_gettable_params.pod
View File

@ -12,14 +12,18 @@ EVP_PKEY_get_octet_string_param
#include <openssl/evp.h> #include <openssl/evp.h>
const OSSL_PARAM *EVP_PKEY_gettable_params(EVP_PKEY *pkey); 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_int_param(const EVP_PKEY *pkey, const char *key_name,
int EVP_PKEY_get_size_t_param(EVP_PKEY *pkey, const char *key_name, size_t *out); int *out);
int EVP_PKEY_get_bn_param(EVP_PKEY *pkey, const char *key_name, BIGNUM **bn); int EVP_PKEY_get_size_t_param(const EVP_PKEY *pkey, const char *key_name,
int EVP_PKEY_get_utf8_string_param(EVP_PKEY *pkey, const char *key_name, size_t *out);
char *str, size_t max_buf_sz, size_t *out_sz); int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name,
int EVP_PKEY_get_octet_string_param(EVP_PKEY *pkey, const char *key_name, BIGNUM **bn);
unsigned char *buf, size_t max_buf_sz, 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); 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 =head1 DESCRIPTION

15
include/openssl/evp.h
View File

@ -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[]); 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_param_fromdata_settable(EVP_PKEY_CTX *ctx);
const OSSL_PARAM *EVP_PKEY_key_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); const OSSL_PARAM *EVP_PKEY_gettable_params(const EVP_PKEY *pkey);
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 EVP_PKEY_get_size_t_param(EVP_PKEY *pkey, const char *key_name, size_t *out); int *out);
int EVP_PKEY_get_bn_param(EVP_PKEY *pkey, const char *key_name, BIGNUM **bn); int EVP_PKEY_get_size_t_param(const EVP_PKEY *pkey, const char *key_name,
int EVP_PKEY_get_utf8_string_param(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); 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, unsigned char *buf, size_t max_buf_sz,
size_t *out_sz); size_t *out_sz);

2
ssl/t1_lib.c
View File

@ -3127,9 +3127,7 @@ static const SIGALG_LOOKUP *find_sig_alg(SSL *s, X509 *x, EVP_PKEY *pkey)
{ {
const SIGALG_LOOKUP *lu = NULL; const SIGALG_LOOKUP *lu = NULL;
size_t i; size_t i;
#ifndef OPENSSL_NO_EC
int curve = -1; int curve = -1;
#endif
EVP_PKEY *tmppkey; EVP_PKEY *tmppkey;
/* Look for a shared sigalgs matching possible certificates */ /* Look for a shared sigalgs matching possible certificates */