diff options
author | Rich Salz <rsalz@akamai.com> | 2020-03-04 16:52:22 -0500 |
---|---|---|
committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2020-04-10 15:24:02 +0200 |
commit | 1ae56f2f43d36618e54cbb8dd47a7107b74505b6 (patch) | |
tree | a2704c85168a338361457a3b9765fcb02d9d2bb3 /apps/ec.c | |
parent | fa4d3fe46dfb4909c3c18c9d6141bb3b60a09eed (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: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/11250)
Diffstat (limited to 'apps/ec.c')
-rw-r--r-- | apps/ec.c | 26 |
1 files changed, 11 insertions, 15 deletions
@@ -8,19 +8,16 @@ */ #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}, @@ -46,9 +43,9 @@ typedef enum OPTION_choice { const OPTIONS ec_options[] = { OPT_SECTION("General"), {"help", OPT_HELP, '-', "Display this summary"}, -# ifndef OPENSSL_NO_ENGINE +#ifndef OPENSSL_NO_ENGINE {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"}, -# endif +#endif OPT_SECTION("Input"), {"in", OPT_IN, 's', "Input file"}, @@ -291,4 +288,3 @@ int ec_main(int argc, char **argv) OPENSSL_free(passout); return ret; } -#endif |