From 8f5bbaa5b0660b9bdfd65a8136c1535562bb6965 Mon Sep 17 00:00:00 2001 From: WendelHime <6754291+WendelHime@users.noreply.github.com> Date: Tue, 29 Oct 2024 11:27:05 -0300 Subject: [PATCH] chore: replacing utls listener by crypto/tls --- go.mod | 1 - go.sum | 4 ---- http_proxy.go | 5 ++--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 9fd48750..2986a704 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,6 @@ require ( github.com/blang/vfs v1.0.0 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cloudflare/circl v1.3.7 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dchest/siphash v1.2.3 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect diff --git a/go.sum b/go.sum index 0d02be0b..a0a22edc 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= -github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -429,8 +427,6 @@ github.com/quic-go/quic-go v0.40.0 h1:GYd1iznlKm7dpHD7pOVpUvItgMPo/jrMgDWZhMCecq github.com/quic-go/quic-go v0.40.0/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c= github.com/refraction-networking/utls v1.3.3 h1:f/TBLX7KBciRyFH3bwupp+CE4fzoYKCirhdRcC490sw= github.com/refraction-networking/utls v1.3.3/go.mod h1:DlecWW1LMlMJu+9qpzzQqdHDT/C2LAe03EdpLUz/RL8= -github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM= -github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= github.com/refraction-networking/water v0.7.0-alpha h1:yLMAvIi0lHHD2mvwx63GLnptpjvnmBCWFvTHTWLykLk= github.com/refraction-networking/water v0.7.0-alpha/go.mod h1:VPQENA6E5+2V5RlX/yaBlTCKeFQ25j49DUc/pmmwkXE= github.com/refraction-networking/wazero v1.7.1-w h1:z7Ty5PsMkJEDBCsn3ELUjceQGBT0FMVGldOSpDK3giQ= diff --git a/http_proxy.go b/http_proxy.go index 8e7903d8..287f38bd 100644 --- a/http_proxy.go +++ b/http_proxy.go @@ -33,7 +33,6 @@ import ( "github.com/getlantern/http-proxy-lantern/v2/otel" shadowsocks "github.com/getlantern/http-proxy-lantern/v2/shadowsocks" "github.com/getlantern/http-proxy-lantern/v2/starbridge" - utls "github.com/refraction-networking/utls" "github.com/xtaci/smux" @@ -1038,12 +1037,12 @@ func (p *Proxy) listenWATER(addr string) (net.Listener, error) { if err != nil { log.Fatalf("Unable to read key file: %v", err) } - cert, err := utls.X509KeyPair([]byte(certPEM), []byte(keyPEM)) + cert, err := tls.X509KeyPair([]byte(certPEM), []byte(keyPEM)) if err != nil { return nil, log.Errorf("failed to load cert: %w", err) } - return utls.Listen("tcp", addr, &utls.Config{Certificates: []utls.Certificate{cert}}) + return tls.Listen("tcp", addr, &tls.Config{Certificates: []tls.Certificate{cert}}) default: return nil, log.Errorf("unsupported mismatch protocol provided: %s", p.WaterMismatchProtocol) }