| commit | 2900fc8ae17f1bc0ae03af22bfdb9adabedfeac1 | [log] [tgz] |
|---|---|---|
| author | Dr. Stephen Henson <steve@openssl.org> | Sun Nov 30 22:01:31 2008 +0000 |
| committer | Dr. Stephen Henson <steve@openssl.org> | Sun Nov 30 22:01:31 2008 +0000 |
| tree | eb1a57613298e316f8d90f46a3cee1f8bb15c413 | |
| parent | e9afa08cd14c37ba1b52c07501c67b958739cf22 [diff] [blame] |
Don't stop -cipher from working.
diff --git a/apps/s_server.c b/apps/s_server.c index 3b7fb07..12d39c3 100644 --- a/apps/s_server.c +++ b/apps/s_server.c
@@ -1222,16 +1222,16 @@ 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();