From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 30 Nov 2008 22:01:31 +0000 (+0000)
Subject: Don't stop -cipher from working.
X-Git-Tag: OpenSSL_0_9_8k^2~140
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2900fc8ae17f1bc0ae03af22bfdb9adabedfeac1;p=oweals%2Fopenssl.git

Don't stop -cipher from working.
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 3b7fb07765..12d39c35bb 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1222,16 +1222,16 @@ 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
-		
+
 	SSL_load_error_strings();
 	OpenSSL_add_ssl_algorithms();