From f42357f096821d3836cb04518d31da5f589bb715 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 2 Feb 2023 11:29:39 +1300 Subject: [PATCH] drop qtls support for Go 1.18 --- .circleci/config.yml | 12 +--- .github/workflows/cross-compile.yml | 2 +- .github/workflows/integration.yml | 2 +- .github/workflows/unit.yml | 2 +- README.md | 2 +- go.mod | 3 +- go.sum | 2 - integrationtests/gomodvendor/go.sum | 2 - internal/qtls/go118.go | 99 ----------------------------- internal/qtls/go_oldversion.go | 2 +- interop/Dockerfile | 6 +- 11 files changed, 10 insertions(+), 124 deletions(-) delete mode 100644 internal/qtls/go118.go diff --git a/.circleci/config.yml b/.circleci/config.yml index d5343057..3cb867f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,5 @@ version: 2.1 executors: - test-go118: - docker: - - image: "cimg/go:1.18" - environment: - runrace: true - TIMESCALE_FACTOR: 3 test-go119: docker: - image: "cimg/go:1.19" @@ -21,7 +15,7 @@ executors: jobs: "test": &test - executor: test-go118 + executor: test-go119 steps: - checkout - run: @@ -39,11 +33,8 @@ jobs: - run: name: "Run self integration tests with qlog" command: go run github.com/onsi/ginkgo/v2/ginkgo -v -randomize-all -trace integrationtests/self -- -qlog - go118: - <<: *test go119: <<: *test - executor: test-go119 go120: <<: *test executor: test-go120 @@ -51,6 +42,5 @@ jobs: workflows: workflow: jobs: - - go118 - go119 - go120 diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index 639d8b74..fc2c6ac8 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -4,7 +4,7 @@ jobs: strategy: fail-fast: false matrix: - go: [ "1.18.x", "1.19.x", "1.20.x" ] + go: [ "1.19.x", "1.20.x" ] runs-on: ubuntu-latest name: "Cross Compilation (Go ${{matrix.go}})" steps: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 94c2c910..07b7dc99 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: false matrix: - go: [ "1.18.x", "1.19.x", "1.20.x" ] + go: [ "1.19.x", "1.20.x" ] runs-on: ubuntu-latest env: DEBUG: false # set this to true to export qlogs and save them as artifacts diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index c0e533dc..6995132c 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -7,7 +7,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu", "windows", "macos" ] - go: [ "1.18.x", "1.19.x", "1.20.x" ] + go: [ "1.19.x", "1.20.x" ] runs-on: ${{ matrix.os }}-latest name: Unit tests (${{ matrix.os}}, Go ${{ matrix.go }}) steps: diff --git a/README.md b/README.md index dcee6998..977bb928 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ In addition to the RFCs listed above, it currently implements the [IETF QUIC dra ## Guides -*We currently support Go 1.18.x and Go 1.19.x and Go 1.20.x* +*We currently support Go 1.19.x and Go 1.20.x* Running tests: diff --git a/go.mod b/go.mod index f8659320..b7886604 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/quic-go/quic-go -go 1.18 +go 1.19 require ( github.com/francoispqt/gojay v1.2.13 @@ -8,7 +8,6 @@ require ( github.com/onsi/ginkgo/v2 v2.2.0 github.com/onsi/gomega v1.20.1 github.com/quic-go/qpack v0.4.0 - github.com/quic-go/qtls-go1-18 v0.2.0 github.com/quic-go/qtls-go1-19 v0.2.0 github.com/quic-go/qtls-go1-20 v0.1.0 golang.org/x/crypto v0.4.0 diff --git a/go.sum b/go.sum index dfc9b844..49650320 100644 --- a/go.sum +++ b/go.sum @@ -88,8 +88,6 @@ github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7q github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U= -github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc= github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk= github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI= diff --git a/integrationtests/gomodvendor/go.sum b/integrationtests/gomodvendor/go.sum index 3b64fd58..21493a12 100644 --- a/integrationtests/gomodvendor/go.sum +++ b/integrationtests/gomodvendor/go.sum @@ -111,8 +111,6 @@ github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7q github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U= -github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc= github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk= github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI= diff --git a/internal/qtls/go118.go b/internal/qtls/go118.go deleted file mode 100644 index e47dfe4c..00000000 --- a/internal/qtls/go118.go +++ /dev/null @@ -1,99 +0,0 @@ -//go:build go1.18 && !go1.19 - -package qtls - -import ( - "crypto" - "crypto/cipher" - "crypto/tls" - "net" - "unsafe" - - "github.com/quic-go/qtls-go1-18" -) - -type ( - // Alert is a TLS alert - Alert = qtls.Alert - // A Certificate is qtls.Certificate. - Certificate = qtls.Certificate - // CertificateRequestInfo contains inforamtion about a certificate request. - CertificateRequestInfo = qtls.CertificateRequestInfo - // A CipherSuiteTLS13 is a cipher suite for TLS 1.3 - CipherSuiteTLS13 = qtls.CipherSuiteTLS13 - // ClientHelloInfo contains information about a ClientHello. - ClientHelloInfo = qtls.ClientHelloInfo - // ClientSessionCache is a cache used for session resumption. - ClientSessionCache = qtls.ClientSessionCache - // ClientSessionState is a state needed for session resumption. - ClientSessionState = qtls.ClientSessionState - // A Config is a qtls.Config. - Config = qtls.Config - // A Conn is a qtls.Conn. - Conn = qtls.Conn - // ConnectionState contains information about the state of the connection. - ConnectionState = qtls.ConnectionStateWith0RTT - // EncryptionLevel is the encryption level of a message. - EncryptionLevel = qtls.EncryptionLevel - // Extension is a TLS extension - Extension = qtls.Extension - // ExtraConfig is the qtls.ExtraConfig - ExtraConfig = qtls.ExtraConfig - // RecordLayer is a qtls RecordLayer. - RecordLayer = qtls.RecordLayer -) - -const ( - // EncryptionHandshake is the Handshake encryption level - EncryptionHandshake = qtls.EncryptionHandshake - // Encryption0RTT is the 0-RTT encryption level - Encryption0RTT = qtls.Encryption0RTT - // EncryptionApplication is the application data encryption level - EncryptionApplication = qtls.EncryptionApplication -) - -// AEADAESGCMTLS13 creates a new AES-GCM AEAD for TLS 1.3 -func AEADAESGCMTLS13(key, fixedNonce []byte) cipher.AEAD { - return qtls.AEADAESGCMTLS13(key, fixedNonce) -} - -// Client returns a new TLS client side connection. -func Client(conn net.Conn, config *Config, extraConfig *ExtraConfig) *Conn { - return qtls.Client(conn, config, extraConfig) -} - -// Server returns a new TLS server side connection. -func Server(conn net.Conn, config *Config, extraConfig *ExtraConfig) *Conn { - return qtls.Server(conn, config, extraConfig) -} - -func GetConnectionState(conn *Conn) ConnectionState { - return conn.ConnectionStateWith0RTT() -} - -// ToTLSConnectionState extracts the tls.ConnectionState -func ToTLSConnectionState(cs ConnectionState) tls.ConnectionState { - return cs.ConnectionState -} - -type cipherSuiteTLS13 struct { - ID uint16 - KeyLen int - AEAD func(key, fixedNonce []byte) cipher.AEAD - Hash crypto.Hash -} - -//go:linkname cipherSuiteTLS13ByID github.com/quic-go/qtls-go1-18.cipherSuiteTLS13ByID -func cipherSuiteTLS13ByID(id uint16) *cipherSuiteTLS13 - -// CipherSuiteTLS13ByID gets a TLS 1.3 cipher suite. -func CipherSuiteTLS13ByID(id uint16) *CipherSuiteTLS13 { - val := cipherSuiteTLS13ByID(id) - cs := (*cipherSuiteTLS13)(unsafe.Pointer(val)) - return &qtls.CipherSuiteTLS13{ - ID: cs.ID, - KeyLen: cs.KeyLen, - AEAD: cs.AEAD, - Hash: cs.Hash, - } -} diff --git a/internal/qtls/go_oldversion.go b/internal/qtls/go_oldversion.go index f433b328..e15f0362 100644 --- a/internal/qtls/go_oldversion.go +++ b/internal/qtls/go_oldversion.go @@ -1,4 +1,4 @@ -//go:build !go1.18 +//go:build !go1.19 package qtls diff --git a/interop/Dockerfile b/interop/Dockerfile index 14f78b77..d83d5ce8 100644 --- a/interop/Dockerfile +++ b/interop/Dockerfile @@ -2,9 +2,9 @@ FROM martenseemann/quic-network-simulator-endpoint:latest AS builder RUN apt-get update && apt-get install -y wget tar git -RUN wget https://dl.google.com/go/go1.18.linux-amd64.tar.gz && \ - tar xfz go1.18.linux-amd64.tar.gz && \ - rm go1.18.linux-amd64.tar.gz +RUN wget https://dl.google.com/go/go1.20.linux-amd64.tar.gz && \ + tar xfz go1.20.linux-amd64.tar.gz && \ + rm go1.20.linux-amd64.tar.gz ENV PATH="/go/bin:${PATH}"