gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

interop: fix setting of cipher suite for the ChaCha20 test (#3747)

Browse Source
This commit is contained in:
Marten Seemann
2023-04-19 15:29:10 +02:00
committed by GitHub
parent 2359407e11
commit a753cb13d8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
interop/client/main.go
View File

@@ -18,6 +18,7 @@ import (
"github.com/quic-go/quic-go/http3" "github.com/quic-go/quic-go/http3"
"github.com/quic-go/quic-go/internal/handshake" "github.com/quic-go/quic-go/internal/handshake"
"github.com/quic-go/quic-go/internal/protocol" "github.com/quic-go/quic-go/internal/protocol"
"github.com/quic-go/quic-go/internal/qtls"
"github.com/quic-go/quic-go/interop/http09" "github.com/quic-go/quic-go/interop/http09"
"github.com/quic-go/quic-go/interop/utils" "github.com/quic-go/quic-go/interop/utils"
"github.com/quic-go/quic-go/qlog" "github.com/quic-go/quic-go/qlog"
@@ -90,7 +91,8 @@ func runTestcase(testcase string) error {
case "keyupdate": case "keyupdate":
handshake.KeyUpdateInterval = 100 handshake.KeyUpdateInterval = 100
case "chacha20": case "chacha20":
tlsConf.CipherSuites = []uint16{tls.TLS_CHACHA20_POLY1305_SHA256} reset := qtls.SetCipherSuite(tls.TLS_CHACHA20_POLY1305_SHA256)
defer reset()
case "multiconnect": case "multiconnect":
return runMultiConnectTest(r, urls) return runMultiConnectTest(r, urls)
case "versionnegotiation": case "versionnegotiation":

4
interop/server/main.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/quic-go/quic-go" "github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/http3" "github.com/quic-go/quic-go/http3"
"github.com/quic-go/quic-go/internal/qtls"
"github.com/quic-go/quic-go/interop/http09" "github.com/quic-go/quic-go/interop/http09"
"github.com/quic-go/quic-go/interop/utils" "github.com/quic-go/quic-go/interop/utils"
"github.com/quic-go/quic-go/qlog" "github.com/quic-go/quic-go/qlog"
@@ -64,7 +65,8 @@ func main() {
case "versionnegotiation", "handshake", "retry", "transfer", "resumption", "multiconnect": case "versionnegotiation", "handshake", "retry", "transfer", "resumption", "multiconnect":
err = runHTTP09Server(quicConf) err = runHTTP09Server(quicConf)
case "chacha20": case "chacha20":
tlsConf.CipherSuites = []uint16{tls.TLS_CHACHA20_POLY1305_SHA256} reset := qtls.SetCipherSuite(tls.TLS_CHACHA20_POLY1305_SHA256)
defer reset()
err = runHTTP09Server(quicConf) err = runHTTP09Server(quicConf)
case "http3": case "http3":
err = runHTTP3Server(quicConf) err = runHTTP3Server(quicConf)