cipher should only be set to PSK if JPAKE is used.

diff --git a/apps/s_client.c b/apps/s_client.c
index 53be0f8f82433a8d1ade8e6ec63ad21421537fa9..fe375d0fe353668640bdb5fb05ba13d947e52e69 100644 (file)
--- 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();