From: Martin Willi <martin@revosec.ch>
Date: Mon, 12 Dec 2011 10:28:24 +0000 (+0100)
Subject: Fixed authentication method selection for main mode PSK authentication
X-Git-Tag: 5.0.0~338^2~9^2~266
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e2cc3fed93ac54e8acd1f4702dedc1a5a16cce3;p=thirdparty%2Fstrongswan.git

Fixed authentication method selection for main mode PSK authentication
---

diff --git a/src/libcharon/sa/tasks/main_mode.c b/src/libcharon/sa/tasks/main_mode.c
index cea0631feb..e674381fa9 100755
--- a/src/libcharon/sa/tasks/main_mode.c
+++ b/src/libcharon/sa/tasks/main_mode.c
@@ -308,7 +308,7 @@ static auth_method_t get_auth_method(private_main_mode_t *this,
 			return AUTH_XAUTH_RESP_RSA;
 		}
 	}
-	if (i1 == AUTH_CLASS_PSK && r2 == AUTH_CLASS_PSK)
+	if (i1 == AUTH_CLASS_PSK && r1 == AUTH_CLASS_PSK)
 	{
 		if (i2 == AUTH_CLASS_ANY && r2 == AUTH_CLASS_ANY)
 		{