[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon Fix handling of deletion ...

[tteras <tteras%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/50859d4da471
branches:  trunk
changeset: 784289:50859d4da471
user:      tteras <tteras%NetBSD.org@localhost>
date:      Thu Jan 24 06:47:50 2013 +0000

description:
Fix handling of deletion notification.

diffstat:

 crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 9aefb1ba01a6 -r 50859d4da471 crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c   Thu Jan 24 02:04:15 2013 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c   Thu Jan 24 06:47:50 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_inf.c,v 1.48 2012/08/29 12:01:30 tteras Exp $   */
+/*     $NetBSD: isakmp_inf.c,v 1.49 2013/01/24 06:47:50 tteras Exp $   */
 
 /* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
 
@@ -492,7 +492,7 @@
                "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");