upgrade deps to [email protected]

xtaci · Jul 3, 2024 · 1255da1 · 1255da1
1 parent e8218e9
commit 1255da1
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 26 deletions.
diff --git a/client/main.go b/client/main.go
@@ -424,6 +424,18 @@ func main() {
 		log.Println("tcp:", config.TCP)
 		log.Println("pprof:", config.Pprof)
 
+		if config.QPP {
+			minSeedLength := qpp.QPPMinimumSeedLength(8)
+			if len(config.Key) < minSeedLength {
+				log.Println("QPP Warning: key size %d, required %d bytes at least", len(config.Key), minSeedLength)
+			}
+
+			minPads := qpp.QPPMinimumPads(8)
+			if config.QPPCount < minPads {
+				log.Println("QPP Warning: QPPCount %d, required %d at least", config.QPPCount, minPads)
+			}
+		}
+
 		// parameters check
 		if config.SmuxVer > maxSmuxVer {
 			log.Fatal("unsupported smux version:", config.SmuxVer)
@@ -542,7 +554,7 @@ func main() {
 		// create shared QPP
 		var _Q_ *qpp.QuantumPermutationPad
 		if config.QPP {
-			_Q_ = qpp.NewQPP(pass, uint16(config.QPPCount), QUBIT)
+			_Q_ = qpp.NewQPP([]byte(config.Key), uint16(config.QPPCount), QUBIT)
 		}
 
 		for {
@@ -565,7 +577,7 @@ func main() {
 			if !config.QPP {
 				go handleClient(muxes[idx].session, p1, config.Quiet)
 			} else {
-				go handleQPPClient(_Q_, pass, muxes[idx].session, p1, config.Quiet)
+				go handleQPPClient(_Q_, []byte(config.Key), muxes[idx].session, p1, config.Quiet)
 			}
 			rr++
 		}

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/urfave/cli v1.22.15
 	github.com/xtaci/kcp-go/v5 v5.6.8
-	github.com/xtaci/qpp v1.1.3
+	github.com/xtaci/qpp v1.1.4
 	github.com/xtaci/smux v1.5.24
 	github.com/xtaci/tcpraw v1.2.25
 	golang.org/x/crypto v0.24.0

diff --git a/go.sum b/go.sum
@@ -79,6 +79,8 @@ github.com/xtaci/qpp v1.1.2 h1:QDJgYCtZdmKNKZ24uNPLq3cgHnp2irnJJBRtQ0gWZlU=
 github.com/xtaci/qpp v1.1.2/go.mod h1:dJS3usaXNMbWxZSWCAdxz01UgJcz9wXDkd4BccDY/V0=
 github.com/xtaci/qpp v1.1.3 h1:mYCWbvT4c9EItrVsSD8J3KIW83zBfEQ6dZDfFs0rHZs=
 github.com/xtaci/qpp v1.1.3/go.mod h1:dJS3usaXNMbWxZSWCAdxz01UgJcz9wXDkd4BccDY/V0=
+github.com/xtaci/qpp v1.1.4 h1:J4uUJy+7KVFWTduuIQr/MCiD9Ik8x7AblOtYbwMhC+s=
+github.com/xtaci/qpp v1.1.4/go.mod h1:dJS3usaXNMbWxZSWCAdxz01UgJcz9wXDkd4BccDY/V0=
 github.com/xtaci/smux v1.5.24 h1:77emW9dtnOxxOQ5ltR+8BbsX1kzcOxQ5gB+aaV9hXOY=
 github.com/xtaci/smux v1.5.24/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY=
 github.com/xtaci/tcpraw v1.2.25 h1:VDlqo0op17JeXBM6e2G9ocCNLOJcw9mZbobMbJjo0vk=

diff --git a/server/main.go b/server/main.go
@@ -38,7 +38,7 @@ const (
 var VERSION = "SELFBUILD"
 
 // handle multiplex-ed connection
-func handleMux(_Q_ *qpp.QuantumPermutationPad, conn net.Conn, config *Config, seed []byte) {
+func handleMux(_Q_ *qpp.QuantumPermutationPad, conn net.Conn, config *Config) {
 	// check if target is unix domain socket
 	var isUnix bool
 	if _, _, err := net.SplitHostPort(config.Target); err != nil {
@@ -84,7 +84,7 @@ func handleMux(_Q_ *qpp.QuantumPermutationPad, conn net.Conn, config *Config, se
 			if !config.QPP {
 				handleClient(p1, p2, config.Quiet)
 			} else {
-				handleQPPClient(_Q_, seed, p1, p2, config.Quiet)
+				handleQPPClient(_Q_, []byte(config.Key), p1, p2, config.Quiet)
 			}
 		}(stream)
 	}
@@ -423,6 +423,17 @@ func main() {
 		log.Println("quiet:", config.Quiet)
 		log.Println("tcp:", config.TCP)
 
+		if config.QPP {
+			minSeedLength := qpp.QPPMinimumSeedLength(8)
+			if len(config.Key) < minSeedLength {
+				log.Println("QPP Warning: key size %d, required %d bytes at least", len(config.Key), minSeedLength)
+			}
+
+			minPads := qpp.QPPMinimumPads(8)
+			if config.QPPCount < minPads {
+				log.Println("QPP Warning: QPPCount %d, required %d at least", config.QPPCount, minPads)
+			}
+		}
 		// parameters check
 		if config.SmuxVer > maxSmuxVer {
 			log.Fatal("unsupported smux version:", config.SmuxVer)
@@ -472,7 +483,7 @@ func main() {
 		// create shared QPP
 		var _Q_ *qpp.QuantumPermutationPad
 		if config.QPP {
-			_Q_ = qpp.NewQPP(pass, uint16(config.QPPCount), QUBIT)
+			_Q_ = qpp.NewQPP([]byte(config.Key), uint16(config.QPPCount), QUBIT)
 		}
 
 		// main loop
@@ -500,9 +511,9 @@ func main() {
 					conn.SetACKNoDelay(config.AckNodelay)
 
 					if config.NoComp {
-						go handleMux(_Q_, conn, &config, pass)
+						go handleMux(_Q_, conn, &config)
 					} else {
-						go handleMux(_Q_, generic.NewCompStream(conn), &config, pass)
+						go handleMux(_Q_, generic.NewCompStream(conn), &config)
 					}
 				} else {
 					log.Printf("%+v", err)

diff --git a/vendor/github.com/xtaci/qpp/qpp.go b/vendor/github.com/xtaci/qpp/qpp.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -38,7 +38,7 @@ github.com/urfave/cli
 # github.com/xtaci/kcp-go/v5 v5.6.8
 ## explicit; go 1.21
 github.com/xtaci/kcp-go/v5
-# github.com/xtaci/qpp v1.1.3
+# github.com/xtaci/qpp v1.1.4
 ## explicit; go 1.22.3
 github.com/xtaci/qpp
 # github.com/xtaci/smux v1.5.24