Merge pull request #3689 from quic-go/drop-go118

drop support for Go 1.18, use atomic.Bool

.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

.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:

.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

.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:

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:
 

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

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=

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=

integrationtests/self/close_test.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"sync/atomic"
 	"time"
 
 	"github.com/quic-go/quic-go"
 	quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy"
 	"github.com/quic-go/quic-go/internal/protocol"
-	"github.com/quic-go/quic-go/internal/utils"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -30,7 +30,7 @@ var _ = Describe("Connection ID lengths tests", func() {
 				)
 				Expect(err).ToNot(HaveOccurred())
 
-				var drop utils.AtomicBool
+				var drop atomic.Bool
 				dropped := make(chan []byte, 100)
 				proxy, err := quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
 					RemoteAddr: fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port),
@@ -38,7 +38,7 @@ var _ = Describe("Connection ID lengths tests", func() {
 						return 5 * time.Millisecond // 10ms RTT
 					},
 					DropPacket: func(dir quicproxy.Direction, b []byte) bool {
-						if drop := drop.Get(); drop && dir == quicproxy.DirectionOutgoing {
+						if drop := drop.Load(); drop && dir == quicproxy.DirectionOutgoing {
 							dropped <- b
 							return true
 						}
@@ -58,7 +58,7 @@ var _ = Describe("Connection ID lengths tests", func() {
 				sconn, err := server.Accept(context.Background())
 				Expect(err).ToNot(HaveOccurred())
 				time.Sleep(100 * time.Millisecond)
-				drop.Set(true)
+				drop.Store(true)
 				sconn.CloseWithError(1337, "closing")
 
 				// send 100 packets

integrationtests/self/stateless_reset_test.go

@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"math/rand"
 	"net"
+	"sync/atomic"
 	"time"
 
 	"github.com/quic-go/quic-go"
 	quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy"
-	"github.com/quic-go/quic-go/internal/utils"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -45,12 +45,11 @@ var _ = Describe("Stateless Resets", func() {
 				ln.Close()
 			}()
 
-			drop := utils.AtomicBool{}
-
+			var drop atomic.Bool
 			proxy, err := quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
 				RemoteAddr: fmt.Sprintf("localhost:%d", serverPort),
 				DropPacket: func(quicproxy.Direction, []byte) bool {
-					return drop.Get()
+					return drop.Load()
 				},
 			})
 			Expect(err).ToNot(HaveOccurred())
@@ -73,7 +72,7 @@ var _ = Describe("Stateless Resets", func() {
 			Expect(data).To(Equal([]byte("foobar")))
 
 			// make sure that the CONNECTION_CLOSE is dropped
-			drop.Set(true)
+			drop.Store(true)
 			close(closeServer)
 			time.Sleep(100 * time.Millisecond)
 
@@ -83,7 +82,7 @@ var _ = Describe("Stateless Resets", func() {
 				serverConfig,
 			)
 			Expect(err).ToNot(HaveOccurred())
-			drop.Set(false)
+			drop.Store(false)
 
 			acceptStopped := make(chan struct{})
 			go func() {

integrationtests/self/timeout_test.go

@@ -124,12 +124,11 @@ var _ = Describe("Timeout tests", func() {
 			Expect(err).ToNot(HaveOccurred())
 		}()
 
-		drop := utils.AtomicBool{}
-
+		var drop atomic.Bool
 		proxy, err := quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
 			RemoteAddr: fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port),
 			DropPacket: func(quicproxy.Direction, []byte) bool {
-				return drop.Get()
+				return drop.Load()
 			},
 		})
 		Expect(err).ToNot(HaveOccurred())
@@ -148,7 +147,7 @@ var _ = Describe("Timeout tests", func() {
 		_, err = strIn.Read(make([]byte, 6))
 		Expect(err).ToNot(HaveOccurred())
 
-		drop.Set(true)
+		drop.Store(true)
 		time.Sleep(2 * idleTimeout)
 		_, err = strIn.Write([]byte("test"))
 		checkTimeoutError(err)
@@ -251,12 +250,12 @@ var _ = Describe("Timeout tests", func() {
 			Expect(err).ToNot(HaveOccurred())
 			defer server.Close()
 
-			drop := utils.AtomicBool{}
+			var drop atomic.Bool
 			proxy, err := quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
 				RemoteAddr: fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port),
 				DropPacket: func(dir quicproxy.Direction, _ []byte) bool {
 					if dir == quicproxy.DirectionOutgoing {
-						return drop.Get()
+						return drop.Load()
 					}
 					return false
 				},
@@ -282,7 +281,7 @@ var _ = Describe("Timeout tests", func() {
 
 			// wait half the idle timeout, then send a packet
 			time.Sleep(idleTimeout / 2)
-			drop.Set(true)
+			drop.Store(true)
 			str, err := conn.OpenUniStream()
 			Expect(err).ToNot(HaveOccurred())
 			_, err = str.Write([]byte("foobar"))
@@ -331,11 +330,11 @@ var _ = Describe("Timeout tests", func() {
 			close(serverConnClosed)
 		}()
 
-		drop := utils.AtomicBool{}
+		var drop atomic.Bool
 		proxy, err := quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
 			RemoteAddr: fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port),
 			DropPacket: func(quicproxy.Direction, []byte) bool {
-				return drop.Get()
+				return drop.Load()
 			},
 		})
 		Expect(err).ToNot(HaveOccurred())
@@ -361,7 +360,7 @@ var _ = Describe("Timeout tests", func() {
 		Consistently(serverConnClosed).ShouldNot(BeClosed())
 
 		// idle timeout will still kick in if pings are dropped
-		drop.Set(true)
+		drop.Store(true)
 		time.Sleep(2 * idleTimeout)
 		_, err = str.Write([]byte("foobar"))
 		checkTimeoutError(err)

internal/qtls/go118.go

@@ -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,
-	}
-}

internal/qtls/go_oldversion.go

@@ -1,4 +1,4 @@
-//go:build !go1.18
+//go:build !go1.19
 
 package qtls
 

internal/utils/atomic_bool.go

@@ -1,22 +0,0 @@
-package utils
-
-import "sync/atomic"
-
-// An AtomicBool is an atomic bool
-type AtomicBool struct {
-	v int32
-}
-
-// Set sets the value
-func (a *AtomicBool) Set(value bool) {
-	var n int32
-	if value {
-		n = 1
-	}
-	atomic.StoreInt32(&a.v, n)
-}
-
-// Get gets the value
-func (a *AtomicBool) Get() bool {
-	return atomic.LoadInt32(&a.v) != 0
-}

internal/utils/atomic_bool_test.go

@@ -1,29 +0,0 @@
-package utils
-
-import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Atomic Bool", func() {
-	var a *AtomicBool
-
-	BeforeEach(func() {
-		a = &AtomicBool{}
-	})
-
-	It("has the right default value", func() {
-		Expect(a.Get()).To(BeFalse())
-	})
-
-	It("sets the value to true", func() {
-		a.Set(true)
-		Expect(a.Get()).To(BeTrue())
-	})
-
-	It("sets the value to false", func() {
-		a.Set(true)
-		a.Set(false)
-		Expect(a.Get()).To(BeFalse())
-	})
-})

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}"