summaryrefslogtreecommitdiffstats
path: root/apps/ec.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2020-04-10 11:51:02 -0400
committerBernd Edlinger <bernd.edlinger@hotmail.de>2020-04-12 20:29:12 +0200
commit369cef760364a88aafa68afd406328e20689b5e2 (patch)
treeb9d642fc676dbdd7f58a3cbd06a9e33d5c0cd227 /apps/ec.c
parent07e2f4b2aabdc5709ae055b226fb54d9d21c631e (diff)
Don't compile commands if disabled
Rather than wrapping whole files in "ifndef OPENSSL_NO_xxx" we handle the changes in build.info Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/11518)
Diffstat (limited to 'apps/ec.c')
-rw-r--r--apps/ec.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/apps/ec.c b/apps/ec.c
index 03abb00683..f48ffbe1b3 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -8,19 +8,15 @@
*/
#include <openssl/opensslconf.h>
-#ifdef OPENSSL_NO_EC
-NON_EMPTY_TRANSLATION_UNIT
-#else
-
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
-# include "apps.h"
-# include "progs.h"
-# include <openssl/bio.h>
-# include <openssl/err.h>
-# include <openssl/evp.h>
-# include <openssl/pem.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "apps.h"
+#include "progs.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
static OPT_PAIR conv_forms[] = {
{"compressed", POINT_CONVERSION_COMPRESSED},
@@ -62,9 +58,9 @@ const OPTIONS ec_options[] = {
"Specifies the way the ec parameters are encoded"},
{"conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form "},
{"", OPT_CIPHER, '-', "Any supported cipher"},
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
-# endif
+#endif
{NULL}
};
@@ -280,4 +276,3 @@ int ec_main(int argc, char **argv)
OPENSSL_free(passout);
return ret;
}
-#endif