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_apps.h | |
| parent | 73cd6175b970fa63c9c70d769febd91f3c7b5cdd (diff) | |
| download | openssl-8caab744f5698ed2b55eca20f032540f713327fd.tar.gz | |
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_apps.h')
| -rw-r--r-- | apps/s_apps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/s_apps.h b/apps/s_apps.h index 55dc9f1ffc..91faf4fe12 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -207,7 +207,7 @@ int load_excert(SSL_EXCERT **pexc); void print_ssl_summary(SSL *s); #ifdef HEADER_SSL_H int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str, - SSL_CTX *ctx, int no_ecdhe, int no_jpake); + SSL_CTX *ctx, int no_jpake); int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls, int crl_download); int ssl_load_stores(SSL_CTX *ctx, const char *vfyCApath, |