tailscale
diff --git a/‎acme/version_go112.go
-1 b/‎acme/version_go112.go
-1
diff --git a/‎argon2/blamka_amd64.go
-1 b/‎argon2/blamka_amd64.go
-1
diff --git a/‎argon2/blamka_amd64.s
+6-7 b/‎argon2/blamka_amd64.s
+6-7
diff --git a/‎argon2/blamka_ref.go
-1 b/‎argon2/blamka_ref.go
-1
diff --git a/‎blake2b/blake2bAVX2_amd64.go
+1-2 b/‎blake2b/blake2bAVX2_amd64.go
+1-2
diff --git a/‎blake2b/blake2bAVX2_amd64.s
+1-2 b/‎blake2b/blake2bAVX2_amd64.s
+1-2
diff --git a/‎blake2b/blake2b_amd64.go
-25 b/‎blake2b/blake2b_amd64.go
-25
diff --git a/‎blake2b/blake2b_amd64.s
-1 b/‎blake2b/blake2b_amd64.s
-1
diff --git a/‎blake2b/blake2b_ref.go
-1 b/‎blake2b/blake2b_ref.go
-1
diff --git a/‎blake2b/register.go
-3 b/‎blake2b/register.go
-3
diff --git a/‎blake2s/blake2s_386.go
-1 b/‎blake2s/blake2s_386.go
-1
diff --git a/‎blake2s/blake2s_386.s
-1 b/‎blake2s/blake2s_386.s
-1
diff --git a/‎blake2s/blake2s_amd64.go
-1 b/‎blake2s/blake2s_amd64.go
-1
diff --git a/‎blake2s/blake2s_amd64.s
-1 b/‎blake2s/blake2s_amd64.s
-1
diff --git a/‎blake2s/blake2s_ref.go
-1 b/‎blake2s/blake2s_ref.go
-1
diff --git a/‎blake2s/register.go
-1 b/‎blake2s/register.go
-1
diff --git a/‎chacha20/chacha_arm64.go
+1-2 b/‎chacha20/chacha_arm64.go
+1-2
diff --git a/‎chacha20/chacha_arm64.s
+1-2 b/‎chacha20/chacha_arm64.s
+1-2
diff --git a/‎chacha20/chacha_noasm.go
+1-2 b/‎chacha20/chacha_noasm.go
+1-2
diff --git a/‎chacha20/chacha_ppc64le.go
-1 b/‎chacha20/chacha_ppc64le.go
-1
diff --git a/‎chacha20/chacha_ppc64le.s
-1 b/‎chacha20/chacha_ppc64le.s
-1
diff --git a/‎chacha20/chacha_s390x.go
-1 b/‎chacha20/chacha_s390x.go
-1
diff --git a/‎chacha20/chacha_s390x.s
-1 b/‎chacha20/chacha_s390x.s
-1
diff --git a/‎chacha20poly1305/chacha20poly1305_amd64.go
-1 b/‎chacha20poly1305/chacha20poly1305_amd64.go
-1
diff --git a/‎chacha20poly1305/chacha20poly1305_amd64.s
+22-3 b/‎chacha20poly1305/chacha20poly1305_amd64.s
+22-3
diff --git a/‎chacha20poly1305/chacha20poly1305_noasm.go
-1 b/‎chacha20poly1305/chacha20poly1305_noasm.go
-1
diff --git a/‎cryptobyte/asn1.go
+7-6 b/‎cryptobyte/asn1.go
+7-6
diff --git a/‎cryptobyte/asn1_test.go
+22 b/‎cryptobyte/asn1_test.go
+22
diff --git a/‎cryptobyte/builder.go
+5 b/‎cryptobyte/builder.go
+5
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.12
-// +build go1.12
 
 package acme
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && gc && !purego
-// +build amd64,gc,!purego
 
 package argon2
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && gc && !purego
-// +build amd64,gc,!purego
 
 #include "textflag.h"
 
@@ -200,8 +199,8 @@ TEXT ·mixBlocksSSE2(SB), 4, $0-32
 	MOVQ out+0(FP), DX
 	MOVQ a+8(FP), AX
 	MOVQ b+16(FP), BX
-	MOVQ a+24(FP), CX
-	MOVQ $128, BP
+	MOVQ c+24(FP), CX
+	MOVQ $128, DI
 
 loop:
 	MOVOU 0(AX), X0
@@ -214,7 +213,7 @@ loop:
 	ADDQ  $16, BX
 	ADDQ  $16, CX
 	ADDQ  $16, DX
-	SUBQ  $2, BP
+	SUBQ  $2, DI
 	JA    loop
 	RET
 
@@ -223,8 +222,8 @@ TEXT ·xorBlocksSSE2(SB), 4, $0-32
 	MOVQ out+0(FP), DX
 	MOVQ a+8(FP), AX
 	MOVQ b+16(FP), BX
-	MOVQ a+24(FP), CX
-	MOVQ $128, BP
+	MOVQ c+24(FP), CX
+	MOVQ $128, DI
 
 loop:
 	MOVOU 0(AX), X0
@@ -239,6 +238,6 @@ loop:
 	ADDQ  $16, BX
 	ADDQ  $16, CX
 	ADDQ  $16, DX
-	SUBQ  $2, BP
+	SUBQ  $2, DI
 	JA    loop
 	RET
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !amd64 || purego || !gc
-// +build !amd64 purego !gc
 
 package argon2
 
 
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.7 && amd64 && gc && !purego
-// +build go1.7,amd64,gc,!purego
+//go:build amd64 && gc && !purego
 
 package blake2b
 
 
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.7 && amd64 && gc && !purego
-// +build go1.7,amd64,gc,!purego
+//go:build amd64 && gc && !purego
 
 #include "textflag.h"
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && gc && !purego
-// +build amd64,gc,!purego
 
 #include "textflag.h"
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !amd64 || purego || !gc
-// +build !amd64 purego !gc
 
 package blake2b
 
 
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.9
-// +build go1.9
-
 package blake2b
 
 import (
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 && gc && !purego
-// +build 386,gc,!purego
 
 package blake2s
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 && gc && !purego
-// +build 386,gc,!purego
 
 #include "textflag.h"
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && gc && !purego
-// +build amd64,gc,!purego
 
 package blake2s
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && gc && !purego
-// +build amd64,gc,!purego
 
 #include "textflag.h"
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build (!amd64 && !386) || !gc || purego
-// +build !amd64,!386 !gc purego
 
 package blake2s
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package blake2s
 
 
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.11 && gc && !purego
-// +build go1.11,gc,!purego
+//go:build gc && !purego
 
 package chacha20
 
 
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.11 && gc && !purego
-// +build go1.11,gc,!purego
+//go:build gc && !purego
 
 #include "textflag.h"
 
 
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (!arm64 && !s390x && !ppc64le) || (arm64 && !go1.11) || !gc || purego
-// +build !arm64,!s390x,!ppc64le arm64,!go1.11 !gc purego
+//go:build (!arm64 && !s390x && !ppc64le) || !gc || purego
 
 package chacha20
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc && !purego
-// +build gc,!purego
 
 package chacha20
 
 
@@ -20,7 +20,6 @@
 // due to the calling conventions and initialization of constants.
 
 //go:build gc && !purego
-// +build gc,!purego
 
 #include "textflag.h"
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc && !purego
-// +build gc,!purego
 
 package chacha20
 
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc && !purego
-// +build gc,!purego
 
 #include "go_asm.h"
 #include "textflag.h"
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc && !purego
-// +build gc,!purego
 
 package chacha20poly1305
 
 
@@ -5,7 +5,6 @@
 // This file was originally from https://golang.org/cl/24717 by Vlad Krasnov of CloudFlare.
 
 //go:build gc && !purego
-// +build gc,!purego
 
 #include "textflag.h"
 // General register allocation
@@ -184,11 +183,31 @@ GLOBL ·andMask<>(SB), (NOPTR+RODATA), $240
 #define shiftD1Right BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xd2; BYTE $0x04 // PALIGNR $4, X10, X10
 #define shiftD2Right BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xdb; BYTE $0x04 // PALIGNR $4, X11, X11
 #define shiftD3Right BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xff; BYTE $0x04 // PALIGNR $4, X15, X15
+
 // Some macros
+
+// ROL rotates the uint32s in register R left by N bits, using temporary T.
+#define ROL(N, R, T) \
+	MOVO R, T; PSLLL $(N), T; PSRLL $(32-(N)), R; PXOR T, R
+
+// ROL16 rotates the uint32s in register R left by 16, using temporary T if needed.
+#ifdef GOAMD64_v2
+#define ROL16(R, T) PSHUFB ·rol16<>(SB), R
+#else
+#define ROL16(R, T) ROL(16, R, T)
+#endif
+
+// ROL8 rotates the uint32s in register R left by 8, using temporary T if needed.
+#ifdef GOAMD64_v2
+#define ROL8(R, T) PSHUFB ·rol8<>(SB), R
+#else
+#define ROL8(R, T) ROL(8, R, T)
+#endif
+
 #define chachaQR(A, B, C, D, T) \
-	PADDD B, A; PXOR A, D; PSHUFB ·rol16<>(SB), D                            \
+	PADDD B, A; PXOR A, D; ROL16(D, T) \
 	PADDD D, C; PXOR C, B; MOVO B, T; PSLLL $12, T; PSRLL $20, B; PXOR T, B \
-	PADDD B, A; PXOR A, D; PSHUFB ·rol8<>(SB), D                             \
+	PADDD B, A; PXOR A, D; ROL8(D, T) \
 	PADDD D, C; PXOR C, B; MOVO B, T; PSLLL $7, T; PSRLL $25, B; PXOR T, B
 
 #define chachaQR_AVX2(A, B, C, D, T) \
 
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !amd64 || !gc || purego
-// +build !amd64 !gc purego
 
 package chacha20poly1305
 
 
@@ -733,13 +733,14 @@ func (s *String) ReadOptionalASN1OctetString(out *[]byte, outPresent *bool, tag
 	return true
 }
 
-// ReadOptionalASN1Boolean sets *out to the value of the next ASN.1 BOOLEAN or,
-// if the next bytes are not an ASN.1 BOOLEAN, to the value of defaultValue.
-// It reports whether the operation was successful.
-func (s *String) ReadOptionalASN1Boolean(out *bool, defaultValue bool) bool {
+// ReadOptionalASN1Boolean attempts to read an optional ASN.1 BOOLEAN
+// explicitly tagged with tag into out and advances. If no element with a
+// matching tag is present, it sets "out" to defaultValue instead. It reports
+// whether the read was successful.
+func (s *String) ReadOptionalASN1Boolean(out *bool, tag asn1.Tag, defaultValue bool) bool {
 	var present bool
 	var child String
-	if !s.ReadOptionalASN1(&child, &present, asn1.BOOLEAN) {
+	if !s.ReadOptionalASN1(&child, &present, tag) {
 		return false
 	}
 
@@ -748,7 +749,7 @@ func (s *String) ReadOptionalASN1Boolean(out *bool, defaultValue bool) bool {
 		return true
 	}
 
-	return s.ReadASN1Boolean(out)
+	return child.ReadASN1Boolean(out)
 }
 
 func (s *String) readASN1(out *String, outTag *asn1.Tag, skipHeader bool) bool {
 
@@ -115,6 +115,28 @@ func TestReadASN1OptionalInteger(t *testing.T) {
 	}
 }
 
+const defaultBool = false
+
+var optionalBoolTestData = []readASN1Test{
+	{"empty", []byte{}, 0xa0, true, false},
+	{"invalid", []byte{0xa1, 0x3, 0x1, 0x2, 0x7f}, 0xa1, false, defaultBool},
+	{"missing", []byte{0xa1, 0x3, 0x1, 0x1, 0x7f}, 0xa0, true, defaultBool},
+	{"present", []byte{0xa1, 0x3, 0x1, 0x1, 0xff}, 0xa1, true, true},
+}
+
+func TestReadASN1OptionalBoolean(t *testing.T) {
+	for _, test := range optionalBoolTestData {
+		t.Run(test.name, func(t *testing.T) {
+			in := String(test.in)
+			var out bool
+			ok := in.ReadOptionalASN1Boolean(&out, test.tag, defaultBool)
+			if ok != test.ok || ok && out != test.out.(bool) {
+				t.Errorf("in.ReadOptionalASN1Boolean() = %v, want %v; out = %v, want %v", ok, test.ok, out, test.out)
+			}
+		})
+	}
+}
+
 func TestReadASN1IntegerSigned(t *testing.T) {
 	testData64 := []struct {
 		in  []byte
 
@@ -95,6 +95,11 @@ func (b *Builder) AddUint32(v uint32) {
 	b.add(byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
 }
 
+// AddUint48 appends a big-endian, 48-bit value to the byte string.
+func (b *Builder) AddUint48(v uint64) {
+	b.add(byte(v>>40), byte(v>>32), byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
+}
+
 // AddUint64 appends a big-endian, 64-bit value to the byte string.
 func (b *Builder) AddUint64(v uint64) {
 	b.add(byte(v>>56), byte(v>>48), byte(v>>40), byte(v>>32), byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
Original file line number	Diff line number	Diff line change
`@@ -733,13 +733,14 @@ func (s String) ReadOptionalASN1OctetString(out []byte, outPresent *bool, tag`
`733`	`733`	`return true`
`734`	`734`	`}`
`735`	`735`
`736`		`-// ReadOptionalASN1Boolean sets *out to the value of the next ASN.1 BOOLEAN or,`
`737`		`-// if the next bytes are not an ASN.1 BOOLEAN, to the value of defaultValue.`
`738`		`-// It reports whether the operation was successful.`
`739`		`-func (s String) ReadOptionalASN1Boolean(out bool, defaultValue bool) bool {`
	`736`	`+// ReadOptionalASN1Boolean attempts to read an optional ASN.1 BOOLEAN`
	`737`	`+// explicitly tagged with tag into out and advances. If no element with a`
	`738`	`+// matching tag is present, it sets "out" to defaultValue instead. It reports`
	`739`	`+// whether the read was successful.`
	`740`	`+func (s String) ReadOptionalASN1Boolean(out bool, tag asn1.Tag, defaultValue bool) bool {`
`740`	`741`	`var present bool`
`741`	`742`	`var child String`
`742`		`- if !s.ReadOptionalASN1(&child, &present, asn1.BOOLEAN) {`
	`743`	`+ if !s.ReadOptionalASN1(&child, &present, tag) {`
`743`	`744`	`return false`
`744`	`745`	`}`
`745`	`746`
`@@ -748,7 +749,7 @@ func (s String) ReadOptionalASN1Boolean(out bool, defaultValue bool) bool {`
`748`	`749`	`return true`
`749`	`750`	`}`
`750`	`751`
`751`		`- return s.ReadASN1Boolean(out)`
	`752`	`+ return child.ReadASN1Boolean(out)`
`752`	`753`	`}`
`753`	`754`
`754`	`755`	`func (s String) readASN1(out String, outTag *asn1.Tag, skipHeader bool) bool {`