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/ecparam.c | |
| parent | fa4d3fe46dfb4909c3c18c9d6141bb3b60a09eed (diff) | |
| download | openssl-1ae56f2f43d36618e54cbb8dd47a7107b74505b6.zip openssl-1ae56f2f43d36618e54cbb8dd47a7107b74505b6.tar.gz openssl-1ae56f2f43d36618e54cbb8dd47a7107b74505b6.tar.bz2 | |
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/ecparam.c')
| -rw-r--r-- | apps/ecparam.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/apps/ecparam.c b/apps/ecparam.c index ed4f4f1..b93c2fa 100644 --- a/apps/ecparam.c +++ b/apps/ecparam.c @@ -9,22 +9,19 @@ */ #include <openssl/opensslconf.h> -#ifdef OPENSSL_NO_EC -NON_EMPTY_TRANSLATION_UNIT -#else - -# include <stdio.h> -# include <stdlib.h> -# include <time.h> -# include <string.h> -# include "apps.h" -# include "progs.h" -# include <openssl/bio.h> -# include <openssl/err.h> -# include <openssl/bn.h> -# include <openssl/ec.h> -# include <openssl/x509.h> -# include <openssl/pem.h> + +#include <stdio.h> +#include <stdlib.h> +#include <time.h> +#include <string.h> +#include "apps.h" +#include "progs.h" +#include <openssl/bio.h> +#include <openssl/err.h> +#include <openssl/bn.h> +#include <openssl/ec.h> +#include <openssl/x509.h> +#include <openssl/pem.h> typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, @@ -39,9 +36,9 @@ const OPTIONS ecparam_options[] = { {"help", OPT_HELP, '-', "Display this summary"}, {"list_curves", OPT_LIST_CURVES, '-', "Prints a list of all curve 'short names'"}, -# ifndef OPENSSL_NO_ENGINE +#ifndef OPENSSL_NO_ENGINE {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"}, -# endif +#endif {"genkey", OPT_GENKEY, '-', "Generate ec key"}, {"in", OPT_IN, '<', "Input file - default stdin"}, @@ -473,5 +470,3 @@ int ecparam_main(int argc, char **argv) BIO_free_all(out); return ret; } - -#endif |