Skip to content

Commit a1ce550

Browse files
FiloSottileFiloSottile
committed
all: update vendored golang.org/x/crypto for cryptobyte fix
Fixes #49678 Change-Id: I47dd959a787180a67856e60dfa6eba3ddd045972 Reviewed-on: https://go-review.googlesource.com/c/go/+/373360 Run-TryBot: Filippo Valsorda <[email protected]> Reviewed-by: Emmanuel Odeke <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Trust: Filippo Valsorda <[email protected]>
1 parent 9502339 commit a1ce550

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
@@ -13,7 +13,7 @@ require (
1313

1414
require (
1515
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d // indirect
16-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
16+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
1717
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
1818
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
1919
)

‎src/cmd/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d h1:uGg2frl
77
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
88
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU=
99
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
10-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4=
11-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
10+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
11+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1212
golang.org/x/mod v0.6.0-dev.0.20211102181907-3a5865c02020 h1:HjtpZuJcnSa+yHlL4Y5aypjDvbHkJne5FS8JRmKI2+I=
1313
golang.org/x/mod v0.6.0-dev.0.20211102181907-3a5865c02020/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
1414
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=

‎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-20211108221036-ceb1ce70b4fa
27+
# golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
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
@@ -3253,3 +3253,98 @@ func TestAuthKeyIdOptional(t *testing.T) {
32533253
t.Fatalf("ParseCertificate to failed to parse certificate with optional authority key identifier fields: %s", err)
32543254
}
32553255
}
3256+
3257+
const largeOIDPEM = `
3258+
Certificate:
3259+
Data:
3260+
Version: 3 (0x2)
3261+
Serial Number:
3262+
da:ba:53:19:1b:09:4b:82:b2:89:26:7d:c7:6f:a0:02
3263+
Signature Algorithm: sha256WithRSAEncryption
3264+
Issuer: O = Acme Co
3265+
Validity
3266+
Not Before: Dec 21 16:59:27 2021 GMT
3267+
Not After : Dec 21 16:59:27 2022 GMT
3268+
Subject: O = Acme Co
3269+
Subject Public Key Info:
3270+
Public Key Algorithm: rsaEncryption
3271+
RSA Public-Key: (2048 bit)
3272+
Modulus:
3273+
00:bf:17:16:d8:bc:29:9c:16:e5:76:b4:93:15:78:
3274+
ad:6e:45:c5:4a:63:46:a1:b2:76:71:65:51:9c:14:
3275+
c4:ea:74:13:e4:34:df:2f:2c:65:11:e8:56:52:69:
3276+
11:f9:0e:fc:77:bb:63:a8:7c:1a:c6:a1:7b:6e:6c:
3277+
e7:18:25:25:c9:e8:fb:06:7f:a2:a9:98:fe:2a:bc:
3278+
8a:b3:75:b6:b8:7d:b6:c9:6b:29:08:32:22:10:cb:
3279+
8d:d6:60:c8:83:ad:f5:58:91:d6:11:e8:55:56:fb:
3280+
8f:a3:a2:9f:48:cb:79:e4:65:4a:8c:a6:52:64:9f:
3281+
99:38:35:d4:d5:ac:6f:cf:a0:cb:42:8c:07:eb:21:
3282+
17:31:3a:eb:91:7b:62:43:a4:75:5f:ef:a7:2f:94:
3283+
f8:69:0b:d4:ec:09:e6:00:c0:8c:dd:07:63:0b:e4:
3284+
77:aa:60:18:3c:a0:e0:ae:0a:ea:0e:52:3b:b4:fa:
3285+
6a:30:1b:50:62:21:73:53:33:01:60:a1:6b:99:58:
3286+
00:f3:77:c6:0f:46:19:ca:c2:5d:cd:f5:e2:52:4d:
3287+
84:94:23:d3:32:2f:ae:5f:da:43:a1:19:95:d2:17:
3288+
dd:49:14:b4:d9:48:1c:08:13:93:8e:d5:09:43:21:
3289+
b6:ce:52:e8:87:bb:d2:60:0d:c6:4e:bf:c5:93:6a:
3290+
c6:bf
3291+
Exponent: 65537 (0x10001)
3292+
X509v3 extensions:
3293+
X509v3 Key Usage: critical
3294+
Digital Signature, Key Encipherment
3295+
X509v3 Extended Key Usage:
3296+
TLS Web Server Authentication
3297+
X509v3 Basic Constraints: critical
3298+
CA:FALSE
3299+
X509v3 Subject Alternative Name:
3300+
DNS:longOID.example
3301+
X509v3 Certificate Policies:
3302+
Policy: 1.3.6.1.4.1.311.21.8.1492336001
3303+
3304+
Signature Algorithm: sha256WithRSAEncryption
3305+
72:77:8b:de:48:fb:6d:9a:94:b1:be:d4:90:7d:4c:e6:d3:79:
3306+
fa:fb:fc:3e:d5:3d:e9:a0:ce:28:2b:2f:94:77:3f:87:f8:9c:
3307+
9f:91:1c:f3:f6:58:91:15:6b:24:b9:ca:ae:9f:ee:ca:c8:31:
3308+
db:1a:3d:bb:6b:83:6d:bc:81:8b:a1:79:d5:3e:bb:dd:93:fe:
3309+
35:3e:b7:99:e0:d6:eb:58:0c:fd:42:73:dc:49:da:e2:b7:ae:
3310+
15:ee:e6:cc:aa:ef:91:41:9a:18:46:8d:4a:39:65:a2:85:3c:
3311+
7f:0c:41:f8:0b:9c:e8:1f:35:36:60:8d:8c:e0:8e:18:b1:06:
3312+
57:d0:4e:c4:c3:cd:8f:6f:e7:76:02:52:da:03:43:61:2b:b3:
3313+
bf:19:fd:73:0d:6a:0b:b4:b6:cb:a9:6f:70:4e:53:2a:54:07:
3314+
b3:74:fd:85:49:57:5b:23:8d:8c:6b:53:2b:09:e8:41:a5:80:
3315+
3f:69:1b:11:d1:6b:13:35:2e:f9:d6:50:15:d9:91:38:42:43:
3316+
e9:17:af:67:d9:96:a4:d1:6a:4f:cc:b4:a7:8e:48:1f:00:72:
3317+
69:de:4d:f1:73:a4:47:12:67:e9:f9:07:3e:79:75:90:42:b8:
3318+
d4:b5:fd:d1:7e:35:04:f7:00:04:cf:f1:36:be:0f:27:81:1f:
3319+
a6:ba:88:6c
3320+
-----BEGIN CERTIFICATE-----
3321+
MIIDHTCCAgWgAwIBAgIRANq6UxkbCUuCsokmfcdvoAIwDQYJKoZIhvcNAQELBQAw
3322+
EjEQMA4GA1UEChMHQWNtZSBDbzAeFw0yMTEyMjExNjU5MjdaFw0yMjEyMjExNjU5
3323+
MjdaMBIxEDAOBgNVBAoTB0FjbWUgQ28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
3324+
ggEKAoIBAQC/FxbYvCmcFuV2tJMVeK1uRcVKY0ahsnZxZVGcFMTqdBPkNN8vLGUR
3325+
6FZSaRH5Dvx3u2OofBrGoXtubOcYJSXJ6PsGf6KpmP4qvIqzdba4fbbJaykIMiIQ
3326+
y43WYMiDrfVYkdYR6FVW+4+jop9Iy3nkZUqMplJkn5k4NdTVrG/PoMtCjAfrIRcx
3327+
OuuRe2JDpHVf76cvlPhpC9TsCeYAwIzdB2ML5HeqYBg8oOCuCuoOUju0+mowG1Bi
3328+
IXNTMwFgoWuZWADzd8YPRhnKwl3N9eJSTYSUI9MyL65f2kOhGZXSF91JFLTZSBwI
3329+
E5OO1QlDIbbOUuiHu9JgDcZOv8WTasa/AgMBAAGjbjBsMA4GA1UdDwEB/wQEAwIF
3330+
oDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMBoGA1UdEQQTMBGC
3331+
D2xvbmdPSUQuZXhhbXBsZTAbBgNVHSAEFDASMBAGDisGAQQBgjcVCIXHzPsBMA0G
3332+
CSqGSIb3DQEBCwUAA4IBAQByd4veSPttmpSxvtSQfUzm03n6+/w+1T3poM4oKy+U
3333+
dz+H+JyfkRzz9liRFWskucqun+7KyDHbGj27a4NtvIGLoXnVPrvdk/41PreZ4Nbr
3334+
WAz9QnPcSdrit64V7ubMqu+RQZoYRo1KOWWihTx/DEH4C5zoHzU2YI2M4I4YsQZX
3335+
0E7Ew82Pb+d2AlLaA0NhK7O/Gf1zDWoLtLbLqW9wTlMqVAezdP2FSVdbI42Ma1Mr
3336+
CehBpYA/aRsR0WsTNS751lAV2ZE4QkPpF69n2Zak0WpPzLSnjkgfAHJp3k3xc6RH
3337+
Emfp+Qc+eXWQQrjUtf3RfjUE9wAEz/E2vg8ngR+muohs
3338+
-----END CERTIFICATE-----`
3339+
3340+
func TestLargeOID(t *testing.T) {
3341+
// See Issue 49678.
3342+
b, _ := pem.Decode([]byte(largeOIDPEM))
3343+
if b == nil {
3344+
t.Fatalf("couldn't decode test certificate")
3345+
}
3346+
_, err := ParseCertificate(b.Bytes)
3347+
if err != nil {
3348+
t.Fatalf("ParseCertificate to failed to parse certificate with large OID: %s", err)
3349+
}
3350+
}

‎src/go.mod

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

55
require (
6-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
6+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
77
golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4=
2-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
2+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
33
golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
44
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
55
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E=

‎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-20211108221036-ceb1ce70b4fa
1+
# golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
22
## explicit; go 1.17
33
golang.org/x/crypto/chacha20
44
golang.org/x/crypto/chacha20poly1305

0 commit comments

Comments
 (0)