TLS: avoid useless extra dissection (#1690)

If we have seen Application Data blocks in both directions, it means we
are after the handshake. At that point, extra dissection is useless.

Useful feature with TLS mid-sessions, i.e. sessions without initial
packets.
This commit is contained in:
Ivan Nardi
2022-07-31 16:57:17 +02:00
committed by GitHub
parent 2a596c79e6
commit 013212c67c
21 changed files with 35 additions and 28 deletions
+1
View File
@@ -709,6 +709,7 @@ struct ndpi_flow_tcp_struct {
/* NDPI_PROTOCOL_TLS */
u_int8_t certificate_processed:1, fingerprint_set:1, _pad:6;
u_int8_t app_data_seen[2];
u_int8_t num_tls_blocks;
int16_t tls_application_blocks_len[NDPI_MAX_NUM_TLS_APPL_BLOCKS]; /* + = src->dst, - = dst->src */
} tls;
+6
View File
@@ -1052,6 +1052,12 @@ static int ndpi_search_tls_tcp(struct ndpi_detection_module_struct *ndpi_struct,
ndpi_int_tls_add_connection(ndpi_struct, flow);
}
/* If we have seen Application Data blocks in both directions, it means
we are after the handshake. Stop extra processing */
flow->l4.tcp.tls.app_data_seen[packet->packet_direction] = 1;
if(flow->l4.tcp.tls.app_data_seen[!packet->packet_direction] == 1)
flow->l4.tcp.tls.certificate_processed = 1;
if(flow->l4.tcp.tls.certificate_processed) {
if(flow->l4.tcp.tls.num_tls_blocks < ndpi_struct->num_tls_blocks_to_follow)
flow->l4.tcp.tls.tls_application_blocks_len[flow->l4.tcp.tls.num_tls_blocks++] =