sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-25 16:21:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

[tls] Refuse to resume sessions with mismatched master secret methods

Browse Source 
RFC 7627 section 5.3 states that the client must abort the handshake
if the server attempts to resume a session where the master secret
calculation method stored in the session does not match the method
used for the connection being resumed.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-10-12 22:29:33 +01:00
parent ab64bc5b8d
commit 57504353fe
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/ipxe/tls.h
View File

@@ -353,6 +353,8 @@ struct tls_session {
size_t ticket_len; size_t ticket_len;
/** Master secret */ /** Master secret */
uint8_t master_secret[48]; uint8_t master_secret[48];
/** Extended master secret flag */
int extended_master_secret;
/** List of connections */ /** List of connections */
struct list_head conn; struct list_head conn;

13
src/net/tls.c
View File

@@ -183,6 +183,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define EINFO_EPERM_KEY_EXCHANGE \ #define EINFO_EPERM_KEY_EXCHANGE \
__einfo_uniqify ( EINFO_EPERM, 0x06, \ __einfo_uniqify ( EINFO_EPERM, 0x06, \
"ServerKeyExchange verification failed" ) "ServerKeyExchange verification failed" )
#define EPERM_EMS __einfo_error ( EINFO_EPERM_EMS )
#define EINFO_EPERM_EMS \
__einfo_uniqify ( EINFO_EPERM, 0x07, \
"Extended master secret extension mismatch" )
#define EPROTO_VERSION __einfo_error ( EINFO_EPROTO_VERSION ) #define EPROTO_VERSION __einfo_error ( EINFO_EPROTO_VERSION )
#define EINFO_EPROTO_VERSION \ #define EINFO_EPROTO_VERSION \
__einfo_uniqify ( EINFO_EPROTO, 0x01, \ __einfo_uniqify ( EINFO_EPROTO, 0x01, \
@@ -2243,6 +2247,14 @@ static int tls_new_server_hello ( struct tls_connection *tls,
if ( ( rc = tls_generate_keys ( tls ) ) != 0 ) if ( ( rc = tls_generate_keys ( tls ) ) != 0 )
return rc; return rc;
/* Ensure master secret generation method matches */
if ( tls->extended_master_secret !=
tls->session->extended_master_secret ) {
DBGC ( tls, "TLS %p mismatched extended master secret "
"extension\n", tls );
return -EPERM_EMS;
}
} else { } else {
/* Record new session ID, if present */ /* Record new session ID, if present */
@@ -2635,6 +2647,7 @@ static int tls_new_finished ( struct tls_connection *tls,
if ( tls->session_id_len || tls->new_session_ticket_len ) { if ( tls->session_id_len || tls->new_session_ticket_len ) {
memcpy ( session->master_secret, tls->master_secret, memcpy ( session->master_secret, tls->master_secret,
sizeof ( session->master_secret ) ); sizeof ( session->master_secret ) );
session->extended_master_secret = tls->extended_master_secret;
} }
if ( tls->session_id_len ) { if ( tls->session_id_len ) {
session->id_len = tls->session_id_len; session->id_len = tls->session_id_len;