summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-02-27 00:02:06 +0000
committerMatt Caswell <matt@openssl.org>2015-02-27 08:58:02 +0000
commit059907771b89549cbd07a81df1a5bdf51e062066 (patch)
tree902996fbffe44f9a1ada03ba3e577a30101f40cb
parentea65e92b22d34380c8caa49ac6bb10a55d8d7b0d (diff)
downloadopenssl-new-059907771b89549cbd07a81df1a5bdf51e062066.tar.gz
Fix warning with no-ec
This fixes another warning when config'd with no-ec Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
-rw-r--r--apps/s_server.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index 70ee5c341f..f472126994 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -992,7 +992,10 @@ int MAIN(int argc, char *argv[])
int badop = 0, bugs = 0;
int ret = 1;
int off = 0;
- int no_tmp_rsa = 0, no_dhe = 0, no_ecdhe = 0, nocert = 0;
+ int no_tmp_rsa = 0, no_dhe = 0, nocert = 0;
+#ifndef OPENSSL_NO_ECDH
+ int no_ecdhe;
+#endif
int state = 0;
const SSL_METHOD *meth = NULL;
int socket_type = SOCK_STREAM;
@@ -1207,9 +1210,12 @@ int MAIN(int argc, char *argv[])
no_tmp_rsa = 1;
} else if (strcmp(*argv, "-no_dhe") == 0) {
no_dhe = 1;
- } else if (strcmp(*argv, "-no_ecdhe") == 0) {
+ }
+#ifndef OPENSSL_NO_ECDH
+ else if (strcmp(*argv, "-no_ecdhe") == 0) {
no_ecdhe = 1;
}
+#endif
#ifndef OPENSSL_NO_PSK
else if (strcmp(*argv, "-psk_hint") == 0) {
if (--argc < 1)