sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-03 00:00:24 -04:00
Code Issues Projects Releases Wiki Activity

openssl: Reject EC keys with explicitly encoded parameters

Browse Source 
EC_KEY_decoded_from_explicit_params() was added with 1.1.1h but has been
deprecated with 3.0.
This commit is contained in:
Tobias Brunner 2023-07-17 12:01:06 +02:00
parent a69184fb9d
commit 2bccdefc2c
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
View File

@ -62,6 +62,7 @@ struct private_openssl_ec_private_key_t {
/* from openssl_ec_public_key */
bool openssl_check_ec_key_curve(EVP_PKEY *key, int nid_curve);
bool openssl_check_explicit_params(EVP_PKEY *key);
/**
* Build a DER encoded signature as in RFC 3279
@ -474,8 +475,9 @@ openssl_ec_private_key_t *openssl_ec_private_key_load(key_type_t type,
blob.len);
}
if (!key)
if (!key || openssl_check_explicit_params(key))
{
EVP_PKEY_free(key);
return NULL;
}
this = create_internal(key);

23
src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
View File

@ -299,6 +299,26 @@ METHOD(public_key_t, destroy, void,
}
}
/**
* Check whether the EC key was decoded with explicit curve parameters instead
* of a named curve.
*/
bool openssl_check_explicit_params(const EVP_PKEY *key)
{
int explicit = 0;
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
if (!EVP_PKEY_get_int_param(key, OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
&explicit))
{
return FALSE;
}
#elif OPENSSL_VERSION_NUMBER >= 0x1010108fL
explicit = EC_KEY_decoded_from_explicit_params(EVP_PKEY_get0_EC_KEY((EVP_PKEY*)key));
#endif
return explicit == 1;
}
/**
* See header.
*/
@ -324,7 +344,8 @@ openssl_ec_public_key_t *openssl_ec_public_key_load(key_type_t type,
break;
}
key = d2i_PUBKEY(NULL, (const u_char**)&blob.ptr, blob.len);
if (!key || EVP_PKEY_base_id(key) != EVP_PKEY_EC)
if (!key || EVP_PKEY_base_id(key) != EVP_PKEY_EC ||
openssl_check_explicit_params(key))
{
EVP_PKEY_free(key);
return NULL;