From 44dcd5944ab878cb5bbbec6aa79d5d99b109d33f Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Mon, 9 Jan 2012 13:41:35 +0100
Subject: [PATCH] Fix error handling if no PSK found for main mode

---
 src/libcharon/sa/ikev1/tasks/main_mode.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c
index 3c0a2520e..2fc06ca1a 100644
--- a/src/libcharon/sa/ikev1/tasks/main_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.c
@@ -799,11 +799,11 @@ static shared_key_t *lookup_shared_key(private_main_mode_t *this)
 		{
 			shared_key = lib->credmgr->get_shared(lib->credmgr, SHARED_IKE,
 												  my_id, other_id);
-		}
-		else
-		{
-			DBG1(DBG_IKE, "no shared key found for '%Y'[%H] - '%Y'[%H]",
-				 my_id, me, other_id, other);
+			if (!shared_key)
+			{
+				DBG1(DBG_IKE, "no shared key found for '%Y'[%H] - '%Y'[%H]",
+					 my_id, me, other_id, other);
+			}
 		}
 	}
 	else
@@ -862,6 +862,10 @@ static bool derive_keys(private_main_mode_t *this, chunk_t nonce_i,
 		case AUTH_XAUTH_INIT_PSK:
 		case AUTH_XAUTH_RESP_PSK:
 			shared_key = lookup_shared_key(this);
+			if (!shared_key)
+			{
+				return FALSE;
+			}
 			break;
 		default:
 			break;