This commit is contained in:
+10
-10
@@ -42,8 +42,8 @@ static u_int32_t ndpi_ssl_refine_master_protocol(struct ndpi_detection_module_st
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
if((flow->protos.ssl.client_certificate[0] != '\0')
|
||||
|| (flow->protos.ssl.server_certificate[0] != '\0')
|
||||
if((flow->protos.stun_ssl.ssl.client_certificate[0] != '\0')
|
||||
|| (flow->protos.stun_ssl.ssl.server_certificate[0] != '\0')
|
||||
|| (flow->host_server_name[0] != '\0'))
|
||||
protocol = NDPI_PROTOCOL_SSL;
|
||||
else
|
||||
@@ -227,8 +227,8 @@ int getSSLcertificate(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
if(num_dots >= 2) {
|
||||
if(!ndpi_struct->disable_metadata_export) {
|
||||
stripCertificateTrailer(buffer, buffer_len);
|
||||
snprintf(flow->protos.ssl.server_certificate,
|
||||
sizeof(flow->protos.ssl.server_certificate), "%s", buffer);
|
||||
snprintf(flow->protos.stun_ssl.ssl.server_certificate,
|
||||
sizeof(flow->protos.stun_ssl.ssl.server_certificate), "%s", buffer);
|
||||
}
|
||||
return(1 /* Server Certificate */);
|
||||
}
|
||||
@@ -292,8 +292,8 @@ int getSSLcertificate(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
stripCertificateTrailer(buffer, buffer_len);
|
||||
|
||||
if(!ndpi_struct->disable_metadata_export) {
|
||||
snprintf(flow->protos.ssl.client_certificate,
|
||||
sizeof(flow->protos.ssl.client_certificate), "%s", buffer);
|
||||
snprintf(flow->protos.stun_ssl.ssl.client_certificate,
|
||||
sizeof(flow->protos.stun_ssl.ssl.client_certificate), "%s", buffer);
|
||||
}
|
||||
|
||||
/* We're happy now */
|
||||
@@ -326,7 +326,7 @@ int sslTryAndRetrieveServerCertificate(struct ndpi_detection_module_struct *ndpi
|
||||
packet->ssl_certificate_num_checks++;
|
||||
if (rc > 0) {
|
||||
packet->ssl_certificate_detected++;
|
||||
if (flow->protos.ssl.server_certificate[0] != '\0')
|
||||
if (flow->protos.stun_ssl.ssl.server_certificate[0] != '\0')
|
||||
/* 0 means we're done processing extra packets (since we found what we wanted) */
|
||||
return 0;
|
||||
}
|
||||
@@ -379,7 +379,7 @@ int sslDetectProtocolFromCertificate(struct ndpi_detection_module_struct *ndpi_s
|
||||
/* If we've detected the subprotocol from client certificate but haven't had a chance
|
||||
* to see the server certificate yet, set up extra packet processing to wait
|
||||
* a few more packets. */
|
||||
if((flow->protos.ssl.client_certificate[0] != '\0') && (flow->protos.ssl.server_certificate[0] == '\0')) {
|
||||
if((flow->protos.stun_ssl.ssl.client_certificate[0] != '\0') && (flow->protos.stun_ssl.ssl.server_certificate[0] == '\0')) {
|
||||
sslInitExtraPacketProcessing(0, flow);
|
||||
}
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, subproto,
|
||||
@@ -396,8 +396,8 @@ int sslDetectProtocolFromCertificate(struct ndpi_detection_module_struct *ndpi_s
|
||||
&& flow->l4.tcp.seen_syn
|
||||
&& flow->l4.tcp.seen_syn_ack
|
||||
&& flow->l4.tcp.seen_ack /* We have seen the 3-way handshake */)
|
||||
|| (flow->protos.ssl.server_certificate[0] != '\0')
|
||||
/* || (flow->protos.ssl.client_certificate[0] != '\0') */
|
||||
|| (flow->protos.stun_ssl.ssl.server_certificate[0] != '\0')
|
||||
/* || (flow->protos.stun_ssl.ssl.client_certificate[0] != '\0') */
|
||||
) {
|
||||
ndpi_int_ssl_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_SSL);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user