Переглянути джерело

openconnect: added fix for handshake timeout

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Nikos Mavrogiannopoulos 10 роки тому
джерело
коміт
fa34d7ec9f

+ 1
- 1
net/openconnect/Makefile Переглянути файл

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=openconnect
11 11
 PKG_VERSION:=6.00
12
-PKG_RELEASE:=1
12
+PKG_RELEASE:=2
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
15 15
 PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/

+ 31
- 0
net/openconnect/patches/001-Added-a-default-timeout-value-in-CSTP-handshake-usin.patch Переглянути файл

@@ -0,0 +1,31 @@
1
+From 826ad45a86f1556910c2f00dfa6477879deb978f Mon Sep 17 00:00:00 2001
2
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
3
+Date: Thu, 24 Jul 2014 21:59:01 +0200
4
+Subject: [PATCH] Added a default timeout value in CSTP handshake using gnutls
5
+
6
+[dwmw2: move it to openconnect_open_https() so it's done only once]
7
+
8
+Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
9
+Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
10
+---
11
+ gnutls.c | 4 ++++
12
+ 1 file changed, 4 insertions(+)
13
+
14
+diff --git a/gnutls.c b/gnutls.c
15
+index 3e3204a..2ef836c 100644
16
+--- a/gnutls.c
17
++++ b/gnutls.c
18
+@@ -2017,6 +2017,10 @@ int openconnect_open_https(struct openconnect_info *vpninfo)
19
+ 	vpn_progress(vpninfo, PRG_INFO, _("SSL negotiation with %s\n"),
20
+ 		     vpninfo->hostname);
21
+ 
22
++#ifdef GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT
23
++	gnutls_handshake_set_timeout(vpninfo->https_sess,
24
++				     GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
25
++#endif
26
+ 
27
+ 	err = cstp_handshake(vpninfo, 1);
28
+ 	if (err)
29
+-- 
30
+2.0.0
31
+