Skip to content

Commit 0d6f856

Browse files
grpc/rocsp: Allow use of TLSv1.2 and TLSv1.3 (#6600)
When we clamped our MaxVersion to TLS1.2, there wasn't any support for TLS1.3 yet. Allowing higher versions to be negotiated is good. Fixes #6580
1 parent 55e5a24 commit 0d6f856

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

cmd/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ func (t *TLSConfig) Load() (*tls.Config, error) {
178178
ClientCAs: rootCAs,
179179
ClientAuth: tls.RequireAndVerifyClientCert,
180180
Certificates: []tls.Certificate{cert},
181-
// Set the only acceptable TLS version to 1.2 and the only acceptable cipher suite
182-
// to ECDHE-RSA-CHACHA20-POLY1305.
183-
MinVersion: tls.VersionTLS12,
184-
MaxVersion: tls.VersionTLS12,
181+
// Set the only acceptable TLS to v1.2 and v1.3.
182+
MinVersion: tls.VersionTLS12,
183+
MaxVersion: tls.VersionTLS13,
184+
// CipherSuites will be ignored for TLS v1.3.
185185
CipherSuites: []uint16{tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305},
186186
}, nil
187187
}

test/redis-cluster.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ user replication-user on +@all ~* >435e9c4225f08813ef3af7c725f0d30d263b9cd3
2828
user unittest-rw on +@all ~* >824968fa490f4ecec1e52d5e34916bdb60d45f8d
2929
masteruser replication-user
3030
masterauth 435e9c4225f08813ef3af7c725f0d30d263b9cd3
31+
tls-protocols "TLSv1.3"
3132
tls-cert-file /test/redis-tls/redis/cert.pem
3233
tls-key-file /test/redis-tls/redis/key.pem
3334
tls-ca-cert-file /test/redis-tls/minica.pem

test/redis.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ user replication-user on +@all ~* >435e9c4225f08813ef3af7c725f0d30d263b9cd3
2828
user unittest-rw on +@all ~* >824968fa490f4ecec1e52d5e34916bdb60d45f8d
2929
masteruser replication-user
3030
masterauth 435e9c4225f08813ef3af7c725f0d30d263b9cd3
31+
tls-protocols "TLSv1.3"
3132
tls-cert-file /test/redis-tls/redis/cert.pem
3233
tls-key-file /test/redis-tls/redis/key.pem
3334
tls-ca-cert-file /test/redis-tls/minica.pem

0 commit comments

Comments
 (0)