Austin/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2024-11-16 03:32:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #775 from abcfy2/patch-1
Some checks failed
bin_update / update (push) Has been cancelled
Details

Browse Source 
fix DoH/DoT always fallback check /etc/ssl/
This commit is contained in:
juewuy 2024-09-19 16:34:23 +08:00 committed by GitHub
commit f2c88356c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/menu.sh
View File

@ -608,9 +608,8 @@ setdns(){ #DNS设置
elif [ "$num" = 4 ]; then elif [ "$num" = 4 ]; then
echo ----------------------------------------------- echo -----------------------------------------------
openssldir=$(openssl version -a 2>&1 | grep OPENSSLDIR | awk -F "\"" '{print $2}') openssldir="$(openssl version -d 2>&1 | awk -F '"' '{print $2}')"
[ -z "$openssldir" ] && openssldir=/etc/ssl if [ -s "$openssldir/certs/ca-certificates.crt" -o -s "/etc/ssl/certs/ca-certificates.crt" ];then
if [ -s "$openssldir/certs/ca-certificates.crt" ];then
dns_nameserver='https://223.5.5.5/dns-query, https://doh.pub/dns-query, tls://dns.rubyfish.cn:853' dns_nameserver='https://223.5.5.5/dns-query, https://doh.pub/dns-query, tls://dns.rubyfish.cn:853'
dns_fallback='tls://1.0.0.1:853, tls://8.8.4.4:853, https://doh.opendns.com/dns-query' dns_fallback='tls://1.0.0.1:853, tls://8.8.4.4:853, https://doh.opendns.com/dns-query'
setconfig dns_nameserver \'"$dns_nameserver"\' setconfig dns_nameserver \'"$dns_nameserver"\'

13
scripts/webget.sh
View File

@ -1943,10 +1943,13 @@ getcrt(){ #下载根证书文件
fi fi
} }
setcrt(){ setcrt(){
openssldir=$(openssl version -a 2>&1 | grep OPENSSLDIR | awk -F "\"" '{print $2}') openssldir="$(openssl version -d 2>&1 | awk -F '"' '{print $2}')"
[ -z "$openssldir" ] && openssldir=/etc/ssl if [ -d "$openssldir/certs/" ];then
crtdir="$openssldir/certs/ca-certificates.crt"
else
crtdir="/etc/ssl/certs/ca-certificates.crt"
fi
if [ -n "$openssldir" ];then if [ -n "$openssldir" ];then
crtdir="$openssldir/certs/ca-certificates.crt"
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "\033[36m安装/更新本地根证书文件(ca-certificates.crt)\033[0m" echo -e "\033[36m安装/更新本地根证书文件(ca-certificates.crt)\033[0m"
echo -e "\033[33m用于解决证书校验错误，x509报错等问题\033[0m" echo -e "\033[33m用于解决证书校验错误，x509报错等问题\033[0m"
@ -2273,8 +2276,8 @@ userguide(){
} }
fi fi
#检测及下载根证书 #检测及下载根证书
openssldir=$(openssl version -a 2>&1 | grep OPENSSLDIR | awk -F "\"" '{print $2}') openssldir="$(openssl version -d 2>&1 | awk -F '"' '{print $2}')"
[ -z "$openssldir" ] && openssldir=/etc/ssl [ ! -d "$openssldir/certs" ] && openssldir=/etc/ssl
if [ -d $openssldir/certs -a ! -f $openssldir/certs/ca-certificates.crt ];then if [ -d $openssldir/certs -a ! -f $openssldir/certs/ca-certificates.crt ];then
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "\033[33m当前设备未找到根证书文件\033[0m" echo -e "\033[33m当前设备未找到根证书文件\033[0m"