From 79de7d2a354a6cc5ac1457dc955e592c702f6afd Mon Sep 17 00:00:00 2001
From: Cedric Staub <cs@squareup.com>
Date: Fri, 7 Jun 2019 12:47:52 -0700
Subject: [PATCH 1/2] Fix panic in explainCipher for TLS 1.3 ciphers

---
 lib/tls.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/tls.go b/lib/tls.go
index a9fefcd..f35622b 100644
--- a/lib/tls.go
+++ b/lib/tls.go
@@ -161,6 +161,7 @@ var tlsVersions = map[uint16]description{
 	tls.VersionTLS10: {"TLS 1.0", "tls_1_0", insecure},
 	tls.VersionTLS11: {"TLS 1.1", "tls_1_1", ok},
 	tls.VersionTLS12: {"TLS 1.2", "tls_1_2", good},
+	tls.VersionTLS13: {"TLS 1.3", "tls_1_3", good},
 }
 
 func parseRawSubject(subject []byte) (pkix.Name, error) {
@@ -179,6 +180,9 @@ func parseRawSubject(subject []byte) (pkix.Name, error) {
 // Fill in a human readable name, extracted from the slug
 func explainCipher(d description) description {
 	kexAndCipher := strings.Split(d.Slug, "_WITH_")
+	if len(kexAndCipher) < 2 {
+		return d
+	}
 	d.Name = fmt.Sprintf("%s key exchange, %s cipher", kexAndCipher[0][len("TLS_"):], kexAndCipher[1])
 	return d
 }

From 869c712e68a6623575e6b3d5a036929a031c6d84 Mon Sep 17 00:00:00 2001
From: Cedric Staub <cs@squareup.com>
Date: Fri, 7 Jun 2019 12:54:00 -0700
Subject: [PATCH 2/2] Bump Go version in Travis-CI build

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index afe42a7..90dbeeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 language: go
 
 go:
-  - '1.11.x'
+  - '1.12.x'
 
 install:
   - pip install cram --user