denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls-server: Also change DH group when selecting a different EC curve

Browse Source 
If we initially selected a group the peer doesn't support (e.g. because
curve25519 is the first ECDH group provided by plugins), then found
a supported curve, we previously still instantiated a DH object for the
original group and might have formatted the parameters incorrectly.
This commit is contained in:
Tobias Brunner
2023-11-06 11:00:51 +01:00
parent 595fa077b6
commit b5e4bf4b6c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtls/tls_server.c
+7 -4
View File
@@ -1483,20 +1483,23 @@ static status_t send_certificate_request(private_tls_server_t *this,
} }
/** /**
* Try to find a curve supported by both, client and server * Try to find a curve/group supported by both, client and server
*/ */
static bool find_supported_curve(private_tls_server_t *this, static bool find_supported_curve(private_tls_server_t *this,
tls_named_group_t *curve) tls_named_group_t *curve,
key_exchange_method_t *group)
{ {
tls_named_group_t current; tls_named_group_t current;
key_exchange_method_t current_group;
enumerator_t *enumerator; enumerator_t *enumerator;
enumerator = this->crypto->create_ec_enumerator(this->crypto); enumerator = this->crypto->create_ec_enumerator(this->crypto);
while (enumerator->enumerate(enumerator, NULL, &current)) while (enumerator->enumerate(enumerator, &current_group, &current))
{ {
if (peer_supports_curve(this, current)) if (peer_supports_curve(this, current))
{ {
*curve = current; *curve = current;
*group = current_group;
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
return TRUE; return TRUE;
} }
@@ -1520,7 +1523,7 @@ static status_t send_server_key_exchange(private_tls_server_t *this,
{ {
curve = tls_ec_group_to_curve(group); curve = tls_ec_group_to_curve(group);
if (!curve || (!peer_supports_curve(this, curve) && if (!curve || (!peer_supports_curve(this, curve) &&
!find_supported_curve(this, &curve))) !find_supported_curve(this, &curve, &group)))
{ {
DBG1(DBG_TLS, "no EC group supported by client and server"); DBG1(DBG_TLS, "no EC group supported by client and server");
this->alert->add(this->alert, TLS_FATAL, TLS_HANDSHAKE_FAILURE); this->alert->add(this->alert, TLS_FATAL, TLS_HANDSHAKE_FAILURE);