diff options
author | Matt Caswell <matt@openssl.org> | 2015-12-15 10:43:44 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-12-15 11:26:38 +0000 |
commit | 8caab744f5698ed2b55eca20f032540f713327fd (patch) | |
tree | 595b532b5149361b2a71decd6ecafdcbf1964142 /apps/s_client.c | |
parent | 73cd6175b970fa63c9c70d769febd91f3c7b5cdd (diff) |
Fix s_server problem with no-ec
s_server was trying to set the ECDH curve when no-ec was defined. This also
highlighted the fact that the -no_ecdhe option to s_server is broken, and
doesn't make any sense any more (ECDHE is on by default and the only way it
can be disabled is through the cipherstring). Therefore this commit removes
the option.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'apps/s_client.c')
-rw-r--r-- | apps/s_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 5aa1adc51e..dbeb770f59 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1211,7 +1211,7 @@ int s_client_main(int argc, char **argv) ASYNC_init(1, 0, 0); } - if (!config_ctx(cctx, ssl_args, ctx, 1, jpake_secret == NULL)) + if (!config_ctx(cctx, ssl_args, ctx, jpake_secret == NULL)) goto end; if (!ssl_load_stores(ctx, vfyCApath, vfyCAfile, chCApath, chCAfile, |