Update to 0.3.2

- added support for preshared without xauth
- fixed NAT-T support with IOS and PIX
- fixed IP-Len header
- fixed reconnection problems with IOS and PIX

PR:		ports/74271
Submitted by:	maintainer
This commit is contained in:
Volker Stolz 2004-11-23 14:43:51 +00:00
parent a8a50c1f9a
commit 1b48d93a5b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=122224
4 changed files with 3 additions and 39 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= vpnc
PORTVERSION= 0.3.1
PORTVERSION= 0.3.2
CATEGORIES= security
MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/:source \
http://dragon.roe.ch/mirrors/distfiles/vpnc/:script

View File

@ -1,4 +1,4 @@
MD5 (vpnc-0.3.1.tar.gz) = 02b814ee7bd5ff3f5a5535eff4e3387d
SIZE (vpnc-0.3.1.tar.gz) = 56007
MD5 (vpnc-0.3.2.tar.gz) = aaccdffc5656095a45dfe87c5bf612cb
SIZE (vpnc-0.3.2.tar.gz) = 56669
MD5 (vpnc-wrapper-1.10) = 32c11fe4de7f0cda2fdfcc7dd2a40271
SIZE (vpnc-wrapper-1.10) = 6414

View File

@ -1,10 +0,0 @@
--- sysdep.h.dist Wed Nov 17 16:37:52 2004
+++ sysdep.h Wed Nov 17 16:37:37 2004
@@ -1,6 +1,7 @@
#ifndef __SYSDEP_H__
#define __SYSDEP_H__
+#include <sys/types.h>
#include <netinet/in.h>
int tun_open(char *dev);

View File

@ -1,26 +0,0 @@
Index: tunip.c
===================================================================
--- tunip.c (revision 35)
+++ tunip.c (working copy)
@@ -596,10 +596,6 @@
/* Fill non-mutable fields */
ip->ip_v = IPVERSION;
ip->ip_hl = 5;
- ip->ip_len = encap->buflen + (peer->remote_sa->md_algo? 12 :0);
-#ifdef NEED_IPLEN_FIX
- ip->ip_len = htons(ip->ip_len);
-#endif
/*gcry_md_get_algo_dlen(md_algo); see RFC .. only use 96 bit */
ip->ip_id = htons(ip_id++);
ip->ip_p = IPPROTO_ESP;
@@ -614,6 +610,10 @@
encap_esp_encapsulate(encap, peer);
+ ip->ip_len = encap->buflen;
+#ifdef NEED_IPLEN_FIX
+ ip->ip_len = htons(ip->ip_len);
+#endif
ip->ip_sum = in_cksum((u_short *) encap->buf, sizeof(struct ip));
sent = sendto(encap->fd, encap->buf, encap->buflen, 0,