[Midnightbsd-cvs] mports [23350] trunk/security/vpnc: patch

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu May 3 10:55:03 EDT 2018


Revision: 23350
          http://svnweb.midnightbsd.org/mports/?rev=23350
Author:   laffer1
Date:     2018-05-03 10:55:02 -0400 (Thu, 03 May 2018)
Log Message:
-----------
patch

Modified Paths:
--------------
    trunk/security/vpnc/Makefile
    trunk/security/vpnc/files/patch-vpnc.c

Modified: trunk/security/vpnc/Makefile
===================================================================
--- trunk/security/vpnc/Makefile	2018-05-03 14:37:37 UTC (rev 23349)
+++ trunk/security/vpnc/Makefile	2018-05-03 14:55:02 UTC (rev 23350)
@@ -2,7 +2,7 @@
 
 PORTNAME=	vpnc
 PORTVERSION=	0.5.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
 		FREEBSD_LOCAL/ehaupt
@@ -12,8 +12,9 @@
 
 LICENSE=	unknown
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	vpnc-script:${PORTSDIR}/sysutils/vpnc-scripts
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error
+RUN_DEPENDS=	vpnc-script:sysutils/vpnc-scripts
 
 USES=		shebangfix gmake perl5
 USE_PERL5=	build

Modified: trunk/security/vpnc/files/patch-vpnc.c
===================================================================
--- trunk/security/vpnc/files/patch-vpnc.c	2018-05-03 14:37:37 UTC (rev 23349)
+++ trunk/security/vpnc/files/patch-vpnc.c	2018-05-03 14:55:02 UTC (rev 23350)
@@ -1,6 +1,40 @@
---- ./vpnc.c.orig	2011-02-25 20:17:00.000000000 +0100
-+++ ./vpnc.c	2011-02-25 20:18:49.000000000 +0100
-@@ -2861,28 +2861,34 @@
+--- vpnc.c.orig	2008-11-19 21:55:51.000000000 +0100
++++ vpnc.c	2017-11-10 13:09:32.996639000 +0100
+@@ -1160,8 +1160,11 @@
+ 		value = a->next->u.attr_16;
+ 	else if (a->next->af == isakmp_attr_lots && a->next->u.lots.length == 4)
+ 		value = ntohl(*((uint32_t *) a->next->u.lots.data));
+-	else
+-		assert(0);
++	else {
++		DEBUG(2, printf("got unknown ike lifetime attributes af %d len %d\n",
++					a->next->af, a->next->u.lots.length));
++		return;
++	}
+ 	
+ 	DEBUG(2, printf("got ike lifetime attributes: %d %s\n", value,
+ 		(a->u.attr_16 == IKE_LIFE_TYPE_SECONDS) ? "seconds" : "kilobyte"));
+@@ -1578,6 +1581,19 @@
+ 						seen_natd_them = 1;
+ 				}
+ 				break;
++			case ISAKMP_PAYLOAD_N:
++				if (rp->u.n.type == ISAKMP_N_IPSEC_RESPONDER_LIFETIME) {
++					if (rp->u.n.protocol == ISAKMP_IPSEC_PROTO_ISAKMP)
++						lifetime_ike_process(s, rp->u.n.attributes);
++					else if (rp->u.n.protocol == ISAKMP_IPSEC_PROTO_IPSEC_ESP)
++						lifetime_ipsec_process(s, rp->u.n.attributes);
++					else
++						DEBUG(2, printf("got unknown lifetime notice, ignoring..\n"));
++				} else {
++					DEBUG(1, printf("rejecting ISAKMP_PAYLOAD_N, type is not lifetime\n"));
++					reject = ISAKMP_N_INVALID_PAYLOAD_TYPE;
++				}
++				break;
+ 			default:
+ 				DEBUG(1, printf("rejecting invalid payload type %d\n", rp->type));
+ 				reject = ISAKMP_N_INVALID_PAYLOAD_TYPE;
+@@ -2861,28 +2877,34 @@
  		free(dh_shared_secret);
  		free_isakmp_packet(r);
  		
@@ -52,7 +86,7 @@
  		}
  		
  		s->ipsec.rx.seq_id = s->ipsec.tx.seq_id = 1;
-@@ -3224,9 +3230,14 @@
+@@ -3224,9 +3246,14 @@
  			 */
  			/* FIXME: any cleanup needed??? */
  



More information about the Midnightbsd-cvs mailing list