Merge pull request #2794 from lucas-clemente/interop-runner-use-certs

use certificates from /certs directory for the server
This commit is contained in:
Marten Seemann
2020-09-21 17:27:22 +07:00
committed by GitHub
2 changed files with 9 additions and 4 deletions

View File

@@ -27,7 +27,6 @@ FROM martenseemann/quic-network-simulator-endpoint:latest
WORKDIR /quic-go
COPY --from=builder /quic-go/internal/testdata/cert.pem /quic-go/internal/testdata/priv.key internal/testdata/
COPY --from=builder /quic-go/commit.txt /quic-go/server /quic-go/client ./
COPY run_endpoint.sh .

View File

@@ -10,7 +10,6 @@ import (
"github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/http3"
"github.com/lucas-clemente/quic-go/internal/testdata"
"github.com/lucas-clemente/quic-go/interop/http09"
"github.com/lucas-clemente/quic-go/interop/utils"
"github.com/lucas-clemente/quic-go/qlog"
@@ -48,8 +47,15 @@ func main() {
AcceptToken: func(_ net.Addr, _ *quic.Token) bool { return true },
Tracer: qlog.NewTracer(getLogWriter),
}
tlsConf = testdata.GetTLSConfig()
tlsConf.KeyLogWriter = keyLog
cert, err := tls.LoadX509KeyPair("/certs/cert.pem", "/certs/priv.key")
if err != nil {
fmt.Println(err)
os.Exit(1)
}
tlsConf = &tls.Config{
Certificates: []tls.Certificate{cert},
KeyLogWriter: keyLog,
}
switch testcase {
case "versionnegotiation", "handshake", "transfer", "resumption", "zerortt", "multiconnect":