diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-08-17 17:40:08 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-08-17 17:41:13 +0100 |
| commit | 14536c8c9c0abb894afcadb9a58b4b29fc8f7a4d (patch) | |
| tree | a2de06bfbfb5e3c73ab78cf9a143dd8382c69afa /ssl/ssl_conf.c | |
| parent | 42082eda6f3d64ce87184d65c4eae06d677e971c (diff) | |
Make no-ec compilation work.
Diffstat (limited to 'ssl/ssl_conf.c')
| -rw-r--r-- | ssl/ssl_conf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 437f385f05..1f4c4dd153 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -253,7 +253,7 @@ static int cmd_curves(SSL_CONF_CTX *cctx, const char *value) rv = SSL_CTX_set1_curves_list(cctx->ctx, value); return rv > 0; } - +#ifndef OPENSSL_NO_ECDH /* ECDH temporary parameters */ static int cmd_ecdhparam(SSL_CONF_CTX *cctx, const char *value) { @@ -314,7 +314,7 @@ static int cmd_ecdhparam(SSL_CONF_CTX *cctx, const char *value) return rv > 0; } - +#endif static int cmd_cipher_list(SSL_CONF_CTX *cctx, const char *value) { int rv = 1; @@ -378,7 +378,9 @@ static ssl_conf_cmd_tbl ssl_conf_cmds[] = { {cmd_sigalgs, "SignatureAlgorithms", "sigalgs"}, {cmd_client_sigalgs, "ClientSignatureAlgorithms", "client_sigalgs"}, {cmd_curves, "Curves", "curves"}, +#ifndef OPENSSL_NO_ECDH {cmd_ecdhparam, "ECDHParameters", "named_curve"}, +#endif {cmd_cipher_list, "CipherString", "cipher"}, {cmd_protocol, "Protocol", NULL}, {cmd_options, "Options", NULL}, |