OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2023-02-04 16:25:11

This commit is contained in:
github-actions[bot] 2023-02-04 16:25:11 +08:00
parent 8aa55dbcd3
commit 61ef31107c
2 changed files with 89 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2ray-geodata/Makefile
View File

@ -21,13 +21,13 @@ define Download/geoip
HASH:=33e7836477c4b8cf4fb547b74543ab373c6f0ab99d6f1eb62faec096042e901d HASH:=33e7836477c4b8cf4fb547b74543ab373c6f0ab99d6f1eb62faec096042e901d
endef endef
GEOSITE_VER:=20230202101858 GEOSITE_VER:=20230204071506
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE) FILE:=$(GEOSITE_FILE)
HASH:=64ab40c10fd5f36d2b5746c4c16b657dba536cb749d6357a39fab2c3ab4bad31 HASH:=c8a1c2f180dc7845bab673c173e30fb33b29746b60c10214def541293c4ed7dd
endef endef
define Package/v2ray-geodata/template define Package/v2ray-geodata/template

87
xray-core/patches/01-go-1.18+.patch Normal file
View File

@ -0,0 +1,87 @@
diff --git a/common/protocol/quic/qtls_go118.go b/common/protocol/quic/qtls_go118.go
index e701adf..429037d 100644
--- a/common/protocol/quic/qtls_go118.go
+++ b/common/protocol/quic/qtls_go118.go
@@ -1,9 +1,11 @@
+//go:build go1.18 && !go1.19
+
package quic
import (
"crypto/cipher"
- "github.com/quic-go/qtls-go1-20"
+ "github.com/quic-go/qtls-go1-18"
)
type (
diff --git a/common/protocol/quic/qtls_go119.go b/common/protocol/quic/qtls_go119.go
new file mode 100644
index 0000000..4ab25af
--- /dev/null
+++ b/common/protocol/quic/qtls_go119.go
@@ -0,0 +1,18 @@
+//go:build go1.19 && !go1.20
+
+package quic
+
+import (
+ "crypto/cipher"
+
+ "github.com/quic-go/qtls-go1-19"
+)
+
+type (
+ // A CipherSuiteTLS13 is a cipher suite for TLS 1.3
+ CipherSuiteTLS13 = qtls.CipherSuiteTLS13
+)
+
+func AEADAESGCMTLS13(key, fixedNonce []byte) cipher.AEAD {
+ return qtls.AEADAESGCMTLS13(key, fixedNonce)
+}
diff --git a/common/protocol/quic/qtls_go120.go b/common/protocol/quic/qtls_go120.go
new file mode 100644
index 0000000..e182c75
--- /dev/null
+++ b/common/protocol/quic/qtls_go120.go
@@ -0,0 +1,18 @@
+//go:build go1.20
+
+package quic
+
+import (
+ "crypto/cipher"
+
+ "github.com/quic-go/qtls-go1-20"
+)
+
+type (
+ // A CipherSuiteTLS13 is a cipher suite for TLS 1.3
+ CipherSuiteTLS13 = qtls.CipherSuiteTLS13
+)
+
+func AEADAESGCMTLS13(key, fixedNonce []byte) cipher.AEAD {
+ return qtls.AEADAESGCMTLS13(key, fixedNonce)
+}
diff --git a/go.mod b/go.mod
index 49d8a74..7277794 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,8 @@ require (
github.com/miekg/dns v1.1.50
github.com/pelletier/go-toml v1.9.5
github.com/pires/go-proxyproto v0.6.2
+ 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
github.com/quic-go/quic-go v0.32.0
github.com/refraction-networking/utls v1.2.0
@@ -44,8 +46,6 @@ require (
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
- github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect