Module Name: src
Committed By: tteras
Date: Thu Jan 24 06:48:27 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_8-branch]:
isakmp_inf.c
Log Message:
Fix handling of deletion notification.
To generate a diff of this commit:
cvs rdiff -u -r1.47.2.1 -r1.47.2.2 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.47.2.1 src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.47.2.2
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.47.2.1 Wed Aug 29 12:01:56 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c Thu Jan 24 06:48:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_inf.c,v 1.47.2.1 2012/08/29 12:01:56 tteras Exp $ */
+/* $NetBSD: isakmp_inf.c,v 1.47.2.2 2013/01/24 06:48:27 tteras Exp $ */
/* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
@@ -492,7 +492,7 @@ isakmp_info_recv_d(iph1, delete, msgid,
"delete payload for protocol %s\n",
s_ipsecdoi_proto(delete->proto_id));
- if(!iph1->rmconf->weak_phase1_check && !encrypted) {
+ if((iph1 == NULL || !iph1->rmconf->weak_phase1_check) && !encrypted) {
plog(LLV_WARNING, LOCATION, iph1->remote,
"Ignoring unencrypted delete payload "
"(check the weak_phase1_check option)\n");
