• R/O
  • HTTP
  • SSH
  • HTTPS

v2raya-openwrt: Commit

opkg feed of v2rayA for OpenWrt users


Commit MetaInfo

Revisionb3667955481c01c47cf53825418b9c6481d7322f (tree)
Time2021-12-25 00:23:14
AuthorTianling Shen <cnsztl@immo...>
CommiterTianling Shen

Log Message

xray-core: Update to 1.5.2

Removed upstreamed patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Change Summary

  • modified: xray-core/Makefile (diff)
  • delete: xray-core/patches/010-fix-unsupported-cipher-method-xChaCha20-IETF-Poly1305.patch
  • delete: xray-core/patches/100-Fix-shadowsocks-xchacha-cipher-nonce-size.patch

Incremental Difference

--- a/xray-core/Makefile
+++ b/xray-core/Makefile
@@ -5,12 +5,12 @@
55 include $(TOPDIR)/rules.mk
66
77 PKG_NAME:=Xray-core
8-PKG_VERSION:=1.5.1
8+PKG_VERSION:=1.5.2
99 PKG_RELEASE:=$(AUTORELEASE)
1010
1111 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1212 PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
13-PKG_HASH:=11b01de5da7efed2a5f066b14bfe5e0299071dc8c32b7f64af5c51daf3abc6c2
13+PKG_HASH:=b687a8fd1325bee0f6352c8dc3bfb70a7ee07cd74aacaece4e36c93cf7cda417
1414
1515 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
1616 PKG_LICENSE:=MPL-2.0
--- a/xray-core/patches/010-fix-unsupported-cipher-method-xChaCha20-IETF-Poly1305.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1-From c8e2a99e68109b386c541dcc157f1f64ca8cbd17 Mon Sep 17 00:00:00 2001
2-From: xqzr <34030394+xqzr@users.noreply.github.com>
3-Date: Fri, 17 Dec 2021 00:25:16 +0800
4-Subject: [PATCH] fix unsupported cipher method: xChaCha20-IETF-Poly1305
5-
6----
7- infra/conf/shadowsocks.go | 2 +-
8- 1 file changed, 1 insertion(+), 1 deletion(-)
9-
10---- a/infra/conf/shadowsocks.go
11-+++ b/infra/conf/shadowsocks.go
12-@@ -59,7 +59,7 @@ func (v *ShadowsocksServerConfig) Build(
13- return nil, newError("Shadowsocks password is not specified.")
14- }
15- if account.CipherType < shadowsocks.CipherType_AES_128_GCM ||
16-- account.CipherType > shadowsocks.CipherType_CHACHA20_POLY1305 {
17-+ account.CipherType > shadowsocks.CipherType_XCHACHA20_POLY1305 {
18- return nil, newError("unsupported cipher method: ", user.Cipher)
19- }
20- config.Users = append(config.Users, &protocol.User{
--- a/xray-core/patches/100-Fix-shadowsocks-xchacha-cipher-nonce-size.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1-From 305e1d716cbd9c6f5c3513dcdad1cd48d525036c Mon Sep 17 00:00:00 2001
2-From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
3-Date: Sat, 18 Dec 2021 23:23:09 -0500
4-Subject: [PATCH] Fix shadowsocks xchacha cipher nonce size
5-
6----
7- common/crypto/auth.go | 4 ----
8- proxy/shadowsocks/protocol.go | 2 +-
9- proxy/shadowsocks/validator.go | 6 +++---
10- 3 files changed, 4 insertions(+), 8 deletions(-)
11-
12-diff --git a/common/crypto/auth.go b/common/crypto/auth.go
13-index 13866a4d5..8c659ff06 100644
14---- a/common/crypto/auth.go
15-+++ b/common/crypto/auth.go
16-@@ -39,10 +39,6 @@ func GenerateIncreasingNonce(nonce []byte) BytesGenerator {
17- }
18- }
19-
20--func GenerateInitialAEADNonce() BytesGenerator {
21-- return GenerateIncreasingNonce([]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF})
22--}
23--
24- func GenerateAEADNonceWithSize(nonceSize int) BytesGenerator {
25- c := make([]byte, nonceSize)
26- for i := 0; i < nonceSize; i++ {
27-diff --git a/proxy/shadowsocks/protocol.go b/proxy/shadowsocks/protocol.go
28-index ee2b62c86..d310b009c 100644
29---- a/proxy/shadowsocks/protocol.go
30-+++ b/proxy/shadowsocks/protocol.go
31-@@ -86,7 +86,7 @@ func ReadTCPSession(validator *Validator, reader io.Reader) (*protocol.RequestHe
32- if aead != nil {
33- auth := &crypto.AEADAuthenticator{
34- AEAD: aead,
35-- NonceGenerator: crypto.GenerateInitialAEADNonce(),
36-+ NonceGenerator: crypto.GenerateAEADNonceWithSize(aead.NonceSize()),
37- }
38- r = crypto.NewAuthenticationReader(auth, &crypto.AEADChunkSizeParser{
39- Auth: auth,
40-diff --git a/proxy/shadowsocks/validator.go b/proxy/shadowsocks/validator.go
41-index b36e9bc82..5be81447c 100644
42---- a/proxy/shadowsocks/validator.go
43-+++ b/proxy/shadowsocks/validator.go
44-@@ -93,11 +93,11 @@ func (v *Validator) Get(bs []byte, command protocol.RequestCommand) (u *protocol
45- var matchErr error
46- switch command {
47- case protocol.RequestCommandTCP:
48-- data := make([]byte, 16)
49-- ret, matchErr = aead.Open(data[:0], data[4:16], bs[ivLen:ivLen+18], nil)
50-+ data := make([]byte, 4+aead.NonceSize())
51-+ ret, matchErr = aead.Open(data[:0], data[4:], bs[ivLen:ivLen+18], nil)
52- case protocol.RequestCommandUDP:
53- data := make([]byte, 8192)
54-- ret, matchErr = aead.Open(data[:0], data[8180:8192], bs[ivLen:], nil)
55-+ ret, matchErr = aead.Open(data[:0], data[8192-aead.NonceSize():8192], bs[ivLen:], nil)
56- }
57-
58- if matchErr == nil {
Show on old repository browser