From ac63554791d1cdf483b22279070171bcbcd9fc5e Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Fri, 9 Jun 2017 19:42:03 +0200
Subject: [PATCH] drop support for Go 1.7

---
 .travis.yml                        |  1 -
 Changelog.md                       |  1 +
 README.md                          |  2 +-
 crypto/cert_chain.go               |  9 +++++++++
 crypto/config_for_client_1.8.go    | 14 --------------
 crypto/config_for_client_pre1.8.go |  9 ---------
 6 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 crypto/config_for_client_1.8.go
 delete mode 100644 crypto/config_for_client_pre1.8.go

diff --git a/.travis.yml b/.travis.yml
index d9f4f933..23faf62c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ addons:
 language: go
 
 go:
-  - 1.7.x
   - 1.8.x
   - 1.9beta2
 
diff --git a/Changelog.md b/Changelog.md
index 32cec5c0..591752b7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,4 +12,5 @@
 - Changed the log level environment variable to only accept strings ("DEBUG", "INFO", "ERROR"), see [the wiki](https://github.com/lucas-clemente/quic-go/wiki/Logging) for more details.
 - Rename the `h2quic.QuicRoundTripper` to `h2quic.RoundTripper`
 - Changed `h2quic.Server.Serve()` to accept a `net.PacketConn`
+- Drop support for Go 1.7.
 - Various bugfixes
diff --git a/README.md b/README.md
index eb504449..6f3a11e5 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ As Google's QUIC versions are expected to converge towards the [IETF QUIC draft]
 
 ## Guides
 
-We currently support Go 1.7+.
+We currently support Go 1.8+.
 
 Installing and updating dependencies:
 
diff --git a/crypto/cert_chain.go b/crypto/cert_chain.go
index 96d0ecd0..f3bc9fbf 100644
--- a/crypto/cert_chain.go
+++ b/crypto/cert_chain.go
@@ -102,3 +102,12 @@ func (cc *certChain) getCertForSNI(sni string) (*tls.Certificate, error) {
 	// If nothing matches, return the first certificate.
 	return &c.Certificates[0], nil
 }
+
+func maybeGetConfigForClient(c *tls.Config, sni string) (*tls.Config, error) {
+	if c.GetConfigForClient == nil {
+		return c, nil
+	}
+	return c.GetConfigForClient(&tls.ClientHelloInfo{
+		ServerName: sni,
+	})
+}
diff --git a/crypto/config_for_client_1.8.go b/crypto/config_for_client_1.8.go
deleted file mode 100644
index 452fe0e0..00000000
--- a/crypto/config_for_client_1.8.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build go1.8
-
-package crypto
-
-import "crypto/tls"
-
-func maybeGetConfigForClient(c *tls.Config, sni string) (*tls.Config, error) {
-	if c.GetConfigForClient == nil {
-		return c, nil
-	}
-	return c.GetConfigForClient(&tls.ClientHelloInfo{
-		ServerName: sni,
-	})
-}
diff --git a/crypto/config_for_client_pre1.8.go b/crypto/config_for_client_pre1.8.go
deleted file mode 100644
index 612b94a1..00000000
--- a/crypto/config_for_client_pre1.8.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build !go1.8
-
-package crypto
-
-import "crypto/tls"
-
-func maybeGetConfigForClient(c *tls.Config, sni string) (*tls.Config, error) {
-	return c, nil
-}