From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Tue, 25 Feb 2020 17:45:34 +0000 (+0000)
Subject: Merge pull request #2014 in SNORT/snort3 from ~OZAIKA/snort3:ozaika_cert_status_type... 
X-Git-Tag: 3.0.0-269~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4005c987c33581d124338bae5108dc15f251fd32;p=thirdparty%2Fsnort3.git

Merge pull request #2014 in SNORT/snort3 from ~OZAIKA/snort3:ozaika_cert_status_type to master

Squashed commit of the following:

commit f09bbc493a8567cb60a280c264e120216ebbc82f
Author: Oleksii Zaika <ozaika@cisco.com>
Date:   Mon Feb 17 18:48:19 2020 +0200

    appid: handle CERTIFICATE STATUS handshake type in SSL detector
---

diff --git a/src/network_inspectors/appid/service_plugins/service_ssl.cc b/src/network_inspectors/appid/service_plugins/service_ssl.cc
index 42a363593..153a61fc3 100644
--- a/src/network_inspectors/appid/service_plugins/service_ssl.cc
+++ b/src/network_inspectors/appid/service_plugins/service_ssl.cc
@@ -48,6 +48,7 @@ enum SSLContentType
 #define SSL_SERVER_KEY_XCHG 12
 #define SSL_SERVER_CERT_REQ 13
 #define SSL_SERVER_HELLO_DONE 14
+#define SSL_CERTIFICATE_STATUS 22
 #define SSL2_SERVER_HELLO 4
 #define PCT_SERVER_HELLO 2
 
@@ -609,6 +610,7 @@ int SslServiceDetector::validate(AppIdDiscoveryArgs& args)
                         }
                     }
                 /* fall through */
+                case SSL_CERTIFICATE_STATUS:
                 case SSL_SERVER_KEY_XCHG:
                 case SSL_SERVER_CERT_REQ:
                     ss->length = ntohs(rec->length) + offsetof(ServiceSSLV3Record, version);