diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-03-18 14:30:20 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-20 19:48:36 -0400 |
| commit | 3c27208fab1dc29f47f088490404df5abfcdfb05 (patch) | |
| tree | 3654ea8c099e19203a48ce2688aeee02f46fd12b /crypto/dsa | |
| parent | 8230f6c764f854190358cf40f0e7e7ca5647d8cd (diff) | |
Remove #error from include files.
Don't have #error statements in header files, but instead wrap
the contents of that file in #ifndef OPENSSL_NO_xxx
This means it is now always safe to include the header file.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/dsa')
| -rw-r--r-- | crypto/dsa/dsa_ameth.c | 4 | ||||
| -rw-r--r-- | crypto/dsa/dsa_gen.c | 4 | ||||
| -rw-r--r-- | crypto/dsa/dsa_lib.c | 8 |
3 files changed, 4 insertions, 12 deletions
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c index 5661af57b1..f0f28bdf2a 100644 --- a/crypto/dsa/dsa_ameth.c +++ b/crypto/dsa/dsa_ameth.c @@ -62,9 +62,7 @@ #include <openssl/asn1.h> #include <openssl/dsa.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c index 15d5116ba2..c278d9853d 100644 --- a/crypto/dsa/dsa_gen.c +++ b/crypto/dsa/dsa_gen.c @@ -62,15 +62,13 @@ */ #define xxxHASH EVP_sha1() -#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_SHA is defined */ - +#include <openssl/opensslconf.h> #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> #include <openssl/bn.h> #include <openssl/rand.h> #include <openssl/sha.h> - #include "dsa_locl.h" int DSA_generate_parameters_ex(DSA *ret, int bits, diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index 3b99b3c2eb..fa8330fd84 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -62,12 +62,8 @@ #include <openssl/bn.h> #include <openssl/dsa.h> #include <openssl/asn1.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/engine.h> +#include <openssl/dh.h> static const DSA_METHOD *default_DSA_method = NULL; |