From 707b70b5d9cddc688fcc16a9e2e7d9d5b29628ec Mon Sep 17 00:00:00 2001
From: Jian Wu <jiwu@mozilla.com>
Date: Mon, 13 Jan 2025 15:21:13 -0500
Subject: [PATCH] adjusted imports and module for replaceable fork

---
 cipher_suites.go                | 2 +-
 examples/ech/main.go            | 2 +-
 examples/old/examples.go        | 2 +-
 examples/tls-resumption/main.go | 2 +-
 go.mod                          | 3 ++-
 internal/quicvarint/varint.go   | 2 +-
 link_test.go                    | 2 +-
 tls_test.go                     | 2 +-
 u_clienthello_json.go           | 2 +-
 u_common.go                     | 2 +-
 u_ech.go                        | 2 +-
 u_ech_test.go                   | 4 ++--
 u_fingerprinter_test.go         | 4 ++--
 u_parrots.go                    | 2 +-
 u_prng.go                       | 2 +-
 u_quic_transport_parameters.go  | 2 +-
 u_tls_extensions.go             | 4 ++--
 17 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cipher_suites.go b/cipher_suites.go
index 4204ff8..27714fc 100644
--- a/cipher_suites.go
+++ b/cipher_suites.go
@@ -19,7 +19,7 @@ import (
 	"hash"
 	"runtime"
 
-	"github.com/refraction-networking/utls/internal/boring"
+	"github.com/jiwu-moz/utls/internal/boring"
 	"golang.org/x/sys/cpu"
 
 	"golang.org/x/crypto/chacha20poly1305"
diff --git a/examples/ech/main.go b/examples/ech/main.go
index 3b9e205..20cb134 100644
--- a/examples/ech/main.go
+++ b/examples/ech/main.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"time"
 
-	tls "github.com/refraction-networking/utls"
+	tls "github.com/jiwu-moz/utls"
 	"golang.org/x/net/http2"
 )
 
diff --git a/examples/old/examples.go b/examples/old/examples.go
index fc7ef2e..1c0b2e1 100644
--- a/examples/old/examples.go
+++ b/examples/old/examples.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"time"
 
-	tls "github.com/refraction-networking/utls"
+	tls "github.com/jiwu-moz/utls"
 	"golang.org/x/net/http2"
 )
 
diff --git a/examples/tls-resumption/main.go b/examples/tls-resumption/main.go
index 861c179..5d6f915 100644
--- a/examples/tls-resumption/main.go
+++ b/examples/tls-resumption/main.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	tls "github.com/refraction-networking/utls"
+	tls "github.com/jiwu-moz/utls"
 )
 
 type ClientSessionCache struct {
diff --git a/go.mod b/go.mod
index e02cb50..db99139 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,5 @@
-module github.com/refraction-networking/utls
+//module github.com/jiwu-moz/utls
+module github.com/jiwu-moz/utls
 
 go 1.22.5
 
diff --git a/internal/quicvarint/varint.go b/internal/quicvarint/varint.go
index e4a1063..e95b10d 100644
--- a/internal/quicvarint/varint.go
+++ b/internal/quicvarint/varint.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/refraction-networking/utls/internal/quicvarint/protocol"
+	"github.com/jiwu-moz/utls/internal/quicvarint/protocol"
 )
 
 // taken from the QUIC draft
diff --git a/link_test.go b/link_test.go
index c034e93..4bbd2fd 100644
--- a/link_test.go
+++ b/link_test.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/refraction-networking/utls/testenv"
+	"github.com/jiwu-moz/utls/testenv"
 )
 
 // Tests that the linker is able to remove references to the Client or Server if unused.
diff --git a/tls_test.go b/tls_test.go
index cecc32f..5620afb 100644
--- a/tls_test.go
+++ b/tls_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/refraction-networking/utls/testenv"
+	"github.com/jiwu-moz/utls/testenv"
 )
 
 var rsaCertPEM = `-----BEGIN CERTIFICATE-----
diff --git a/u_clienthello_json.go b/u_clienthello_json.go
index 027e082..bd8f686 100644
--- a/u_clienthello_json.go
+++ b/u_clienthello_json.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/refraction-networking/utls/dicttls"
+	"github.com/jiwu-moz/utls/dicttls"
 )
 
 var ErrUnknownExtension = errors.New("extension name is unknown to the dictionary")
diff --git a/u_common.go b/u_common.go
index 909afb8..794d834 100644
--- a/u_common.go
+++ b/u_common.go
@@ -13,7 +13,7 @@ import (
 	"hash"
 	"log"
 
-	"github.com/refraction-networking/utls/internal/helper"
+	"github.com/jiwu-moz/utls/internal/helper"
 	"golang.org/x/crypto/cryptobyte"
 )
 
diff --git a/u_ech.go b/u_ech.go
index fad8dd0..01e9fa7 100644
--- a/u_ech.go
+++ b/u_ech.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/cloudflare/circl/hpke"
-	"github.com/refraction-networking/utls/dicttls"
+	"github.com/jiwu-moz/utls/dicttls"
 	"golang.org/x/crypto/cryptobyte"
 )
 
diff --git a/u_ech_test.go b/u_ech_test.go
index 967ceb2..b93886d 100644
--- a/u_ech_test.go
+++ b/u_ech_test.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	tls "github.com/refraction-networking/utls"
-	"github.com/refraction-networking/utls/dicttls"
+	tls "github.com/jiwu-moz/utls"
+	"github.com/jiwu-moz/utls/dicttls"
 )
 
 func TestGREASEECHWrite(t *testing.T) {
diff --git a/u_fingerprinter_test.go b/u_fingerprinter_test.go
index ad140bf..4fef37f 100644
--- a/u_fingerprinter_test.go
+++ b/u_fingerprinter_test.go
@@ -160,8 +160,8 @@ func checkUTLSExtensionsEquality(t *testing.T, expected, actual TLSExtension) {
 }
 
 // Conn.vers is sometimes left to zero which is unacceptable to uTLS' SetTLSVers
-// https://github.com/refraction-networking/utls/blob/f7e7360167ed2903ef12898634512b66f8c3aad0/u_conn.go#L564-L566
-// https://github.com/refraction-networking/utls/blob/f7e7360167ed2903ef12898634512b66f8c3aad0/conn.go#L945-L948
+// https://github.com/jiwu-moz/utls/blob/f7e7360167ed2903ef12898634512b66f8c3aad0/u_conn.go#L564-L566
+// https://github.com/jiwu-moz/utls/blob/f7e7360167ed2903ef12898634512b66f8c3aad0/conn.go#L945-L948
 func createMinTLSVersion(vers uint16) uint16 {
 	if vers == 0 {
 		return VersionTLS10
diff --git a/u_parrots.go b/u_parrots.go
index daf6e72..84bd201 100644
--- a/u_parrots.go
+++ b/u_parrots.go
@@ -18,7 +18,7 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/refraction-networking/utls/dicttls"
+	"github.com/jiwu-moz/utls/dicttls"
 )
 
 var ErrUnknownClientHelloID = errors.New("tls: unknown ClientHelloID")
diff --git a/u_prng.go b/u_prng.go
index cbd8408..7f0500b 100644
--- a/u_prng.go
+++ b/u_prng.go
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  * Released under utls licence:
- * https://github.com/refraction-networking/utls/blob/master/LICENSE
+ * https://github.com/jiwu-moz/utls/blob/master/LICENSE
  */
 
 // This code is a pared down version of:
diff --git a/u_quic_transport_parameters.go b/u_quic_transport_parameters.go
index 53b36cd..9f17fdc 100644
--- a/u_quic_transport_parameters.go
+++ b/u_quic_transport_parameters.go
@@ -6,7 +6,7 @@ import (
 	"math"
 	"math/big"
 
-	"github.com/refraction-networking/utls/internal/quicvarint"
+	"github.com/jiwu-moz/utls/internal/quicvarint"
 )
 
 const (
diff --git a/u_tls_extensions.go b/u_tls_extensions.go
index f68e7b6..96615f9 100644
--- a/u_tls_extensions.go
+++ b/u_tls_extensions.go
@@ -11,7 +11,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/refraction-networking/utls/dicttls"
+	"github.com/jiwu-moz/utls/dicttls"
 	"golang.org/x/crypto/cryptobyte"
 )
 
@@ -1352,7 +1352,7 @@ func (e *PSKKeyExchangeModesExtension) Write(b []byte) (int, error) {
 	// RFC 8446, Section 4.2.9
 	// TODO: PSK Modes have their own form of GREASE-ing which is not currently implemented
 	// the current functionality will NOT re-GREASE/re-randomize these values when using a fingerprinted spec
-	// https://github.com/refraction-networking/utls/pull/58#discussion_r522354105
+	// https://github.com/jiwu-moz/utls/pull/58#discussion_r522354105
 	// https://tools.ietf.org/html/draft-ietf-tls-grease-01#section-2
 	pskModes := []uint8{}
 	if !readUint8LengthPrefixed(&extData, &pskModes) {