cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pick a few patches to OpenConnect from upstream repo.

Browse Source
This commit is contained in:
sthen 2012-01-16 22:58:54 +00:00
parent c70cc94781
commit e0f299f061
4 changed files with 104 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/openconnect/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2011/12/08 13:55:28 sthen Exp $
# $OpenBSD: Makefile,v 1.2 2012/01/16 22:58:54 sthen Exp $
COMMENT= client for Cisco AnyConnect SSL VPN
DISTNAME= openconnect-3.15
REVISION= 0
DIST_SUBDIR= openconnect
VPNC_SCRIPT= vpnc-script
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${VPNC_SCRIPT}:0

73
net/openconnect/patches/patch-cstp_c Normal file
View File

@ -0,0 +1,73 @@
$OpenBSD: patch-cstp_c,v 1.1 2012/01/16 22:58:54 sthen Exp $
- Fix memory leak of CSTP deflated packets, and resend current pkt on reconnect
b39d34 upstream
- Fix memory leak of zlib streams on CSTP reconnect
85772d upstream
--- cstp.c.orig Sat Nov 5 12:41:23 2011
+++ cstp.c Thu Jan 12 09:41:34 2012
@@ -394,11 +394,14 @@ int make_cstp_connection(struct openconnect_info *vpni
if (!vpninfo->deflate_pkt) {
vpn_progress(vpninfo, PRG_ERR,
_("Allocation of deflate buffer failed\n"));
+ inflateEnd(&vpninfo->inflate_strm);
+ deflateEnd(&vpninfo->deflate_strm);
vpninfo->deflate = 0;
+ } else {
+ memset(vpninfo->deflate_pkt, 0, sizeof(struct pkt));
+ memcpy(vpninfo->deflate_pkt->hdr, data_hdr, 8);
+ vpninfo->deflate_pkt->hdr[6] = AC_PKT_COMPRESSED;
}
- memset(vpninfo->deflate_pkt, 0, sizeof(struct pkt));
- memcpy(vpninfo->deflate_pkt->hdr, data_hdr, 8);
- vpninfo->deflate_pkt->hdr[6] = AC_PKT_COMPRESSED;
}
}
@@ -413,11 +416,16 @@ int cstp_reconnect(struct openconnect_info *vpninfo)
openconnect_close_https(vpninfo);
- /* It's already deflated in the old stream. Extremely
- non-trivial to reconstitute it; just throw it away */
- if (vpninfo->current_ssl_pkt == vpninfo->deflate_pkt)
+ /* Requeue the original packet that was deflated */
+ if (vpninfo->current_ssl_pkt == vpninfo->deflate_pkt) {
vpninfo->current_ssl_pkt = NULL;
-
+ queue_packet(&vpninfo->outgoing_queue, vpninfo->pending_deflated_pkt);
+ vpninfo->pending_deflated_pkt = NULL;
+ }
+ if (vpninfo->deflate) {
+ inflateEnd(&vpninfo->inflate_strm);
+ deflateEnd(&vpninfo->deflate_strm);
+ }
timeout = vpninfo->reconnect_timeout;
interval = vpninfo->reconnect_interval;
@@ -623,10 +631,11 @@ int cstp_mainloop(struct openconnect_info *vpninfo, in
return 1;
}
/* Don't free the 'special' packets */
- if (vpninfo->current_ssl_pkt != vpninfo->deflate_pkt &&
- vpninfo->current_ssl_pkt != &dpd_pkt &&
- vpninfo->current_ssl_pkt != &dpd_resp_pkt &&
- vpninfo->current_ssl_pkt != &keepalive_pkt)
+ if (vpninfo->current_ssl_pkt == vpninfo->deflate_pkt)
+ free(vpninfo->pending_deflated_pkt);
+ else if (vpninfo->current_ssl_pkt != &dpd_pkt &&
+ vpninfo->current_ssl_pkt != &dpd_resp_pkt &&
+ vpninfo->current_ssl_pkt != &keepalive_pkt)
free(vpninfo->current_ssl_pkt);
vpninfo->current_ssl_pkt = NULL;
@@ -722,6 +731,7 @@ int cstp_mainloop(struct openconnect_info *vpninfo, in
_("Sending compressed data packet of %d bytes\n"),
this->len);
+ vpninfo->pending_deflated_pkt = this;
vpninfo->current_ssl_pkt = vpninfo->deflate_pkt;
} else {
uncompr:

15
net/openconnect/patches/patch-openconnect-internal_h Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-openconnect-internal_h,v 1.1 2012/01/16 22:58:54 sthen Exp $
Fix memory leak of CSTP deflated packets, and resend current pkt on reconnect
b39d34 upstream
--- openconnect-internal.h.orig Fri Nov 4 21:06:13 2011
+++ openconnect-internal.h Thu Jan 12 09:39:59 2012
@@ -146,6 +146,7 @@ struct openconnect_info {
int owe_ssl_dpd_response;
struct pkt *deflate_pkt;
struct pkt *current_ssl_pkt;
+ struct pkt *pending_deflated_pkt;
z_stream inflate_strm;
uint32_t inflate_adler32;

14
net/openconnect/patches/patch-ssl_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ssl_c,v 1.1 2012/01/16 22:58:54 sthen Exp $
Fix potential crash when processing libproxy results. 88f79b upstream
--- ssl.c.orig Thu Jan 12 09:37:48 2012
+++ ssl.c Thu Jan 12 09:38:10 2012
@@ -932,6 +932,7 @@ int openconnect_open_https(struct openconnect_info *vp
proxies = px_proxy_factory_get_proxies(vpninfo->proxy_factory,
url);
+ i = 0;
while (proxies && proxies[i]) {
if (!vpninfo->proxy &&
(!strncmp(proxies[i], "http://", 7) ||