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>
This commit is contained in:
Matt Caswell
2015-12-15 10:43:44 +00:00
parent 73cd6175b9
commit 8caab744f5
6 changed files with 9 additions and 35 deletions

View File

@@ -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,