diff options
| author | Richard Levitte <levitte@openssl.org> | 2012-03-14 12:39:00 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2012-03-14 12:39:00 +0000 |
| commit | 49f6cb968ff63793f6671d9026fb2a7034dad79a (patch) | |
| tree | 7e7e379988eec70796b60c85c87da026434ca0b8 | |
| parent | 07e120b7da27d7e1c73de22aeb97c81bdef8acea (diff) | |
| download | openssl-new-OpenSSL_1_0_1.tar.gz | |
cipher should only be set to PSK if JPAKE is used.OpenSSL_1_0_1
| -rw-r--r-- | apps/s_client.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 20f661ec50..098cce27dd 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -993,14 +993,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(); |