diff options
| author | Rich Salz <rsalz@akamai.com> | 2020-03-04 22:52:22 +0100 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2020-04-10 15:24:02 +0200 |
| commit | 1ae56f2f43d36618e54cbb8dd47a7107b74505b6 (patch) | |
| tree | a2704c85168a338361457a3b9765fcb02d9d2bb3 /apps/dsaparam.c | |
| parent | Fix krb5 external test (diff) | |
| download | openssl-1ae56f2f43d36618e54cbb8dd47a7107b74505b6.tar.xz openssl-1ae56f2f43d36618e54cbb8dd47a7107b74505b6.zip | |
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/dsaparam.c')
| -rw-r--r-- | apps/dsaparam.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/apps/dsaparam.c b/apps/dsaparam.c index 04e09e7950..11f47b44c4 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -11,22 +11,19 @@ #define OPENSSL_SUPPRESS_DEPRECATED #include <openssl/opensslconf.h> -#ifdef OPENSSL_NO_DSA -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/dsa.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/dsa.h> +#include <openssl/x509.h> +#include <openssl/pem.h> static int verbose = 0; @@ -44,9 +41,9 @@ const OPTIONS dsaparam_options[] = { OPT_SECTION("General"), {"help", OPT_HELP, '-', "Display this summary"}, -# ifndef OPENSSL_NO_ENGINE +#ifndef OPENSSL_NO_ENGINE {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"}, -# endif +#endif OPT_SECTION("Input"), {"in", OPT_IN, '<', "Input file"}, @@ -286,4 +283,3 @@ static int dsa_cb(int p, int n, BN_GENCB *cb) (void)BIO_flush(BN_GENCB_get_arg(cb)); return 1; } -#endif |