diff options
| author | Luca <deri@ntop.org> | 2020-01-01 12:59:19 +0100 |
|---|---|---|
| committer | Luca <deri@ntop.org> | 2020-01-01 12:59:19 +0100 |
| commit | daae1cc9b1ae6b7c6b4187003fabb2a6ffab44f0 (patch) | |
| tree | c6e7918b0ea56416fa6ccdd1db3f1e04f217a2f5 /src/lib/ndpi_utils.c | |
| parent | 499c80535b572a0746d83dcbe2eb232e31434bc4 (diff) | |
Reworked TLS dissection
Diffstat (limited to 'src/lib/ndpi_utils.c')
| -rw-r--r-- | src/lib/ndpi_utils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index cc44df2e2..6979d099c 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -1044,7 +1044,8 @@ int ndpi_flow2json(struct ndpi_detection_module_struct *ndpi_struct, ndpi_serialize_start_of_block(serializer, "tls"); ndpi_serialize_string_string(serializer, "version", version); ndpi_serialize_string_string(serializer, "client_cert", flow->protos.stun_ssl.ssl.client_certificate); - ndpi_serialize_string_string(serializer, "server_cert", flow->protos.stun_ssl.ssl.server_certificate); + if(flow->protos.stun_ssl.ssl.server_names) + ndpi_serialize_string_string(serializer, "server_names", flow->protos.stun_ssl.ssl.server_names); ndpi_serialize_string_string(serializer, "issuer", flow->protos.stun_ssl.ssl.server_organization); if(before) { @@ -1061,10 +1062,10 @@ int ndpi_flow2json(struct ndpi_detection_module_struct *ndpi_struct, ndpi_serialize_string_uint32(serializer, "unsafe_cipher", flow->protos.stun_ssl.ssl.server_unsafe_cipher); ndpi_serialize_string_string(serializer, "cipher", ndpi_cipher2str(flow->protos.stun_ssl.ssl.server_cipher)); - if(flow->l4.tcp.tls_sha1_certificate_fingerprint[0] != '\0') { + if(flow->l4.tcp.tls.sha1_certificate_fingerprint[0] != '\0') { for(i=0, off=0; i<20; i++) { int rc = snprintf(&buf[off], sizeof(buf)-off,"%s%02X", (i > 0) ? ":" : "", - flow->l4.tcp.tls_sha1_certificate_fingerprint[i] & 0xFF); + flow->l4.tcp.tls.sha1_certificate_fingerprint[i] & 0xFF); if(rc <= 0) break; else off += rc; } |