diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_api.h | 6 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 26 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h index b9f3aa682..c6c16ad90 100644 --- a/src/include/ndpi_api.h +++ b/src/include/ndpi_api.h @@ -681,7 +681,7 @@ extern "C" { * * @par ndpi_struct = the detection module * @par flow = the detected flow - * @par certificate = the tls certificate + * @par certificate = the SSL/TLS certificate * @return 1 if the flow is TOR; * 0 else * @@ -807,7 +807,7 @@ extern "C" { u_int16_t src_port, u_int16_t dst_port, u_int8_t icmp_type, u_int8_t icmp_code, u_char *hash_buf, u_int8_t hash_buf_len); - u_int8_t ndpi_is_safe_tls_cipher(u_int32_t cipher); + u_int8_t ndpi_is_safe_ssl_cipher(u_int32_t cipher); const char* ndpi_cipher2str(u_int32_t cipher); u_int16_t ndpi_guess_host_protocol_id(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); @@ -815,7 +815,7 @@ extern "C" { char *buffer, u_int buffer_size, u_int8_t min_string_match_len, /* Will return 0 if no string > min_string_match_len have been found */ char *outbuf, u_int outbuf_len); - char* ndpi_tls_version2str(u_int16_t version); + char* ndpi_ssl_version2str(u_int16_t version); /* Serializer */ int ndpi_init_serializer(ndpi_serializer *serializer, ndpi_serialization_format fmt); diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 305e3d032..fa9c13599 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -466,7 +466,7 @@ struct ndpi_id_struct { /* NDPI_PROTOCOL_DIRECTCONNECT */ u_int16_t detected_directconnect_port; u_int16_t detected_directconnect_udp_port; - u_int16_t detected_directconnect_tls_port; + u_int16_t detected_directconnect_ssl_port; /* NDPI_PROTOCOL_BITTORRENT */ #define NDPI_BT_PORTS 8 @@ -492,7 +492,7 @@ struct ndpi_id_struct { u_int8_t irc_number_of_port; /* NDPI_PROTOCOL_OSCAR */ - u_int8_t oscar_tls_session_id[33]; + u_int8_t oscar_ssl_session_id[33]; /* NDPI_PROTOCOL_UNENCRYPTED_JABBER */ u_int8_t jabber_voice_stun_used_ports; @@ -573,7 +573,7 @@ struct ndpi_flow_tcp_struct { /* NDPI_PROTOCOL_MSN */ u_int32_t msn_stage:3; - u_int32_t msn_tls_ft:2; + u_int32_t msn_ssl_ft:2; /* NDPI_PROTOCOL_SSH */ u_int32_t ssh_stage:3; @@ -585,10 +585,10 @@ struct ndpi_flow_tcp_struct { u_int32_t telnet_stage:2; // 0 - 2 /* NDPI_PROTOCOL_TLS */ - u_int8_t tls_seen_client_cert:1, - tls_seen_server_cert:1, - tls_seen_certificate:1, - tls_stage:2; // 0 - 5 + u_int8_t ssl_seen_client_cert:1, + ssl_seen_server_cert:1, + ssl_seen_certificate:1, + ssl_stage:2; // 0 - 5 /* NDPI_PROTOCOL_POSTGRES */ u_int32_t postgres_stage:3; @@ -771,7 +771,7 @@ struct ndpi_packet_struct { u_int8_t tcp_retransmission; u_int8_t l4_protocol; - u_int8_t tls_certificate_detected:4, tls_certificate_num_checks:4; + u_int8_t ssl_certificate_detected:4, ssl_certificate_num_checks:4; u_int8_t packet_lines_parsed_complete:1, packet_direction:1, empty_line_position_set:1; @@ -1146,19 +1146,19 @@ struct ndpi_flow_struct { struct { struct { - u_int16_t tls_version; + u_int16_t ssl_version; char client_certificate[64], server_certificate[64], server_organization[64]; char ja3_client[33], ja3_server[33]; u_int16_t server_cipher; ndpi_cipher_weakness server_unsafe_cipher; - } tls; + } ssl; struct { u_int8_t num_udp_pkts, num_processed_pkts, num_binding_requests, is_skype; } stun; - /* We can have STUN over TLS thus they need to live together */ - } stun_tls; + /* We can have STUN over SSL/TLS thus they need to live together */ + } stun_ssl; struct { char client_signature[48], server_signature[48]; @@ -1232,7 +1232,7 @@ struct ndpi_flow_struct { u_int8_t thunder_stage:2; // 0 - 3 /* NDPI_PROTOCOL_OSCAR */ - u_int8_t oscar_tls_voice_stage:3, oscar_video_voice:1; + u_int8_t oscar_ssl_voice_stage:3, oscar_video_voice:1; /* NDPI_PROTOCOL_FLORENSIA */ u_int8_t florensia_stage:1; |