diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-21 12:17:30 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-06-21 14:45:36 +0100 |
| commit | 72257204bd2a88773461150765dfd0e0a428ee86 (patch) | |
| tree | 0f62189accc00c2b1e58de678a7e56c1a8748325 /apps | |
| parent | adfc37868e2dc406b80ab3111163eb475ef06975 (diff) | |
| download | openssl-72257204bd2a88773461150765dfd0e0a428ee86.tar.gz | |
PSK related tweaks based on review feedback
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_client.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 60ce9c68af..393b311904 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -220,7 +220,6 @@ static int psk_use_session_cb(SSL *s, const EVP_MD *md, } cipher = SSL_SESSION_get0_cipher(usesess); - if (cipher == NULL) goto err; @@ -577,8 +576,7 @@ typedef enum OPTION_choice { OPT_DEBUG, OPT_TLSEXTDEBUG, OPT_STATUS, OPT_WDEBUG, OPT_MSG, OPT_MSGFILE, OPT_ENGINE, OPT_TRACE, OPT_SECURITY_DEBUG, OPT_SECURITY_DEBUG_VERBOSE, OPT_SHOWCERTS, OPT_NBIO_TEST, OPT_STATE, - OPT_PSK_IDENTITY, OPT_PSK, - OPT_PSK_SESS, + OPT_PSK_IDENTITY, OPT_PSK, OPT_PSK_SESS, #ifndef OPENSSL_NO_SRP OPT_SRPUSER, OPT_SRPPASS, OPT_SRP_STRENGTH, OPT_SRP_LATEUSER, OPT_SRP_MOREGROUPS, |