Fixes #485
This commit is contained in:
@@ -641,7 +641,7 @@ void ndpi_search_ssl_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
return;
|
||||
} else if((packet->payload_packet_len == 4)
|
||||
&& (packet->payload[0] == 'W')
|
||||
&& (packet->payload[1] == 'A')){
|
||||
&& (packet->payload[1] == 'A')) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHATSAPP, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
} else {
|
||||
|
||||
+18
-10
@@ -16,14 +16,23 @@ static void ndpi_int_tor_add_connection(struct ndpi_detection_module_struct
|
||||
|
||||
|
||||
int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow, char *certificate) {
|
||||
|
||||
struct ndpi_flow_struct *flow, char *certificate) {
|
||||
int prev_num = 0, numbers_found = 0, num_found = 0, i, len;
|
||||
char dummy[48], *dot, *name;
|
||||
|
||||
if((certificate == NULL)
|
||||
|| (strlen(certificate) < 6)
|
||||
|| (strncmp(certificate, "www.", 4)))
|
||||
if(certificate == NULL)
|
||||
return(0);
|
||||
else
|
||||
len = strlen(certificate);
|
||||
|
||||
/* Check if it ends in .com or .net */
|
||||
if(strcmp(&certificate[len-4], ".com") && strcmp(&certificate[len-4], ".net"))
|
||||
return(0);
|
||||
|
||||
if((len < 6)
|
||||
|| (!strncmp(certificate, "*.", 2)) /* Wildcard certificate */
|
||||
|| (strncmp(certificate, "www.", 4)) /* Not starting with www.... */
|
||||
)
|
||||
return(0);
|
||||
|
||||
// printf("***** [SSL] %s(): %s\n", __FUNCTION__, certificate);
|
||||
@@ -55,13 +64,12 @@ int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
} else
|
||||
prev_num = 0;
|
||||
|
||||
if(ndpi_match_bigram(ndpi_struct, &ndpi_struct->impossible_bigrams_automa, &name[i])) {
|
||||
ndpi_int_tor_add_connection(ndpi_struct, flow);
|
||||
return(1);
|
||||
}
|
||||
|
||||
|
||||
if(ndpi_match_bigram(ndpi_struct, &ndpi_struct->bigrams_automa, &name[i])) {
|
||||
num_found++;
|
||||
} else if(ndpi_match_bigram(ndpi_struct, &ndpi_struct->impossible_bigrams_automa, &name[i])) {
|
||||
ndpi_int_tor_add_connection(ndpi_struct, flow);
|
||||
return(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user