4eff8aee0d
CVE-2022-30635,CVE-2022-30632,CVE-2022-28131, CVE-2022-30631,CVE-2022-30629,CVE-2022-30634 Conflict: CVE-2022-1962: src/go/parser/parser.go CVE-2022-1705: src/net/http/transfer.go CVE-2022-30634: src/crypto/rand/rand.go, src/crypto/rand/rand_windows.go Score: CVE-2022-32148: 5.3 CVE-2022-1962: 6.2 CVE-2022-1705: 5.3 CVE-2022-30633: 6.2 CVE-2022-30635: 5.5 CVE-2022-30632: 6.2 CVE-2022-28131: 6.2 CVE-2022-30631: 7.5 CVE-2022-30629: 2.6 CVE-2022-30634: 7.5 Reference: CVE-2022-32148: https://go-review.googlesource.com/c/go/+/415221 CVE-2022-1962: https://go-review.googlesource.com/c/go/+/417070 CVE-2022-1705: https://go-review.googlesource.com/c/go/+/415217 CVE-2022-30633: https://go-review.googlesource.com/c/go/+/417069 CVE-2022-30635: https://go-review.googlesource.com/c/go/+/417074 CVE-2022-30632: https://go-review.googlesource.com/c/go/+/417073 CVE-2022-28131: https://go-review.googlesource.com/c/go/+/417068 CVE-2022-30631: https://go-review.googlesource.com/c/go/+/417071 CVE-2022-30629: https://go-review.googlesource.com/c/go/+/408574 CVE-2022-30634: https://go-review.googlesource.com/c/go/+/406635 Reason: fix CVE CVE-2022-32148: 0064-release-branch.go1.17-net-http-preserve-nil-values-i.patch CVE-2022-1962: 0065-release-branch.go1.17-go-parser-limit-recursion-dept.patch CVE-2022-1705: 0066-release-branch.go1.17-net-http-don-t-strip-whitespac.patch CVE-2022-30633: 0067-release-branch.go1.17-encoding-xml-limit-depth-of-ne.patch CVE-2022-30635: 0068-release-branch.go1.17-encoding-gob-add-a-depth-limit.patch CVE-2022-30632: 0069-release-branch.go1.17-path-filepath-fix-stack-exhaus.patch CVE-2022-28131: 0070-release-branch.go1.17-encoding-xml-use-iterative-Ski.patch CVE-2022-30631: 0071-release-branch.go1.17-compress-gzip-fix-stack-exhaus.patch CVE-2022-30629: 0072-release-branch.go1.17-crypto-tls-randomly-generate-t.patch CVE-2022-30634: 0073-release-branch.go1.17-crypto-rand-properly-handle-la.patch
70 lines
2.3 KiB
Diff
70 lines
2.3 KiB
Diff
From 251fa2dcc814ef51816245336fd1884239dd002a Mon Sep 17 00:00:00 2001
|
|
From: Tatiana Bradley <tatiana@golang.org>
|
|
Date: Thu, 12 May 2022 14:58:29 -0400
|
|
Subject: [PATCH 09/10] [release-branch.go1.17] crypto/tls: randomly generate
|
|
ticket_age_add
|
|
|
|
As required by RFC 8446, section 4.6.1, ticket_age_add now holds a
|
|
random 32-bit value. Before this change, this value was always set
|
|
to 0.
|
|
|
|
This change also documents the reasoning for always setting
|
|
ticket_nonce to 0. The value ticket_nonce must be unique per
|
|
connection, but we only ever send one ticket per connection.
|
|
|
|
Updates #52814
|
|
Fixes #52832
|
|
Fixes CVE-2022-30629
|
|
|
|
Change-Id: I6c2fc6ca0376b7b968abd59d6d3d3854c1ab68bb
|
|
Reviewed-on: https://go-review.googlesource.com/c/go/+/405994
|
|
Reviewed-by: Tatiana Bradley <tatiana@golang.org>
|
|
Reviewed-by: Roland Shoemaker <roland@golang.org>
|
|
Run-TryBot: Tatiana Bradley <tatiana@golang.org>
|
|
TryBot-Result: Gopher Robot <gobot@golang.org>
|
|
(cherry picked from commit fe4de36198794c447fbd9d7cc2d7199a506c76a5)
|
|
Reviewed-on: https://go-review.googlesource.com/c/go/+/408574
|
|
Run-TryBot: Roland Shoemaker <roland@golang.org>
|
|
|
|
Conflict: NA
|
|
Reference: https://go-review.googlesource.com/c/go/+/408574
|
|
---
|
|
src/crypto/tls/handshake_server_tls13.go | 14 ++++++++++++++
|
|
1 file changed, 14 insertions(+)
|
|
|
|
diff --git a/src/crypto/tls/handshake_server_tls13.go b/src/crypto/tls/handshake_server_tls13.go
|
|
index 92d55e0293a..fcea739b9a9 100644
|
|
--- a/src/crypto/tls/handshake_server_tls13.go
|
|
+++ b/src/crypto/tls/handshake_server_tls13.go
|
|
@@ -9,6 +9,7 @@ import (
|
|
"crypto"
|
|
"crypto/hmac"
|
|
"crypto/rsa"
|
|
+ "encoding/binary"
|
|
"errors"
|
|
"hash"
|
|
"io"
|
|
@@ -742,6 +743,19 @@ func (hs *serverHandshakeStateTLS13) sendSessionTickets() error {
|
|
}
|
|
m.lifetime = uint32(maxSessionTicketLifetime / time.Second)
|
|
|
|
+ // ticket_age_add is a random 32-bit value. See RFC 8446, section 4.6.1
|
|
+ // The value is not stored anywhere; we never need to check the ticket age
|
|
+ // because 0-RTT is not supported.
|
|
+ ageAdd := make([]byte, 4)
|
|
+ _, err = hs.c.config.rand().Read(ageAdd)
|
|
+ if err != nil {
|
|
+ return err
|
|
+ }
|
|
+ m.ageAdd = binary.LittleEndian.Uint32(ageAdd)
|
|
+
|
|
+ // ticket_nonce, which must be unique per connection, is always left at
|
|
+ // zero because we only ever send one ticket per connection.
|
|
+
|
|
if _, err := c.writeRecord(recordTypeHandshake, m.marshal()); err != nil {
|
|
return err
|
|
}
|
|
--
|
|
2.30.2
|
|
|