mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: ssl: capture the supported_versions extension from Client Hello

Browse Source 
Activate the capture of the TLS supported_versions extension from the
Client Hello. This list is stored in the ssl_capture buffer when the
global option "tune.ssl.capture-cipherlist-size" is enabled.
This commit is contained in:
William Lallemand 2024-08-23 17:35:10 +02:00
parent 3c0a0f1e1b
commit ce7fb6628e
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/ssl_sock-t.h
View File

@ -219,6 +219,8 @@ struct ssl_capture {
uint ec_offset; uint ec_offset;
uint ec_formats_offset; uint ec_formats_offset;
uchar ec_formats_len; uchar ec_formats_len;
uchar supver_len;
uint supver_offset;
char data[VAR_ARRAY]; char data[VAR_ARRAY];
}; };

25
src/ssl_sock.c
View File

@ -1598,6 +1598,8 @@ static void ssl_sock_parse_clienthello(struct connection *conn, int write_p, int
uchar *extensions_end; uchar *extensions_end;
uchar *ec_start = NULL; uchar *ec_start = NULL;
uchar *ec_formats_start = NULL; uchar *ec_formats_start = NULL;
uchar *supver_start = NULL; /* supported_versions */
uchar supver_len = 0; /* supported_versions len */
uchar *list_end; uchar *list_end;
ushort protocol_version; ushort protocol_version;
ushort extension_id; ushort extension_id;
@ -1789,6 +1791,19 @@ static void ssl_sock_parse_clienthello(struct connection *conn, int write_p, int
ec_formats_start = msg; ec_formats_start = msg;
ec_formats_len = rec_len; ec_formats_len = rec_len;
break; break;
case 43:
/* supported_versions(43)
* https://datatracker.ietf.org/doc/html/rfc8446#section-4.2.1 */
if (msg + 1 > list_end)
goto store_capture;
rec_len = msg[0];
msg += 1;
if (msg + rec_len > list_end || msg + rec_len < msg)
goto store_capture;
/* Store location/size of the list */
supver_start = msg;
supver_len = rec_len;
break;
default: default:
break; break;
} }
@ -1813,6 +1828,16 @@ static void ssl_sock_parse_clienthello(struct connection *conn, int write_p, int
capture->ec_formats_len = rec_len; capture->ec_formats_len = rec_len;
offset += rec_len; offset += rec_len;
} }
if (supver_start) {
rec_len = supver_len;
if (offset + rec_len > global_ssl.capture_buffer_size)
rec_len = global_ssl.capture_buffer_size - offset;
memcpy(capture->data + offset, supver_start, rec_len);
capture->supver_offset = offset;
capture->supver_len = rec_len;
offset += rec_len;
}
store_capture: store_capture:
SSL_set_ex_data(ssl, ssl_capture_ptr_index, capture); SSL_set_ex_data(ssl, ssl_capture_ptr_index, capture);