From de8efcb60451d65404bd3b70d464da43af239be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Fri, 6 Jul 2018 13:12:32 +0200
Subject: ssl: Add experimental version 'tlsv1.3'

- Add 'tlsv1.3' to the available versions. It can be used to
  trigger experimental behavior while implementing TLS 1.3.

- Add dummy clauses for handling version {3,4} of TLS.

- Update ssl_logger to handle unknown versions of TLS.

Change-Id: I564ffa47dca18b59f0dc16c9809dfd7adaf2d333
---
 lib/ssl/src/ssl_logger.erl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib/ssl/src/ssl_logger.erl')

diff --git a/lib/ssl/src/ssl_logger.erl b/lib/ssl/src/ssl_logger.erl
index 23e9e096cc..35c8dcfd48 100644
--- a/lib/ssl/src/ssl_logger.erl
+++ b/lib/ssl/src/ssl_logger.erl
@@ -156,7 +156,9 @@ version({3,2}) ->
 version({3,1}) ->
     "TLS 1.0";
 version({3,0}) ->
-    "SSL 3.0".
+    "SSL 3.0";
+version({M,N}) ->
+    io_lib:format("TLS [0x0~B0~B]", [M,N]).
 
 
 header_prefix(inbound) ->
@@ -183,7 +185,6 @@ header_prefix_tls_record(outbound) ->
     "writing".
 
 
-
 tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(3),_/binary>>|_]) ->
     io_lib:format("TLS 1.2 Record Protocol, ~s", [msg_type(B)]);
 tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(2),_/binary>>|_]) ->
@@ -191,7 +192,9 @@ tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(2),_/binary>>|_]) ->
 tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(1),_/binary>>|_]) ->
     io_lib:format("TLS 1.0 Record Protocol, ~s", [msg_type(B)]);
 tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(0),_/binary>>|_]) ->
-    io_lib:format("SSL 3.0 Record Protocol, ~s", [msg_type(B)]).
+    io_lib:format("SSL 3.0 Record Protocol, ~s", [msg_type(B)]);
+tls_record_version([<<?BYTE(B),?BYTE(M),?BYTE(N),_/binary>>|_]) ->
+    io_lib:format("TLS [0x0~B0~B] Record Protocol, ~s", [M, N, msg_type(B)]).
 
 
 msg_type(20) -> "change_cipher_spec";
-- 
cgit v1.2.3