TLS: improve handling of ALPN(s) (#1784)

Tell "Advertised" ALPN list from "Negotiated" ALPN; the former is
extracted from the CH, the latter from the SH.

Add some entries to the known ALPN list.

Fix printing of "TLS Supported Versions" field.
This commit is contained in:
Ivan Nardi
2022-10-25 17:06:29 +02:00
committed by GitHub
parent 2ed2e5dc7e
commit ca5ffc4988
99 changed files with 826 additions and 822 deletions
+5 -5
View File
@@ -1404,7 +1404,7 @@ struct ndpi_flow_struct {
} softether;
struct {
char *server_names, *alpn, *tls_supported_versions, *issuerDN, *subjectDN;
char *server_names, *advertised_alpns, *negotiated_alpn, *tls_supported_versions, *issuerDN, *subjectDN;
u_int32_t notBefore, notAfter;
char ja3_client[33], ja3_server[33];
u_int16_t server_cipher;
@@ -1578,11 +1578,11 @@ struct ndpi_flow_struct {
#if !defined(NDPI_CFFI_PREPROCESSING) && defined(__linux__)
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
_Static_assert(sizeof(((struct ndpi_flow_struct *)0)->protos) <= 200,
"Size of the struct member protocols increased to more than 200 bytes, "
_Static_assert(sizeof(((struct ndpi_flow_struct *)0)->protos) <= 208,
"Size of the struct member protocols increased to more than 208 bytes, "
"please check if this change is necessary.");
_Static_assert(sizeof(struct ndpi_flow_struct) <= 920,
"Size of the flow struct increased to more than 920 bytes, "
_Static_assert(sizeof(struct ndpi_flow_struct) <= 928,
"Size of the flow struct increased to more than 928 bytes, "
"please check if this change is necessary.");
#endif
#endif