adulau/ssldump
1
0
Fork 0
mirror of https://github.com/adulau/ssldump.git synced 2024-12-04 07:17:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #111 from 1div0/ECH

Browse source 
ECH
This commit is contained in:
Alexandre Dulaunoy 2024-08-21 14:11:46 +02:00 committed by GitHub
commit d70855020e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ssl/ssl.enums.c
View file

@ -244,7 +244,7 @@ static int decode_HandshakeType_ClientHello(ssl_obj *ssl,
SSL_DECODE_UINT16(ssl, "extensions len", 0, data, &exlen); SSL_DECODE_UINT16(ssl, "extensions len", 0, data, &exlen);
if(exlen) { if(exlen) {
explain(ssl, "extensions\n"); explain(ssl, "extensions\n");
while(data->len) { while(data->len > 0) {
SSL_DECODE_UINT16(ssl, "extension type", 0, data, &ex); SSL_DECODE_UINT16(ssl, "extension type", 0, data, &ex);
if(!ja3_ex_str) if(!ja3_ex_str)
ja3_ex_str = calloc(7, 1); ja3_ex_str = calloc(7, 1);
@ -1714,6 +1714,7 @@ decoder extension_decoder[] = {
{55, "external_id_hash", decode_extension}, {55, "external_id_hash", decode_extension},
{56, "external_session_id", decode_extension}, {56, "external_session_id", decode_extension},
{13172, "next_protocol_negotiation", decode_extension}, {13172, "next_protocol_negotiation", decode_extension},
{0xfe0d, "encrypted_client_hello", decode_extension},
{0xff01, "renegotiation_info", decode_extension}, {0xff01, "renegotiation_info", decode_extension},
{-1}}; {-1}};

2
ssl/ssldecode.c
View file

@ -555,6 +555,7 @@ int ssl_restore_session(ssl_obj *ssl, ssl_decoder *d) {
case TLSV1_VERSION: case TLSV1_VERSION:
case TLSV11_VERSION: case TLSV11_VERSION:
case TLSV12_VERSION: case TLSV12_VERSION:
case TLSV13_VERSION:
if((r = ssl_generate_keying_material(ssl, d))) if((r = ssl_generate_keying_material(ssl, d)))
ABORT(r); ABORT(r);
break; break;
@ -655,6 +656,7 @@ int ssl_process_client_key_exchange(ssl_obj *ssl,
case TLSV1_VERSION: case TLSV1_VERSION:
case TLSV11_VERSION: case TLSV11_VERSION:
case TLSV12_VERSION: case TLSV12_VERSION:
case TLSV13_VERSION:
if((r = ssl_generate_keying_material(ssl, d))) if((r = ssl_generate_keying_material(ssl, d)))
ABORT(r); ABORT(r);
break; break;