From 9ad1b440aefa41b50851af9b9df8e4106a88a56d Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Wed, 14 Mar 2012 12:38:55 +0000
Subject: [PATCH] cipher should only be set to PSK if JPAKE is used.

---
 apps/s_client.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 53be0f8f82..fe375d0fe3 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -749,14 +749,13 @@ bad:
 			goto end;
 			}
 		psk_identity = "JPAKE";
+		if (cipher)
+			{
+			BIO_printf(bio_err, "JPAKE sets cipher to PSK\n");
+			goto end;
+			}
+		cipher = "PSK";
 		}
-
-	if (cipher)
-		{
-		BIO_printf(bio_err, "JPAKE sets cipher to PSK\n");
-		goto end;
-		}
-	cipher = "PSK";
 #endif
 
 	OpenSSL_add_ssl_algorithms();
-- 
2.25.1