From 4e8fa06059d9792a1c25ae2eaa08d6444e8109ef Mon Sep 17 00:00:00 2001
From: Gaukas Wang <i@gauk.as>
Date: Tue, 13 Sep 2022 15:31:04 -0600
Subject: [PATCH] go1.16 compatibility

- Added `// +build` tags for 1.16
---
 cpu/cpu_arm64_android.go   |  1 +
 cpu/cpu_arm64_darwin.go    |  1 +
 cpu/cpu_arm64_freebsd.go   |  1 +
 cpu/cpu_arm64_hwcap.go     |  1 +
 cpu/cpu_arm64_linux.go     |  1 +
 cpu/cpu_arm64_other.go     |  5 +++++
 cpu/cpu_mips64x.go         |  1 +
 cpu/cpu_no_name.go         |  1 +
 cpu/cpu_ppc64x.go          |  1 +
 cpu/cpu_ppc64x_aix.go      |  1 +
 cpu/cpu_ppc64x_linux.go    |  1 +
 cpu/cpu_x86.go             |  1 +
 cpu/cpu_x86.s              |  1 +
 cpu/cpu_x86_test.go        |  1 +
 generate_cert.go           |  1 +
 go.mod                     | 13 ++++---------
 go.sum                     | 24 ++++++++++++++++--------
 handshake_unix_test.go     |  1 +
 testenv/testenv_cgo.go     |  1 +
 testenv/testenv_notunix.go |  1 +
 testenv/testenv_notwin.go  |  1 +
 testenv/testenv_unix.go    |  1 +
 22 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/cpu/cpu_arm64_android.go b/cpu/cpu_arm64_android.go
index fbdf7ba..ac6eee5 100644
--- a/cpu/cpu_arm64_android.go
+++ b/cpu/cpu_arm64_android.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64
+// +build arm64
 
 package cpu
 
diff --git a/cpu/cpu_arm64_darwin.go b/cpu/cpu_arm64_darwin.go
index 730e14c..ce1b250 100644
--- a/cpu/cpu_arm64_darwin.go
+++ b/cpu/cpu_arm64_darwin.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && darwin && !ios
+// +build arm64,darwin,!ios
 
 package cpu
 
diff --git a/cpu/cpu_arm64_freebsd.go b/cpu/cpu_arm64_freebsd.go
index c25e021..8c48137 100644
--- a/cpu/cpu_arm64_freebsd.go
+++ b/cpu/cpu_arm64_freebsd.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64
+// +build arm64
 
 package cpu
 
diff --git a/cpu/cpu_arm64_hwcap.go b/cpu/cpu_arm64_hwcap.go
index 0baa39f..8ac04fd 100644
--- a/cpu/cpu_arm64_hwcap.go
+++ b/cpu/cpu_arm64_hwcap.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && linux
+// +build arm64,linux
 
 package cpu
 
diff --git a/cpu/cpu_arm64_linux.go b/cpu/cpu_arm64_linux.go
index d746bdb..c3a3f9a 100644
--- a/cpu/cpu_arm64_linux.go
+++ b/cpu/cpu_arm64_linux.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && linux && !android
+// +build arm64,linux,!android
 
 package cpu
 
diff --git a/cpu/cpu_arm64_other.go b/cpu/cpu_arm64_other.go
index d313648..e8b5d52 100644
--- a/cpu/cpu_arm64_other.go
+++ b/cpu/cpu_arm64_other.go
@@ -3,6 +3,11 @@
 // license that can be found in the LICENSE file.
 
 //go:build arm64 && !linux && !freebsd && !android && (!darwin || ios)
+// +build arm64
+// +build !linux
+// +build !freebsd
+// +build !android
+// +build !darwin ios
 
 package cpu
 
diff --git a/cpu/cpu_mips64x.go b/cpu/cpu_mips64x.go
index c452ffd..d2f9d44 100644
--- a/cpu/cpu_mips64x.go
+++ b/cpu/cpu_mips64x.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
+// +build mips64 mips64le
 
 package cpu
 
diff --git a/cpu/cpu_no_name.go b/cpu/cpu_no_name.go
index 37de951..8d563b5 100644
--- a/cpu/cpu_no_name.go
+++ b/cpu/cpu_no_name.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !386 && !amd64
+// +build !386,!amd64
 
 package cpu
 
diff --git a/cpu/cpu_ppc64x.go b/cpu/cpu_ppc64x.go
index 83687d6..2e7fd3e 100644
--- a/cpu/cpu_ppc64x.go
+++ b/cpu/cpu_ppc64x.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
+// +build ppc64 ppc64le
 
 package cpu
 
diff --git a/cpu/cpu_ppc64x_aix.go b/cpu/cpu_ppc64x_aix.go
index d518edc..3d17a9c 100644
--- a/cpu/cpu_ppc64x_aix.go
+++ b/cpu/cpu_ppc64x_aix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
+// +build ppc64 ppc64le
 
 package cpu
 
diff --git a/cpu/cpu_ppc64x_linux.go b/cpu/cpu_ppc64x_linux.go
index 7999656..b7c7345 100644
--- a/cpu/cpu_ppc64x_linux.go
+++ b/cpu/cpu_ppc64x_linux.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
+// +build ppc64 ppc64le
 
 package cpu
 
diff --git a/cpu/cpu_x86.go b/cpu/cpu_x86.go
index 81d5cee..1582e83 100644
--- a/cpu/cpu_x86.go
+++ b/cpu/cpu_x86.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 || amd64
+// +build 386 amd64
 
 package cpu
 
diff --git a/cpu/cpu_x86.s b/cpu/cpu_x86.s
index edef219..0df5da1 100644
--- a/cpu/cpu_x86.s
+++ b/cpu/cpu_x86.s
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 || amd64
+// +build 386 amd64
 
 #include "textflag.h"
 
diff --git a/cpu/cpu_x86_test.go b/cpu/cpu_x86_test.go
index ddecdd6..979e326 100644
--- a/cpu/cpu_x86_test.go
+++ b/cpu/cpu_x86_test.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 || amd64
+// +build 386 amd64
 
 package cpu_test
 
diff --git a/generate_cert.go b/generate_cert.go
index 58fdd02..7ea90f8 100644
--- a/generate_cert.go
+++ b/generate_cert.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 // Generate a self-signed X.509 certificate for a TLS server. Outputs to
 // 'cert.pem' and 'key.pem' and will overwrite existing files.
diff --git a/go.mod b/go.mod
index 5f0d2db..8dcb261 100644
--- a/go.mod
+++ b/go.mod
@@ -1,15 +1,10 @@
 module github.com/refraction-networking/utls
 
-go 1.18
+go 1.16
 
 require (
 	github.com/andybalholm/brotli v1.0.4
-	github.com/klauspost/compress v1.15.8
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
-	golang.org/x/net v0.0.0-20220708220712-1185a9018129
-)
-
-require (
-	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
-	golang.org/x/text v0.3.7 // indirect
+	github.com/klauspost/compress v1.15.9
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
+	golang.org/x/net v0.0.0-20220909164309-bea034e7d591
 )
diff --git a/go.sum b/go.sum
index 995bd94..20803ed 100644
--- a/go.sum
+++ b/go.sum
@@ -1,12 +1,20 @@
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/klauspost/compress v1.15.8 h1:JahtItbkWjf2jzm/T+qgMxkP9EMHsqEUA6vCMGmXvhA=
-github.com/klauspost/compress v1.15.8/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0=
-golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
+github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/handshake_unix_test.go b/handshake_unix_test.go
index b61e7c2..19fc698 100644
--- a/handshake_unix_test.go
+++ b/handshake_unix_test.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package tls
 
diff --git a/testenv/testenv_cgo.go b/testenv/testenv_cgo.go
index 7426a29..02f08f5 100644
--- a/testenv/testenv_cgo.go
+++ b/testenv/testenv_cgo.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build cgo
+// +build cgo
 
 package testenv
 
diff --git a/testenv/testenv_notunix.go b/testenv/testenv_notunix.go
index 180206b..74de6f0 100644
--- a/testenv/testenv_notunix.go
+++ b/testenv/testenv_notunix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build windows || plan9 || (js && wasm)
+// +build windows plan9 js,wasm
 
 package testenv
 
diff --git a/testenv/testenv_notwin.go b/testenv/testenv_notwin.go
index 81171fd..846ec93 100644
--- a/testenv/testenv_notwin.go
+++ b/testenv/testenv_notwin.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
+// +build !windows
 
 package testenv
 
diff --git a/testenv/testenv_unix.go b/testenv/testenv_unix.go
index 3dc5daf..1ed02d6 100644
--- a/testenv/testenv_unix.go
+++ b/testenv/testenv_unix.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package testenv