abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-29 01:03:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update TLS 1.2 renegotiation_info

Browse Source
This commit is contained in:
Zhi Guan
2026-06-20 16:47:56 +08:00
parent c47ae26730
commit 0f2f35ab97
9 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tls12.c
View File

@@ -2181,7 +2181,7 @@ int tls_recv_client_hello(TLS_CONNECT *conn)
}
}
// RFC 5746 signaling is supported for the initial handshake only.
if (renegotiation_info || empty_renegotiation_info_scsv) {
if (conn->ctx->renegotiation_info && (renegotiation_info || empty_renegotiation_info_scsv)) {
conn->secure_renegotiation = 1;
}

26
src/tls_trace.c
View File

@@ -477,6 +477,26 @@ int tls_pre_master_secret_print(FILE *fp, const uint8_t pre_master_secret[48], i
return 1;
}
int tls_renegotiation_info_print(FILE *fp, int fmt, int ind,
const uint8_t *ext_data, size_t ext_datalen)
{
const uint8_t *renegotiated_connection;
size_t renegotiated_connection_len;
if (tls_uint8array_from_bytes(&renegotiated_connection, &renegotiated_connection_len, &ext_data, &ext_datalen) != 1
|| tls_length_is_zero(ext_datalen) != 1) {
error_print();
return -1;
}
if (renegotiated_connection_len) {
format_bytes(fp, fmt, ind, "renegotiated_connection",
renegotiated_connection, renegotiated_connection_len);
} else {
format_print(fp, fmt, ind, "renegotiated_connection: (empty)\n");
}
return 1;
}
/*
* SupportedVersions Extension (only defined in TLS 1.3)
*
@@ -575,6 +595,12 @@ int tls_extension_print(FILE *fp, int fmt, int ind, int handshake_type, int type
return -1;
}
break;
case TLS_extension_renegotiation_info:
if (tls_renegotiation_info_print(fp, fmt, ind, data, datalen) != 1) {
error_print();
return -1;
}
break;
case TLS_extension_signature_algorithms:
if (tls_uint16array_from_bytes(&p, &len, &data, &datalen) != 1
|| datalen