[dev.boringcrypto] all: merge master into dev.boringcrypto

Change-Id: I9246c8228d38559c40e69fa403fa946ac1b31dbe
This commit is contained in:
Filippo Valsorda 2019-02-08 15:36:33 -05:00
commit 96f0ccfb2d
41 changed files with 2727 additions and 1977 deletions

View file

@ -151,10 +151,10 @@ func (*clientHelloMsg) Generate(rand *rand.Rand, size int) reflect.Value {
}
}
if rand.Intn(10) > 5 {
m.supportedSignatureAlgorithms = supportedSignatureAlgorithms()
m.supportedSignatureAlgorithms = supportedSignatureAlgorithms(VersionTLS13)
}
if rand.Intn(10) > 5 {
m.supportedSignatureAlgorithmsCert = supportedSignatureAlgorithms()
m.supportedSignatureAlgorithmsCert = supportedSignatureAlgorithms(VersionTLS13)
}
for i := 0; i < rand.Intn(5); i++ {
m.alpnProtocols = append(m.alpnProtocols, randomString(rand.Intn(20)+1, rand))
@ -386,10 +386,10 @@ func (*certificateRequestMsgTLS13) Generate(rand *rand.Rand, size int) reflect.V
m.scts = true
}
if rand.Intn(10) > 5 {
m.supportedSignatureAlgorithms = supportedSignatureAlgorithms()
m.supportedSignatureAlgorithms = supportedSignatureAlgorithms(VersionTLS13)
}
if rand.Intn(10) > 5 {
m.supportedSignatureAlgorithmsCert = supportedSignatureAlgorithms()
m.supportedSignatureAlgorithmsCert = supportedSignatureAlgorithms(VersionTLS13)
}
if rand.Intn(10) > 5 {
m.certificateAuthorities = make([][]byte, 3)