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

Change-Id: Iaf618444dd2d99721c19708df9ce2c1f35854efd
This commit is contained in:
Lasse Folger 2022-04-05 09:19:57 +02:00
commit 39cbfe8785
2 changed files with 1 additions and 2 deletions

View file

@ -269,7 +269,6 @@ var cipherSuitesTLS13 = []*cipherSuiteTLS13{ // TODO: replace with a map.
//
// The relative order of ECDSA and RSA cipher suites doesn't matter,
// as they depend on the certificate. Pick one to get a stable order.
//
var cipherSuitesPreferenceOrder = []uint16{
// AEADs w/ ECDHE
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,