mirror of
https://github.com/refraction-networking/utls.git
synced 2025-04-03 20:17:36 +03:00
sync: Go 1.21 with QUIC support (#208)
* sync: Go 1.21rc3, QUIC support added (#207) * sync: merge with upstream tag/go-1.21rc3 (#11) * fix: all tests pass * impl: UQUIC Transport * deps: bump up min Go version * new: uquic * fix: add QUICTransportParameter * deprecated: Go 1.19 no longer supported Go 1.19 will fail to build or pass the test once we bump up to the new version. * sync: crypto/tls: restrict RSA keys in certificates to <= 8192 bits (#209) * [release-branch.go1.21] crypto/tls: restrict RSA keys in certificates to <= 8192 bits Extremely large RSA keys in certificate chains can cause a client/server to expend significant CPU time verifying signatures. Limit this by restricting the size of RSA keys transmitted during handshakes to <= 8192 bits. Based on a survey of publicly trusted RSA keys, there are currently only three certificates in circulation with keys larger than this, and all three appear to be test certificates that are not actively deployed. It is possible there are larger keys in use in private PKIs, but we target the web PKI, so causing breakage here in the interests of increasing the default safety of users of crypto/tls seems reasonable. Thanks to Mateusz Poliwczak for reporting this issue. Fixes CVE-2023-29409 * build: [ci skip] boring not included * fix: typo [ci skip] * docs: replenish readme [ci skip] replace old build status badge with new ones, bump up required version noted in docs, update developer contact to reflect current status.
This commit is contained in:
Gaukas Wang
GitHub
parent
d73321bb14
commit
86e9b69fdd
150 changed files with 13344 additions and 10239 deletions
|
|
@ -6,7 +6,9 @@ package tls
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/x509"
|
||||
"encoding/hex"
|
||||
"math"
|
||||
"math/rand"
|
||||
"reflect"
|
||||
"strings"
|
||||
|
|
@ -15,7 +17,7 @@ import (
|
|||
"time"
|
||||
)
|
||||
|
||||
var tests = []any{
|
||||
var tests = []handshakeMessage{
|
||||
&clientHelloMsg{},
|
||||
&serverHelloMsg{},
|
||||
&finishedMsg{},
|
||||
|
|
@ -28,15 +30,13 @@ var tests = []any{
|
|||
&certificateStatusMsg{},
|
||||
&clientKeyExchangeMsg{},
|
||||
&newSessionTicketMsg{},
|
||||
&sessionState{},
|
||||
&sessionStateTLS13{},
|
||||
&encryptedExtensionsMsg{},
|
||||
&endOfEarlyDataMsg{},
|
||||
&keyUpdateMsg{},
|
||||
&newSessionTicketMsgTLS13{},
|
||||
&certificateRequestMsgTLS13{},
|
||||
&certificateMsgTLS13{},
|
||||
&utlsCompressedCertificateMsg{}, // [UTLS]
|
||||
&SessionState{},
|
||||
}
|
||||
|
||||
func mustMarshal(t *testing.T, msg handshakeMessage) []byte {
|
||||
|
|
@ -51,8 +51,8 @@ func mustMarshal(t *testing.T, msg handshakeMessage) []byte {
|
|||
func TestMarshalUnmarshal(t *testing.T) {
|
||||
rand := rand.New(rand.NewSource(time.Now().UnixNano()))
|
||||
|
||||
for i, iface := range tests {
|
||||
ty := reflect.ValueOf(iface).Type()
|
||||
for i, m := range tests {
|
||||
ty := reflect.ValueOf(m).Type()
|
||||
|
||||
n := 100
|
||||
if testing.Short() {
|
||||
|
|
@ -67,15 +67,18 @@ func TestMarshalUnmarshal(t *testing.T) {
|
|||
|
||||
m1 := v.Interface().(handshakeMessage)
|
||||
marshaled := mustMarshal(t, m1)
|
||||
m2 := iface.(handshakeMessage)
|
||||
if !m2.unmarshal(marshaled) {
|
||||
if !m.unmarshal(marshaled) {
|
||||
t.Errorf("#%d failed to unmarshal %#v %x", i, m1, marshaled)
|
||||
break
|
||||
}
|
||||
m2.marshal() // to fill interface{} marshal cache in the message
|
||||
m.marshal() // to fill any marshal cache in the message
|
||||
|
||||
if !reflect.DeepEqual(m1, m2) {
|
||||
t.Errorf("#%d got:%#v want:%#v %x", i, m2, m1, marshaled)
|
||||
if m, ok := m.(*SessionState); ok {
|
||||
m.activeCertHandles = nil
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(m1, m) {
|
||||
t.Errorf("#%d got:%#v want:%#v %x", i, m, m1, marshaled)
|
||||
break
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +89,7 @@ func TestMarshalUnmarshal(t *testing.T) {
|
|||
// data is optional and the length of the
|
||||
// Finished varies across versions.
|
||||
for j := 0; j < len(marshaled); j++ {
|
||||
if m2.unmarshal(marshaled[0:j]) {
|
||||
if m.unmarshal(marshaled[0:j]) {
|
||||
t.Errorf("#%d unmarshaled a prefix of length %d of %#v", i, j, m1)
|
||||
break
|
||||
}
|
||||
|
|
@ -98,11 +101,9 @@ func TestMarshalUnmarshal(t *testing.T) {
|
|||
|
||||
func TestFuzz(t *testing.T) {
|
||||
rand := rand.New(rand.NewSource(0))
|
||||
for _, iface := range tests {
|
||||
m := iface.(handshakeMessage)
|
||||
|
||||
for _, m := range tests {
|
||||
for j := 0; j < 1000; j++ {
|
||||
len := rand.Intn(100)
|
||||
len := rand.Intn(1000)
|
||||
bytes := randomBytes(len, rand)
|
||||
// This just looks for crashes due to bounds errors etc.
|
||||
m.unmarshal(bytes)
|
||||
|
|
@ -173,6 +174,9 @@ func (*clientHelloMsg) Generate(rand *rand.Rand, size int) reflect.Value {
|
|||
m.secureRenegotiationSupported = true
|
||||
m.secureRenegotiation = randomBytes(rand.Intn(50)+1, rand)
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
m.extendedMasterSecret = true
|
||||
}
|
||||
for i := 0; i < rand.Intn(5); i++ {
|
||||
m.supportedVersions = append(m.supportedVersions, uint16(rand.Intn(0xffff)+1))
|
||||
}
|
||||
|
|
@ -198,6 +202,9 @@ func (*clientHelloMsg) Generate(rand *rand.Rand, size int) reflect.Value {
|
|||
m.pskIdentities = append(m.pskIdentities, psk)
|
||||
m.pskBinders = append(m.pskBinders, randomBytes(rand.Intn(50)+32, rand))
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
m.quicTransportParameters = randomBytes(rand.Intn(500), rand)
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
m.earlyData = true
|
||||
}
|
||||
|
|
@ -232,6 +239,9 @@ func (*serverHelloMsg) Generate(rand *rand.Rand, size int) reflect.Value {
|
|||
m.secureRenegotiationSupported = true
|
||||
m.secureRenegotiation = randomBytes(rand.Intn(50)+1, rand)
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
m.extendedMasterSecret = true
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
m.supportedVersion = uint16(rand.Intn(0xffff) + 1)
|
||||
}
|
||||
|
|
@ -260,6 +270,9 @@ func (*encryptedExtensionsMsg) Generate(rand *rand.Rand, size int) reflect.Value
|
|||
if rand.Intn(10) > 5 {
|
||||
m.alpnProtocol = randomString(rand.Intn(32)+1, rand)
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
m.earlyData = true
|
||||
}
|
||||
|
||||
return reflect.ValueOf(m)
|
||||
}
|
||||
|
|
@ -315,37 +328,86 @@ func (*newSessionTicketMsg) Generate(rand *rand.Rand, size int) reflect.Value {
|
|||
return reflect.ValueOf(m)
|
||||
}
|
||||
|
||||
func (*sessionState) Generate(rand *rand.Rand, size int) reflect.Value {
|
||||
s := &sessionState{}
|
||||
s.vers = uint16(rand.Intn(10000))
|
||||
s.cipherSuite = uint16(rand.Intn(10000))
|
||||
s.masterSecret = randomBytes(rand.Intn(100)+1, rand)
|
||||
var sessionTestCerts []*x509.Certificate
|
||||
|
||||
func init() {
|
||||
cert, err := x509.ParseCertificate(testRSACertificate)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
sessionTestCerts = append(sessionTestCerts, cert)
|
||||
cert, err = x509.ParseCertificate(testRSACertificateIssuer)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
sessionTestCerts = append(sessionTestCerts, cert)
|
||||
}
|
||||
|
||||
func (*SessionState) Generate(rand *rand.Rand, size int) reflect.Value {
|
||||
s := &SessionState{}
|
||||
isTLS13 := rand.Intn(10) > 5
|
||||
if isTLS13 {
|
||||
s.version = VersionTLS13
|
||||
} else {
|
||||
s.version = uint16(rand.Intn(VersionTLS13))
|
||||
}
|
||||
s.isClient = rand.Intn(10) > 5
|
||||
s.cipherSuite = uint16(rand.Intn(math.MaxUint16))
|
||||
s.createdAt = uint64(rand.Int63())
|
||||
for i := 0; i < rand.Intn(20); i++ {
|
||||
s.certificates = append(s.certificates, randomBytes(rand.Intn(500)+1, rand))
|
||||
s.secret = randomBytes(rand.Intn(100)+1, rand)
|
||||
for n, i := rand.Intn(3), 0; i < n; i++ {
|
||||
s.Extra = append(s.Extra, randomBytes(rand.Intn(100), rand))
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
s.EarlyData = true
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
s.extMasterSecret = true
|
||||
}
|
||||
if s.isClient || rand.Intn(10) > 5 {
|
||||
if rand.Intn(10) > 5 {
|
||||
s.peerCertificates = sessionTestCerts
|
||||
} else {
|
||||
s.peerCertificates = sessionTestCerts[:1]
|
||||
}
|
||||
}
|
||||
if rand.Intn(10) > 5 && s.peerCertificates != nil {
|
||||
s.ocspResponse = randomBytes(rand.Intn(100)+1, rand)
|
||||
}
|
||||
if rand.Intn(10) > 5 && s.peerCertificates != nil {
|
||||
for i := 0; i < rand.Intn(2)+1; i++ {
|
||||
s.scts = append(s.scts, randomBytes(rand.Intn(500)+1, rand))
|
||||
}
|
||||
}
|
||||
if len(s.peerCertificates) > 0 {
|
||||
for i := 0; i < rand.Intn(3); i++ {
|
||||
if rand.Intn(10) > 5 {
|
||||
s.verifiedChains = append(s.verifiedChains, s.peerCertificates)
|
||||
} else {
|
||||
s.verifiedChains = append(s.verifiedChains, s.peerCertificates[:1])
|
||||
}
|
||||
}
|
||||
}
|
||||
if rand.Intn(10) > 5 && s.EarlyData {
|
||||
s.alpnProtocol = string(randomBytes(rand.Intn(10), rand))
|
||||
}
|
||||
if s.isClient {
|
||||
if isTLS13 {
|
||||
s.useBy = uint64(rand.Int63())
|
||||
s.ageAdd = uint32(rand.Int63() & math.MaxUint32)
|
||||
}
|
||||
}
|
||||
return reflect.ValueOf(s)
|
||||
}
|
||||
|
||||
func (*sessionStateTLS13) Generate(rand *rand.Rand, size int) reflect.Value {
|
||||
s := &sessionStateTLS13{}
|
||||
s.cipherSuite = uint16(rand.Intn(10000))
|
||||
s.resumptionSecret = randomBytes(rand.Intn(100)+1, rand)
|
||||
s.createdAt = uint64(rand.Int63())
|
||||
for i := 0; i < rand.Intn(2)+1; i++ {
|
||||
s.certificate.Certificate = append(
|
||||
s.certificate.Certificate, randomBytes(rand.Intn(500)+1, rand))
|
||||
func (s *SessionState) marshal() ([]byte, error) { return s.Bytes() }
|
||||
func (s *SessionState) unmarshal(b []byte) bool {
|
||||
ss, err := ParseSessionState(b)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
s.certificate.OCSPStaple = randomBytes(rand.Intn(100)+1, rand)
|
||||
}
|
||||
if rand.Intn(10) > 5 {
|
||||
for i := 0; i < rand.Intn(2)+1; i++ {
|
||||
s.certificate.SignedCertificateTimestamps = append(
|
||||
s.certificate.SignedCertificateTimestamps, randomBytes(rand.Intn(500)+1, rand))
|
||||
}
|
||||
}
|
||||
return reflect.ValueOf(s)
|
||||
*s = *ss
|
||||
return true
|
||||
}
|
||||
|
||||
func (*endOfEarlyDataMsg) Generate(rand *rand.Rand, size int) reflect.Value {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue