From 502f9bb1c2b078dfb44b9a5f1f1d6c967c32b9a8 Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Tue, 11 Jul 2023 12:50:01 +0900 Subject: [PATCH] re-add some junk --- fmt/Preset.hpp | 5 ++++- go/cmd/nekoray_core/go.mod | 1 + go/cmd/nekoray_core/go.sum | 2 ++ go/cmd/nekoray_core/import.go | 12 +++++++++--- libs/get_source_env.sh | 2 +- ui/edit/edit_shadowsocks.cpp | 6 ------ 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/fmt/Preset.hpp b/fmt/Preset.hpp index 660d5e3..6778816 100644 --- a/fmt/Preset.hpp +++ b/fmt/Preset.hpp @@ -3,7 +3,10 @@ namespace Preset { namespace Xray { inline QStringList UtlsFingerPrint = {"", "chrome", "firefox", "edge", "safari", "360", "qq", "ios", "android", "random", "randomized"}; - inline QStringList ShadowsocksMethods = {"2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "xchacha20-ploy1305", "none"}; + inline QStringList ShadowsocksMethods = {"aes-128-gcm", "aes-256-gcm", "aes-192-gcm", "chacha20-poly1305", "xchacha20-poly1305", + "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", + "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", + "rc4", "rc4-md5", "bf-cfb", "chacha20", "chacha20-ietf", "xchacha20", "none"}; inline QStringList Flows = {"xtls-rprx-vision", "xtls-rprx-vision-udp443"}; } // namespace Xray diff --git a/go/cmd/nekoray_core/go.mod b/go/cmd/nekoray_core/go.mod index bed849c..56ef5c5 100644 --- a/go/cmd/nekoray_core/go.mod +++ b/go/cmd/nekoray_core/go.mod @@ -11,6 +11,7 @@ require ( ) require ( + github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect github.com/francoispqt/gojay v1.2.13 // indirect diff --git a/go/cmd/nekoray_core/go.sum b/go/cmd/nekoray_core/go.sum index fae4bb3..046a15f 100644 --- a/go/cmd/nekoray_core/go.sum +++ b/go/cmd/nekoray_core/go.sum @@ -11,6 +11,8 @@ dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= +github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= diff --git a/go/cmd/nekoray_core/import.go b/go/cmd/nekoray_core/import.go index 791e6a3..c153190 100644 --- a/go/cmd/nekoray_core/import.go +++ b/go/cmd/nekoray_core/import.go @@ -72,9 +72,15 @@ import ( // JSON & TOML & YAML _ "github.com/xtls/xray-core/main/json" - _ "github.com/xtls/xray-core/main/toml" - _ "github.com/xtls/xray-core/main/yaml" + // _ "github.com/xtls/xray-core/main/toml" + // _ "github.com/xtls/xray-core/main/yaml" // Load config from file or http(s) - _ "github.com/xtls/xray-core/main/confloader/external" + // _ "github.com/xtls/xray-core/main/confloader/external" + + // Commands + // _ "github.com/xtls/xray-core/main/commands/all" + + // Custom + _ "github.com/xtls/xray-core/proxy/shadowsocks/plugin/v2ray_plugin" ) diff --git a/libs/get_source_env.sh b/libs/get_source_env.sh index 64f4dba..161dabf 100644 --- a/libs/get_source_env.sh +++ b/libs/get_source_env.sh @@ -1,6 +1,6 @@ if [ ! -z $ENV_NEKORAY ]; then export COMMIT_SING_BOX_EXTRA="c0127f6e833ecad55f9ba8f6ece60c9a8d7acd86" - export COMMIT_MATSURI_XRAY="ded0ebf36791af0d72332a622e262df604b57ebb" + export COMMIT_MATSURI_XRAY="3c826392b6c830de88aef209b56782dee0b6fbb5" fi if [ ! -z $ENV_SING_BOX_EXTRA ]; then diff --git a/ui/edit/edit_shadowsocks.cpp b/ui/edit/edit_shadowsocks.cpp index 713dd11..adee498 100644 --- a/ui/edit/edit_shadowsocks.cpp +++ b/ui/edit/edit_shadowsocks.cpp @@ -8,12 +8,6 @@ EditShadowSocks::EditShadowSocks(QWidget *parent) : QWidget(parent), ui(new Ui::EditShadowSocks) { ui->setupUi(this); ui->method->addItems(IS_NEKO_BOX ? Preset::SingBox::ShadowsocksMethods : Preset::Xray::ShadowsocksMethods); - if (!IS_NEKO_BOX) { - ui->plugin->hide(); - ui->plugin_l->hide(); - ui->plugin_opts->hide(); - ui->plugin_opts_l->hide(); - } } EditShadowSocks::~EditShadowSocks() {