diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-30 22:01:31 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-30 22:01:31 +0000 |
commit | 2900fc8ae17f1bc0ae03af22bfdb9adabedfeac1 (patch) | |
tree | eb1a57613298e316f8d90f46a3cee1f8bb15c413 | |
parent | e9afa08cd14c37ba1b52c07501c67b958739cf22 (diff) | |
download | openssl-2900fc8ae17f1bc0ae03af22bfdb9adabedfeac1.tar.gz |
Don't stop -cipher from working.
-rw-r--r-- | apps/s_server.c | 14 |
1 files changed, 7 insertions, 7 deletions
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(); |