From 16da3f58ccfa430b0ed46f8d3ed9b84734c1760b Mon Sep 17 00:00:00 2001
From: Luca Deri <deri@ntop.org>
Date: Thu, 19 Sep 2019 00:01:44 +0200
Subject: Fixed JA3C compuration wtih SSL (no TLS) traffic

---
 src/lib/protocols/tls.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/lib/protocols')

diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c
index a03e66f40..5be39c714 100644
--- a/src/lib/protocols/tls.c
+++ b/src/lib/protocols/tls.c
@@ -31,7 +31,7 @@
 
 extern char *strptime(const char *s, const char *format, struct tm *tm);
 
-// #define DEBUG_TLS 1
+/* #define DEBUG_TLS 1 */
 
 #define DEBUG_FINGERPRINT 1
 
@@ -647,6 +647,7 @@ int getTLScertificate(struct ndpi_detection_module_struct *ndpi_struct,
 		  } /* while */
 
 		  if(!invalid_ja3) {
+		  compute_ja3c:
 		    ja3_str_len = snprintf(ja3_str, sizeof(ja3_str), "%u,", ja3.tls_handshake_version);
 
 		    for(i=0; i<ja3.num_cipher; i++) {
@@ -696,6 +697,9 @@ int getTLScertificate(struct ndpi_detection_module_struct *ndpi_struct,
 
 		  return(2 /* Client Certificate */);
 		}
+	      } else if(offset == total_len) {
+		/* SSL does not have extensions etc */
+		goto compute_ja3c;
 	      }
 	    }
 	  }
-- 
cgit v1.2.3