diff options
| author | Matt Caswell <matt@openssl.org> | 2019-08-28 14:57:56 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-08-29 11:12:25 +0100 |
| commit | 7f6b035b523898cf5318d023d50cb3665a67d686 (patch) | |
| tree | bb67f5fae40ea0011a3da722872b51e5fb4ef976 /providers/default/macs/poly1305_prov.c | |
| parent | 632f112cf730b4b1e2cdeea07a5c51fa8da9bba4 (diff) | |
Fix no-poly1305, no-siphash and no-blake2
Make sure we don't include files that we don't need if we've disabled
them.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9717)
Diffstat (limited to 'providers/default/macs/poly1305_prov.c')
| -rw-r--r-- | providers/default/macs/poly1305_prov.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/providers/default/macs/poly1305_prov.c b/providers/default/macs/poly1305_prov.c index db54fbe313..e76f982ace 100644 --- a/providers/default/macs/poly1305_prov.c +++ b/providers/default/macs/poly1305_prov.c @@ -7,25 +7,22 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/opensslconf.h> -#ifndef OPENSSL_NO_POLY1305 +#include <openssl/core_numbers.h> +#include <openssl/core_names.h> +#include <openssl/params.h> +#include <openssl/evp.h> +#include <openssl/err.h> -# include <openssl/core_numbers.h> -# include <openssl/core_names.h> -# include <openssl/params.h> -# include <openssl/evp.h> -# include <openssl/err.h> - -# include "internal/poly1305.h" +#include "internal/poly1305.h" /* * TODO(3.0) when poly1305 has moved entirely to our providers, this * header should be moved to the provider include directory. For the * moment, crypto/poly1305/poly1305_ameth.c has us stuck. */ -# include "../../../crypto/poly1305/poly1305_local.h" +#include "../../../crypto/poly1305/poly1305_local.h" -# include "internal/providercommonerr.h" -# include "internal/provider_algs.h" +#include "internal/providercommonerr.h" +#include "internal/provider_algs.h" /* * Forward declaration of everything implemented here. This is not strictly @@ -163,5 +160,3 @@ const OSSL_DISPATCH poly1305_functions[] = { { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))poly1305_set_ctx_params }, { 0, NULL } }; - -#endif |