From: Mats Klepsland <mats.klepsland@gmail.com>
Date: Tue, 30 Oct 2018 20:35:25 +0000 (+0100)
Subject: app-layer-ssl: add Facebook TLSv1.3 draft versions
X-Git-Tag: suricata-4.1.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=033e756905d134cd085eb67673da95a7f16dba1d;p=thirdparty%2Fsuricata.git

app-layer-ssl: add Facebook TLSv1.3 draft versions

Add draft versions for Facebooks custom TLSv1.3 implementation "fizz"
to SSLVersionToString().
---

diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c
index b87684f95f..a6219228dc 100644
--- a/src/app-layer-ssl.c
+++ b/src/app-layer-ssl.c
@@ -330,6 +330,21 @@ void SSLVersionToString(uint16_t version, char *buffer)
         case TLS_VERSION_13_PRE_DRAFT16:
             strlcat(buffer, "TLS 1.3 draft-<16", 18);
             break;
+        case TLS_VERSION_13_DRAFT20_FB:
+            strlcat(buffer, "TLS 1.3 draft-20-fb", 20);
+            break;
+        case TLS_VERSION_13_DRAFT21_FB:
+            strlcat(buffer, "TLS 1.3 draft-21-fb", 20);
+            break;
+        case TLS_VERSION_13_DRAFT22_FB:
+            strlcat(buffer, "TLS 1.3 draft-22-fb", 20);
+            break;
+        case TLS_VERSION_13_DRAFT23_FB:
+            strlcat(buffer, "TLS 1.3 draft-23-fb", 20);
+            break;
+        case TLS_VERSION_13_DRAFT26_FB:
+            strlcat(buffer, "TLS 1.3 draft-26-fb", 20);
+            break;
         default:
             snprintf(buffer, 7, "0x%04x", version);
             break;
diff --git a/src/app-layer-ssl.h b/src/app-layer-ssl.h
index d5e4adb03d..d58bcef0e0 100644
--- a/src/app-layer-ssl.h
+++ b/src/app-layer-ssl.h
@@ -155,6 +155,11 @@ enum {
     TLS_VERSION_13_DRAFT17 = 0x7f11,
     TLS_VERSION_13_DRAFT16 = 0x7f10,
     TLS_VERSION_13_PRE_DRAFT16 = 0x7f01,
+    TLS_VERSION_13_DRAFT20_FB = 0xfb14,
+    TLS_VERSION_13_DRAFT21_FB = 0xfb15,
+    TLS_VERSION_13_DRAFT22_FB = 0xfb16,
+    TLS_VERSION_13_DRAFT23_FB = 0xfb17,
+    TLS_VERSION_13_DRAFT26_FB = 0xfb1a,
 };
 
 typedef struct SSLCertsChain_ {