DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

OpenSSL: Clean up EVP_PKEY_get{0,1}_EC_KEY() use

Browse source 
Use get1 whenever actually modifying the EC_KEY parameters and mark the
variable used with get0 const to be compatible with OpenSSL 3.0.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2022-01-11 12:20:12 +02:00 committed by Jouni Malinen
parent 384aa245ef
commit ddcdd62866
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/crypto/crypto_openssl.c
View file

@ -2474,12 +2474,13 @@ struct crypto_ec_key * crypto_ec_key_gen(int group)
goto fail; goto fail;
} }
eckey = EVP_PKEY_get0_EC_KEY(key); eckey = EVP_PKEY_get1_EC_KEY(key);
if (!eckey) { if (!eckey) {
key = NULL; key = NULL;
goto fail; goto fail;
} }
EC_KEY_set_conv_form(eckey, POINT_CONVERSION_COMPRESSED); EC_KEY_set_conv_form(eckey, POINT_CONVERSION_COMPRESSED);
EC_KEY_free(eckey);
fail: fail:
EC_KEY_free(ec_params); EC_KEY_free(ec_params);
@ -2589,12 +2590,17 @@ fail:
unsigned char *der = NULL; unsigned char *der = NULL;
int der_len; int der_len;
struct wpabuf *buf; struct wpabuf *buf;
EC_KEY *eckey;
eckey = EVP_PKEY_get1_EC_KEY((EVP_PKEY *) key);
if (!eckey)
return NULL;
/* For now, all users expect COMPRESSED form */ /* For now, all users expect COMPRESSED form */
EC_KEY_set_conv_form(EVP_PKEY_get0_EC_KEY((EVP_PKEY *) key), EC_KEY_set_conv_form(eckey, POINT_CONVERSION_COMPRESSED);
POINT_CONVERSION_COMPRESSED);
der_len = i2d_PUBKEY((EVP_PKEY *) key, &der); der_len = i2d_PUBKEY((EVP_PKEY *) key, &der);
EC_KEY_free(eckey);
if (der_len <= 0) { if (der_len <= 0) {
wpa_printf(MSG_INFO, "OpenSSL: i2d_PUBKEY() failed: %s", wpa_printf(MSG_INFO, "OpenSSL: i2d_PUBKEY() failed: %s",
ERR_error_string(ERR_get_error(), NULL)); ERR_error_string(ERR_get_error(), NULL));
@ -2617,7 +2623,7 @@ struct wpabuf * crypto_ec_key_get_ecprivate_key(struct crypto_ec_key *key,
struct wpabuf *buf; struct wpabuf *buf;
unsigned int key_flags; unsigned int key_flags;
eckey = EVP_PKEY_get0_EC_KEY((EVP_PKEY *) key); eckey = EVP_PKEY_get1_EC_KEY((EVP_PKEY *) key);
if (!eckey) if (!eckey)
return NULL; return NULL;
@ -2631,6 +2637,7 @@ struct wpabuf * crypto_ec_key_get_ecprivate_key(struct crypto_ec_key *key,
EC_KEY_set_conv_form(eckey, POINT_CONVERSION_UNCOMPRESSED); EC_KEY_set_conv_form(eckey, POINT_CONVERSION_UNCOMPRESSED);
der_len = i2d_ECPrivateKey(eckey, &der); der_len = i2d_ECPrivateKey(eckey, &der);
EC_KEY_free(eckey);
if (der_len <= 0) if (der_len <= 0)
return NULL; return NULL;
buf = wpabuf_alloc_copy(der, der_len); buf = wpabuf_alloc_copy(der, der_len);
@ -2691,7 +2698,7 @@ struct wpabuf * crypto_ec_key_get_pubkey_point(struct crypto_ec_key *key,
const struct crypto_ec_point * const struct crypto_ec_point *
crypto_ec_key_get_public_key(struct crypto_ec_key *key) crypto_ec_key_get_public_key(struct crypto_ec_key *key)
{ {
EC_KEY *eckey; const EC_KEY *eckey;
eckey = EVP_PKEY_get0_EC_KEY((EVP_PKEY *) key); eckey = EVP_PKEY_get0_EC_KEY((EVP_PKEY *) key);
if (!eckey) if (!eckey)
@ -2703,7 +2710,7 @@ crypto_ec_key_get_public_key(struct crypto_ec_key *key)
const struct crypto_bignum * const struct crypto_bignum *
crypto_ec_key_get_private_key(struct crypto_ec_key *key) crypto_ec_key_get_private_key(struct crypto_ec_key *key)
{ {
EC_KEY *eckey; const EC_KEY *eckey;
eckey = EVP_PKEY_get0_EC_KEY((EVP_PKEY *) key); eckey = EVP_PKEY_get0_EC_KEY((EVP_PKEY *) key);
if (!eckey) if (!eckey)