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

OpenSSL 3.0: Implement crypto_ec_key_group() with new API

Browse source 
Get rid of the now deprecated EVP_PKEY_get0_EC_KEY() and
EC_KEY_get0_group() calls.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2022-03-12 22:27:16 +02:00
parent 7c8fcd6baf
commit e2cb0ca1ac
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/crypto/crypto_openssl.c
View file

@ -2893,6 +2893,15 @@ fail:
int crypto_ec_key_group(struct crypto_ec_key *key) int crypto_ec_key_group(struct crypto_ec_key *key)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
char gname[50];
int nid;
if (EVP_PKEY_get_group_name((EVP_PKEY *) key, gname, sizeof(gname),
NULL) != 1)
return -1;
nid = OBJ_txt2nid(gname);
#else
const EC_KEY *eckey; const EC_KEY *eckey;
const EC_GROUP *group; const EC_GROUP *group;
int nid; int nid;
@ -2904,6 +2913,7 @@ int crypto_ec_key_group(struct crypto_ec_key *key)
if (!group) if (!group)
return -1; return -1;
nid = EC_GROUP_get_curve_name(group); nid = EC_GROUP_get_curve_name(group);
#endif
switch (nid) { switch (nid) {
case NID_X9_62_prime256v1: case NID_X9_62_prime256v1:
return 19; return 19;