Skip to content

Commit 19ec1a8

Browse files
author
Yorhel
committed
tls_priority: Remove ARCFOUR-40 from default exclusion list
This cypher has been removed in GnuTLS 3.4, and thus causes connection attempts to fail if it's still in the exclusion list. I very strongly doubt that ARCFOUR-40 has ever been in the "NORMAL" cypher selection, so this probably doesn't change anything. GnuTLS 3.4 also by default excludes ARCFOUR-128 from the NORMAL selection, but it doesn't hurt to keep that around for older versions.
1 parent e7bfec9 commit 19ec1a8

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

src/vars.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ struct var_t {
996996
V(slots, 1,0, f_int, p_int_ge1, NULL, NULL, s_hubinfo, "10")\
997997
V(sudp_policy, 1,0, f_sudp_policy, p_sudp_policy, su_sudp_policy,g_sudp_policy,s_sudp_policy, G_STRINGIFY(VAR_SUDPP_PREFER))\
998998
V(tls_policy, 1,1, f_tls_policy, p_tls_policy, su_tls_policy, g_tls_policy, s_tls_policy, G_STRINGIFY(VAR_TLSP_PREFER))\
999-
V(tls_priority, 1,0, f_id, p_tls_priority, su_old, NULL, NULL, "NORMAL:-ARCFOUR-40:-ARCFOUR-128")\
999+
V(tls_priority, 1,0, f_id, p_tls_priority, su_old, NULL, NULL, "NORMAL:-ARCFOUR-128")\
10001000
V(ui_time_format, 1,0, f_id, p_id, su_old, NULL, NULL, "[%H:%M:%S]")\
10011001
V(upload_rate, 1,0, f_speed, p_speed, NULL, NULL, NULL, NULL)
10021002

static/build.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ ZLIB_VERSION=1.2.8
2828
BZIP2_VERSION=1.0.6
2929
SQLITE_VERSION=3080702
3030
GMP_VERSION=6.0.0
31-
NETTLE_VERSION=2.7.1
32-
GNUTLS_VERSION=3.3.10
31+
NETTLE_VERSION=3.1.1
32+
IDN_VERSION=1.30
33+
GNUTLS_VERSION=3.4.0
3334
NCURSES_VERSION=5.9
3435
GLIB_VERSION=2.43.1
3536
GEOIP_VERSION=1.6.3
@@ -175,6 +176,16 @@ getnettle() {
175176
}
176177

177178

179+
getidn() {
180+
fem http://ftp.gnu.org/gnu/libidn/ libidn-$IDN_VERSION.tar.gz idn
181+
prebuild idn || return
182+
$srcdir/configure --prefix=$PREFIX --disable-nls --disable-valgrind-tests --disable-shared\
183+
--enable-static --host=$HOST CPPFLAGS="-I$PREFIX/include" LDFLAGS="-L$PREFIX/lib" || exit
184+
make install || exit
185+
postbuild
186+
}
187+
188+
178189
getgnutls() {
179190
fem ftp://ftp.gnutls.org/gcrypt/gnutls/v${GNUTLS_VERSION%.*}/ gnutls-$GNUTLS_VERSION.tar.xz gnutls
180191
prebuild gnutls || return
@@ -187,8 +198,9 @@ getgnutls() {
187198
fi
188199
$srcdir/configure --prefix=$PREFIX --disable-gtk-doc-html --disable-shared --disable-silent-rules\
189200
--enable-static --disable-cxx --disable-srp-authentication --disable-openssl-compatibility\
190-
--disable-guile --disable-crywrap --with-included-libtasn1 --without-p11-kit\
201+
--disable-guile --disable-crywrap --with-included-libtasn1 --without-p11-kit --with-nettle-mini\
191202
--host=$HOST CPPFLAGS="-I$PREFIX/include" LDFLAGS="-L$PREFIX/lib" || exit
203+
make || exit
192204
make -C gl install || exit
193205
make -C lib install || exit
194206
postbuild
@@ -283,6 +295,7 @@ allncdc() {
283295
getsqlite
284296
getgmp
285297
getnettle
298+
getidn
286299
getgnutls
287300
getncurses
288301
getglib

0 commit comments

Comments
 (0)