Skip to content

Commit 4223f6e

Browse files
FiloSottiledmitshur
FiloSottile
authored and
dmitshur
committed
[release-branch.go1.17] all: update vendored golang.org/x/crypto for cryptobyte fix
Updates #49678 Fixes #50165 Change-Id: I47dd959a787180a67856e60dfa6eba3ddd045972 Reviewed-on: https://go-review.googlesource.com/c/go/+/373361 Trust: Filippo Valsorda <[email protected]> Run-TryBot: Filippo Valsorda <[email protected]> Reviewed-by: Emmanuel Odeke <[email protected]> Reviewed-by: Julie Qiu <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent de690c2 commit 4223f6e

File tree

8 files changed

+109
-9
lines changed

8 files changed

+109
-9
lines changed

‎src/cmd/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212

1313
require (
1414
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 // indirect
15-
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e // indirect
15+
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect
1616
golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744 // indirect
1717
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
1818
)

‎src/cmd/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ golang.org/x/arch v0.0.0-20210502124803-cbf565b21d1e h1:pv3V0NlNSh5Q6AX/StwGLBjc
1010
golang.org/x/arch v0.0.0-20210502124803-cbf565b21d1e/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
1111
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
1212
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
13-
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e h1:8foAy0aoO5GkqCvAEJ4VC4P3zksTg4X4aJCDpZzmgQI=
14-
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
13+
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e h1:1SzTfNOXwIS2oWiMF+6qu0OUDKb0dauo6MoDUQyu+yU=
14+
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
1515
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
1616
golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
1717
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=

‎src/cmd/vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ golang.org/x/arch/arm/armasm
2424
golang.org/x/arch/arm64/arm64asm
2525
golang.org/x/arch/ppc64/ppc64asm
2626
golang.org/x/arch/x86/x86asm
27-
# golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e
27+
# golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e
2828
## explicit; go 1.17
2929
golang.org/x/crypto/ed25519
3030
golang.org/x/crypto/ed25519/internal/edwards25519

‎src/crypto/x509/x509_test.go

+95
Original file line numberDiff line numberDiff line change
@@ -3216,3 +3216,98 @@ func TestAuthKeyIdOptional(t *testing.T) {
32163216
t.Fatalf("ParseCertificate to failed to parse certificate with optional authority key identifier fields: %s", err)
32173217
}
32183218
}
3219+
3220+
const largeOIDPEM = `
3221+
Certificate:
3222+
Data:
3223+
Version: 3 (0x2)
3224+
Serial Number:
3225+
da:ba:53:19:1b:09:4b:82:b2:89:26:7d:c7:6f:a0:02
3226+
Signature Algorithm: sha256WithRSAEncryption
3227+
Issuer: O = Acme Co
3228+
Validity
3229+
Not Before: Dec 21 16:59:27 2021 GMT
3230+
Not After : Dec 21 16:59:27 2022 GMT
3231+
Subject: O = Acme Co
3232+
Subject Public Key Info:
3233+
Public Key Algorithm: rsaEncryption
3234+
RSA Public-Key: (2048 bit)
3235+
Modulus:
3236+
00:bf:17:16:d8:bc:29:9c:16:e5:76:b4:93:15:78:
3237+
ad:6e:45:c5:4a:63:46:a1:b2:76:71:65:51:9c:14:
3238+
c4:ea:74:13:e4:34:df:2f:2c:65:11:e8:56:52:69:
3239+
11:f9:0e:fc:77:bb:63:a8:7c:1a:c6:a1:7b:6e:6c:
3240+
e7:18:25:25:c9:e8:fb:06:7f:a2:a9:98:fe:2a:bc:
3241+
8a:b3:75:b6:b8:7d:b6:c9:6b:29:08:32:22:10:cb:
3242+
8d:d6:60:c8:83:ad:f5:58:91:d6:11:e8:55:56:fb:
3243+
8f:a3:a2:9f:48:cb:79:e4:65:4a:8c:a6:52:64:9f:
3244+
99:38:35:d4:d5:ac:6f:cf:a0:cb:42:8c:07:eb:21:
3245+
17:31:3a:eb:91:7b:62:43:a4:75:5f:ef:a7:2f:94:
3246+
f8:69:0b:d4:ec:09:e6:00:c0:8c:dd:07:63:0b:e4:
3247+
77:aa:60:18:3c:a0:e0:ae:0a:ea:0e:52:3b:b4:fa:
3248+
6a:30:1b:50:62:21:73:53:33:01:60:a1:6b:99:58:
3249+
00:f3:77:c6:0f:46:19:ca:c2:5d:cd:f5:e2:52:4d:
3250+
84:94:23:d3:32:2f:ae:5f:da:43:a1:19:95:d2:17:
3251+
dd:49:14:b4:d9:48:1c:08:13:93:8e:d5:09:43:21:
3252+
b6:ce:52:e8:87:bb:d2:60:0d:c6:4e:bf:c5:93:6a:
3253+
c6:bf
3254+
Exponent: 65537 (0x10001)
3255+
X509v3 extensions:
3256+
X509v3 Key Usage: critical
3257+
Digital Signature, Key Encipherment
3258+
X509v3 Extended Key Usage:
3259+
TLS Web Server Authentication
3260+
X509v3 Basic Constraints: critical
3261+
CA:FALSE
3262+
X509v3 Subject Alternative Name:
3263+
DNS:longOID.example
3264+
X509v3 Certificate Policies:
3265+
Policy: 1.3.6.1.4.1.311.21.8.1492336001
3266+
3267+
Signature Algorithm: sha256WithRSAEncryption
3268+
72:77:8b:de:48:fb:6d:9a:94:b1:be:d4:90:7d:4c:e6:d3:79:
3269+
fa:fb:fc:3e:d5:3d:e9:a0:ce:28:2b:2f:94:77:3f:87:f8:9c:
3270+
9f:91:1c:f3:f6:58:91:15:6b:24:b9:ca:ae:9f:ee:ca:c8:31:
3271+
db:1a:3d:bb:6b:83:6d:bc:81:8b:a1:79:d5:3e:bb:dd:93:fe:
3272+
35:3e:b7:99:e0:d6:eb:58:0c:fd:42:73:dc:49:da:e2:b7:ae:
3273+
15:ee:e6:cc:aa:ef:91:41:9a:18:46:8d:4a:39:65:a2:85:3c:
3274+
7f:0c:41:f8:0b:9c:e8:1f:35:36:60:8d:8c:e0:8e:18:b1:06:
3275+
57:d0:4e:c4:c3:cd:8f:6f:e7:76:02:52:da:03:43:61:2b:b3:
3276+
bf:19:fd:73:0d:6a:0b:b4:b6:cb:a9:6f:70:4e:53:2a:54:07:
3277+
b3:74:fd:85:49:57:5b:23:8d:8c:6b:53:2b:09:e8:41:a5:80:
3278+
3f:69:1b:11:d1:6b:13:35:2e:f9:d6:50:15:d9:91:38:42:43:
3279+
e9:17:af:67:d9:96:a4:d1:6a:4f:cc:b4:a7:8e:48:1f:00:72:
3280+
69:de:4d:f1:73:a4:47:12:67:e9:f9:07:3e:79:75:90:42:b8:
3281+
d4:b5:fd:d1:7e:35:04:f7:00:04:cf:f1:36:be:0f:27:81:1f:
3282+
a6:ba:88:6c
3283+
-----BEGIN CERTIFICATE-----
3284+
MIIDHTCCAgWgAwIBAgIRANq6UxkbCUuCsokmfcdvoAIwDQYJKoZIhvcNAQELBQAw
3285+
EjEQMA4GA1UEChMHQWNtZSBDbzAeFw0yMTEyMjExNjU5MjdaFw0yMjEyMjExNjU5
3286+
MjdaMBIxEDAOBgNVBAoTB0FjbWUgQ28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
3287+
ggEKAoIBAQC/FxbYvCmcFuV2tJMVeK1uRcVKY0ahsnZxZVGcFMTqdBPkNN8vLGUR
3288+
6FZSaRH5Dvx3u2OofBrGoXtubOcYJSXJ6PsGf6KpmP4qvIqzdba4fbbJaykIMiIQ
3289+
y43WYMiDrfVYkdYR6FVW+4+jop9Iy3nkZUqMplJkn5k4NdTVrG/PoMtCjAfrIRcx
3290+
OuuRe2JDpHVf76cvlPhpC9TsCeYAwIzdB2ML5HeqYBg8oOCuCuoOUju0+mowG1Bi
3291+
IXNTMwFgoWuZWADzd8YPRhnKwl3N9eJSTYSUI9MyL65f2kOhGZXSF91JFLTZSBwI
3292+
E5OO1QlDIbbOUuiHu9JgDcZOv8WTasa/AgMBAAGjbjBsMA4GA1UdDwEB/wQEAwIF
3293+
oDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMBoGA1UdEQQTMBGC
3294+
D2xvbmdPSUQuZXhhbXBsZTAbBgNVHSAEFDASMBAGDisGAQQBgjcVCIXHzPsBMA0G
3295+
CSqGSIb3DQEBCwUAA4IBAQByd4veSPttmpSxvtSQfUzm03n6+/w+1T3poM4oKy+U
3296+
dz+H+JyfkRzz9liRFWskucqun+7KyDHbGj27a4NtvIGLoXnVPrvdk/41PreZ4Nbr
3297+
WAz9QnPcSdrit64V7ubMqu+RQZoYRo1KOWWihTx/DEH4C5zoHzU2YI2M4I4YsQZX
3298+
0E7Ew82Pb+d2AlLaA0NhK7O/Gf1zDWoLtLbLqW9wTlMqVAezdP2FSVdbI42Ma1Mr
3299+
CehBpYA/aRsR0WsTNS751lAV2ZE4QkPpF69n2Zak0WpPzLSnjkgfAHJp3k3xc6RH
3300+
Emfp+Qc+eXWQQrjUtf3RfjUE9wAEz/E2vg8ngR+muohs
3301+
-----END CERTIFICATE-----`
3302+
3303+
func TestLargeOID(t *testing.T) {
3304+
// See Issue 49678.
3305+
b, _ := pem.Decode([]byte(largeOIDPEM))
3306+
if b == nil {
3307+
t.Fatalf("couldn't decode test certificate")
3308+
}
3309+
_, err := ParseCertificate(b.Bytes)
3310+
if err != nil {
3311+
t.Fatalf("ParseCertificate to failed to parse certificate with large OID: %s", err)
3312+
}
3313+
}

‎src/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module std
33
go 1.17
44

55
require (
6-
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e
6+
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e
77
golang.org/x/net v0.0.0-20211209100829-84cba5454caf
88
)
99

‎src/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e h1:8foAy0aoO5GkqCvAEJ4VC4P3zksTg4X4aJCDpZzmgQI=
2-
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
1+
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e h1:1SzTfNOXwIS2oWiMF+6qu0OUDKb0dauo6MoDUQyu+yU=
2+
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
33
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
44
golang.org/x/net v0.0.0-20211209100829-84cba5454caf h1:Chci/BE/+xVqrcWnObL99NS8gtXyJrhHDlygBQrggHM=
55
golang.org/x/net v0.0.0-20211209100829-84cba5454caf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=

‎src/vendor/golang.org/x/crypto/cryptobyte/asn1.go

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e
1+
# golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e
22
## explicit; go 1.17
33
golang.org/x/crypto/chacha20
44
golang.org/x/crypto/chacha20poly1305

0 commit comments

Comments
 (0)