From 354281fc6a291a02631f33d9f07ddbf259a78199 Mon Sep 17 00:00:00 2001 From: Bas Westerbaan Date: Wed, 15 Feb 2023 13:28:26 +0100 Subject: [PATCH] RTG-2476 Add qtls override for Go 1.20 --- go.mod | 8 +++++--- vendor/modules.txt | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 126b32bb..ff644e18 100644 --- a/go.mod +++ b/go.mod @@ -114,9 +114,11 @@ replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 // Post-quantum tunnel RTG-1339 replace ( - // branch go1.18 + // Branches go1.18 go1.19 go1.20 on github.com/cloudflare/qtls-pq github.com/marten-seemann/qtls-go1-18 => github.com/cloudflare/qtls-pq v0.0.0-20230103171413-e7a2fb559a0e - - // branch go1.19 github.com/marten-seemann/qtls-go1-19 => github.com/cloudflare/qtls-pq v0.0.0-20230103171656-05e84f90909e + github.com/marten-seemann/qtls-go1-20 => github.com/cloudflare/qtls-pq v0.0.0-20230215110727-8b4e1699c2a8 + github.com/quic-go/qtls-go1-18 => github.com/cloudflare/qtls-pq v0.0.0-20230103171413-e7a2fb559a0e + github.com/quic-go/qtls-go1-19 => github.com/cloudflare/qtls-pq v0.0.0-20230103171656-05e84f90909e + github.com/quic-go/qtls-go1-20 => github.com/cloudflare/qtls-pq v0.0.0-20230215110727-8b4e1699c2a8 ) diff --git a/vendor/modules.txt b/vendor/modules.txt index c6e4580f..3cb3ecd6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -601,3 +601,7 @@ zombiezen.com/go/capnproto2/std/capnp/rpc # gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 # github.com/marten-seemann/qtls-go1-18 => github.com/cloudflare/qtls-pq v0.0.0-20230103171413-e7a2fb559a0e # github.com/marten-seemann/qtls-go1-19 => github.com/cloudflare/qtls-pq v0.0.0-20230103171656-05e84f90909e +# github.com/marten-seemann/qtls-go1-20 => github.com/cloudflare/qtls-pq v0.0.0-20230215110727-8b4e1699c2a8 +# github.com/quic-go/qtls-go1-18 => github.com/cloudflare/qtls-pq v0.0.0-20230103171413-e7a2fb559a0e +# github.com/quic-go/qtls-go1-19 => github.com/cloudflare/qtls-pq v0.0.0-20230103171656-05e84f90909e +# github.com/quic-go/qtls-go1-20 => github.com/cloudflare/qtls-pq v0.0.0-20230215110727-8b4e1699c2a8