head 1.10; access; symbols pkgsrc-2013Q2:1.10.0.54 pkgsrc-2013Q2-base:1.10 pkgsrc-2012Q4:1.10.0.52 pkgsrc-2012Q4-base:1.10 pkgsrc-2011Q4:1.10.0.50 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q2:1.10.0.48 pkgsrc-2011Q2-base:1.10 pkgsrc-2009Q4:1.10.0.46 pkgsrc-2009Q4-base:1.10 pkgsrc-2008Q4:1.10.0.44 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.42 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.40 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.38 pkgsrc-2008Q2-base:1.10 pkgsrc-2008Q1:1.10.0.36 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.34 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.32 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.30 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.10.0.28 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.10.0.26 pkgsrc-2006Q4-base:1.10 pkgsrc-2006Q3:1.10.0.24 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.22 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.10.0.20 pkgsrc-2006Q1-base:1.10 pkgsrc-2005Q4:1.10.0.18 pkgsrc-2005Q4-base:1.10 pkgsrc-2005Q3:1.10.0.16 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.10.0.14 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.12 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.10 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.10.0.8 pkgsrc-2004Q3-base:1.10 pkgsrc-2004Q2:1.10.0.6 pkgsrc-2004Q2-base:1.10 pkgsrc-2004Q1:1.10.0.4 pkgsrc-2004Q1-base:1.10 pkgsrc-2003Q4:1.10.0.2 pkgsrc-2003Q4-base:1.10 netbsd-1-6:1.5.0.6 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.2 pkgviews-base:1.5 buildlink2:1.3.0.2 buildlink2-base:1.5; locks; strict; comment @# @; 1.10 date 2003.08.26.03.06.09; author itojun; state dead; branches; next 1.9; 1.9 date 2003.07.12.10.24.17; author itojun; state Exp; branches; next 1.8; 1.8 date 2003.07.12.10.01.45; author itojun; state Exp; branches; next 1.7; 1.7 date 2002.11.20.03.26.27; author itojun; state dead; branches; next 1.6; 1.6 date 2002.08.25.21.50.43; author jlam; state Exp; branches; next 1.5; 1.5 date 2002.05.20.13.25.17; author itojun; state Exp; branches; next 1.4; 1.4 date 2002.05.13.02.13.49; author itojun; state dead; branches; next 1.3; 1.3 date 2002.05.07.09.03.57; author itojun; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2002.04.26.00.08.22; author itojun; state dead; branches; next 1.1; 1.1 date 2002.04.15.02.00.04; author itojun; state Exp; branches; next ; 1.3.2.1 date 2002.06.23.18.59.23; author jlam; state Exp; branches; next ; desc @@ 1.10 log @upgrade to 20030826. corrects keylen miscomputation. @ text @$NetBSD: patch-ag,v 1.9 2003/07/12 10:24:17 itojun Exp $ --- ../libipsec/key_debug.c- Sat Jul 12 18:49:46 2003 +++ ../libipsec/key_debug.c Sat Jul 12 18:50:25 2003 @@@@ -80,7 +80,9 @@@@ static void kdebug_sadb_address __P((struct sadb_ext *)); static void kdebug_sadb_key __P((struct sadb_ext *)); static void kdebug_sadb_x_sa2 __P((struct sadb_ext *)); +#ifdef SADB_X_EXT_TAG static void kdebug_sadb_x_tag __P((struct sadb_ext *)); +#endif #ifdef _KERNEL static void kdebug_secreplay __P((struct secreplay *)); @@@@ -166,7 +168,9 @@@@ TYPESTR(X_EXT_KMPRIVATE), TYPESTR(X_EXT_POLICY), TYPESTR(X_EXT_SA2), +#ifdef SADB_X_EXT_TAG TYPESTR(X_EXT_TAG), +#endif { NULL } }; @@@@ -252,9 +256,11 @@@@ case SADB_X_EXT_SA2: kdebug_sadb_x_sa2(ext); break; +#ifdef SADB_X_EXT_TAG case SADB_X_EXT_TAG: kdebug_sadb_x_tag(ext); break; +#endif default: printf("kdebug_sadb: invalid ext_type %u was passed.\n", ext->sadb_ext_type); @@@@ -494,6 +500,7 @@@@ return; } +#ifdef SADB_X_EXT_TAG static void kdebug_sadb_x_tag(ext) struct sadb_ext *ext; @@@@ -508,6 +515,7 @@@@ return; } +#endif void kdebug_sadb_x_policy(ext) @ 1.9 log @$NetBSD$ @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @upgrade to 20030711 snapshot. (compiles at least on 1.6.1, not tested on 1.5) bunch of stability fixes @ text @d1 2 @ 1.7 log @upgrade to 20021120. - fix sha2 computation (was in patch-ag) - plug some memory leaks - more strict isakmp header length check - correct phase 2 proposal reqid handling - check for fd_set overrun @ text @d1 9 a9 21 $NetBSD: patch-ag,v 1.6 2002/08/25 21:50:43 jlam Exp $ --- algorithm.c.orig Thu Apr 25 18:48:32 2002 +++ algorithm.c Mon May 20 22:11:56 2002 @@@@ -60,15 +60,15 @@@@ { "sha2_256", algtype_sha2_256, OAKLEY_ATTR_HASH_ALG_SHA2_256, eay_sha2_256_init, eay_sha2_256_update, eay_sha2_256_final, eay_sha2_256_hashlen, - eay_sha1_one, }, + eay_sha2_256_one, }, { "sha2_384", algtype_sha2_384, OAKLEY_ATTR_HASH_ALG_SHA2_384, eay_sha2_384_init, eay_sha2_384_update, eay_sha2_384_final, eay_sha2_384_hashlen, - eay_sha1_one, }, + eay_sha2_384_one, }, { "sha2_512", algtype_sha2_512, OAKLEY_ATTR_HASH_ALG_SHA2_512, eay_sha2_512_init, eay_sha2_512_update, eay_sha2_512_final, eay_sha2_512_hashlen, - eay_sha1_one, }, + eay_sha2_512_one, }, }; d11 40 a50 1 static struct hmac_algorithm oakley_hmacdef[] = { @ 1.6 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.3.2.1 2002/06/23 18:59:23 jlam Exp $ @ 1.5 log @fix sha2 interoperability. From: "JuanJo Ciarlante" @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @upgrade to 20020507a. logging issue is fixed. phase 2 negotiation w/ unique policy is corrected. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.3 2002/05/07 09:03:57 itojun Exp $ d3 19 a21 5 --- plog.c Fri Apr 26 09:00:10 2002 +++ plog.c Tue May 7 17:56:49 2002 @@@@ -1,2 +1,2 @@@@ -/* $KAME: plog.c,v 1.22 2002/04/26 00:00:10 itojun Exp $ */ +/* $KAME: plog.c,v 1.23 2002/05/07 08:56:19 sakane Exp $ */ d23 1 a23 23 @@@@ -133,6 +133,5 @@@@ plogv(int pri, const char *func, struct sockaddr *sa, - const char *fmt, ...) + const char *fmt, va_list ap) { char *newfmt; - va_list ap; @@@@ -143,9 +142,5 @@@@ - if (f_foreground) { - va_start(ap, fmt); + if (f_foreground) vprintf(newfmt, ap); - va_end(ap); - } - va_start(ap, fmt); if (logfile) @@@@ -158,3 +153,2 @@@@ } - va_end(ap); } @ 1.3 log @fix arg to plogv(). @ text @d1 1 a1 1 $NetBSD$ @ 1.3.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.5 2002/05/20 13:25:17 itojun Exp $ d3 5 a7 19 --- algorithm.c.orig Thu Apr 25 18:48:32 2002 +++ algorithm.c Mon May 20 22:11:56 2002 @@@@ -60,15 +60,15 @@@@ { "sha2_256", algtype_sha2_256, OAKLEY_ATTR_HASH_ALG_SHA2_256, eay_sha2_256_init, eay_sha2_256_update, eay_sha2_256_final, eay_sha2_256_hashlen, - eay_sha1_one, }, + eay_sha2_256_one, }, { "sha2_384", algtype_sha2_384, OAKLEY_ATTR_HASH_ALG_SHA2_384, eay_sha2_384_init, eay_sha2_384_update, eay_sha2_384_final, eay_sha2_384_hashlen, - eay_sha1_one, }, + eay_sha2_384_one, }, { "sha2_512", algtype_sha2_512, OAKLEY_ATTR_HASH_ALG_SHA2_512, eay_sha2_512_init, eay_sha2_512_update, eay_sha2_512_final, eay_sha2_512_hashlen, - eay_sha1_one, }, + eay_sha2_512_one, }, }; d9 23 a31 1 static struct hmac_algorithm oakley_hmacdef[] = { @ 1.2 log @upgrade to 20020426a from kame. file descriptor leak fix. null encryption algorithm key length fix (should use 0). couple of null-pointer reference fixes. set port # to 500 in ID payload (possible interop issue - spec is unclear). correctly match address pair on informational exchange. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2002/04/15 02:00:04 itojun Exp $ d3 5 a7 29 --- isakmp_inf.c.orig Tue Dec 11 13:39:32 2001 +++ isakmp_inf.c Mon Apr 15 10:57:48 2002 @@@@ -1058,10 +1058,13 @@@@ * racoon only deletes SA which is matched both the * source address and the destination accress. */ - if ((cmpsaddrwop(iph1->local, src) - && cmpsaddrwop(iph1->remote, dst)) - || (cmpsaddrwop(iph1->remote, src) - && cmpsaddrwop(iph1->local, dst))) { + if (cmpsaddrwop(iph1->local, src) == 0 && + cmpsaddrwop(iph1->remote, dst) == 0) + ; + else if (cmpsaddrwop(iph1->remote, src) == 0 && + cmpsaddrwop(iph1->local, dst) == 0) + ; + else { msg = next; continue; } @@@@ -1076,8 +1079,10 @@@@ msg->sadb_msg_satype) break; } - if (i == pfkey_nsatypes) + if (i == pfkey_nsatypes) { + msg = next; continue; + } d9 23 a31 2 plog(LLV_INFO, LOCATION, NULL, "purging spi=%u.\n", ntohl(sa->sadb_sa_spi)); @ 1.1 log @correct initial contact handling. PR 15949 @ text @d1 1 a1 1 $NetBSD$ @