diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-03-10 19:09:27 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2015-03-11 09:29:37 -0400 |
| commit | 10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (patch) | |
| tree | c2f597e901f98829266ec4045492195cefdd958c /ssl/ssl_conf.c | |
| parent | ac5a110621ca48f0bebd5b4d76d081de403da29e (diff) | |
Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC
Suggested by John Foley <foleyj@cisco.com>.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/ssl_conf.c')
| -rw-r--r-- | ssl/ssl_conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 354f218cee..cfed40ddc2 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -257,7 +257,7 @@ static int cmd_Curves(SSL_CONF_CTX *cctx, const char *value) return rv > 0; } -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC /* ECDH temporary parameters */ static int cmd_ECDHParameters(SSL_CONF_CTX *cctx, const char *value) { @@ -447,7 +447,7 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = { SSL_CONF_CMD_STRING(SignatureAlgorithms, "sigalgs"), SSL_CONF_CMD_STRING(ClientSignatureAlgorithms, "client_sigalgs"), SSL_CONF_CMD_STRING(Curves, "curves"), -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC SSL_CONF_CMD_STRING(ECDHParameters, "named_curve"), #endif SSL_CONF_CMD_STRING(CipherString, "cipher"), |