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

tls-peer: Verify server selects the same cipher suite after HelloRetryRequest

Browse Source 
This is as per RFC 8446, section 4.1.4.
This commit is contained in:
Tobias Brunner
2021-02-12 14:35:23 +01:00
parent ab226b3927
commit 3abcbf82b5
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtls/tls_peer.c
+14
View File
@@ -132,6 +132,11 @@ struct private_tls_peer_t {
*/ */
tls_named_group_t requested_curve; tls_named_group_t requested_curve;
/**
* Original cipher suite in HelloRetryRequest
*/
tls_cipher_suite_t original_suite;
/** /**
* Cookie extension received in HelloRetryRequest * Cookie extension received in HelloRetryRequest
*/ */
@@ -342,6 +347,14 @@ static status_t process_server_hello(private_tls_peer_t *this,
this->alert->add(this->alert, TLS_FATAL, TLS_HANDSHAKE_FAILURE); this->alert->add(this->alert, TLS_FATAL, TLS_HANDSHAKE_FAILURE);
return NEED_MORE; return NEED_MORE;
} }
if (this->original_suite && this->original_suite != suite)
{
DBG1(DBG_TLS, "server selected %N instead of %N after retry",
tls_cipher_suite_names, suite, tls_cipher_suite_names,
this->original_suite);
this->alert->add(this->alert, TLS_FATAL, TLS_ILLEGAL_PARAMETER);
return NEED_MORE;
}
DBG1(DBG_TLS, "negotiated %N using suite %N", DBG1(DBG_TLS, "negotiated %N using suite %N",
tls_version_names, version, tls_cipher_suite_names, suite); tls_version_names, version, tls_cipher_suite_names, suite);
free(this->session.ptr); free(this->session.ptr);
@@ -390,6 +403,7 @@ static status_t process_server_hello(private_tls_peer_t *this,
DESTROY_IF(this->dh); DESTROY_IF(this->dh);
this->dh = NULL; this->dh = NULL;
this->original_suite = suite;
this->requested_curve = key_type; this->requested_curve = key_type;
this->cookie = chunk_clone(cookie); this->cookie = chunk_clone(cookie);
this->state = STATE_INIT; this->state = STATE_INIT;