From b6d9536533cad12e6c04edccead26aaea693b0e1 Mon Sep 17 00:00:00 2001
From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com>
Date: Mon, 25 Oct 2021 15:04:04 +0200
Subject: Fixed cleartext protocol assignment (#1357)

---
 src/lib/ndpi_utils.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c
index c8206a066..602e4c145 100644
--- a/src/lib/ndpi_utils.c
+++ b/src/lib/ndpi_utils.c
@@ -2261,7 +2261,9 @@ u_int8_t ndpi_is_valid_protoId(u_int16_t protoId) {
 u_int8_t ndpi_is_encrypted_proto(struct ndpi_detection_module_struct *ndpi_str,
 				 ndpi_protocol proto) {
 
-  if(ndpi_is_valid_protoId(proto.master_protocol) && ndpi_is_valid_protoId(proto.app_protocol)) {
+  if(proto.master_protocol == NDPI_PROTOCOL_UNKNOWN && ndpi_is_valid_protoId(proto.app_protocol)) {
+    return(!ndpi_str->proto_defaults[proto.app_protocol].isClearTextProto);
+  } else if(ndpi_is_valid_protoId(proto.master_protocol) && ndpi_is_valid_protoId(proto.app_protocol)) {
     if(ndpi_str->proto_defaults[proto.master_protocol].isClearTextProto
        && (!ndpi_str->proto_defaults[proto.app_protocol].isClearTextProto))
       return(0);
-- 
cgit v1.2.3