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/evp | |
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/evp')
-rw-r--r-- | crypto/evp/digest.c | 4 | ||||
-rw-r--r-- | crypto/evp/e_aes.c | 2 | ||||
-rw-r--r-- | crypto/evp/evp_enc.c | 4 | ||||
-rw-r--r-- | crypto/evp/m_md2.c | 4 | ||||
-rw-r--r-- | crypto/evp/m_md4.c | 4 | ||||
-rw-r--r-- | crypto/evp/m_md5.c | 4 | ||||
-rw-r--r-- | crypto/evp/m_md5_sha1.c | 4 | ||||
-rw-r--r-- | crypto/evp/m_mdc2.c | 4 | ||||
-rw-r--r-- | crypto/evp/m_ripemd.c | 4 | ||||
-rw-r--r-- | crypto/evp/m_sha1.c | 4 | ||||
-rw-r--r-- | crypto/evp/p_dec.c | 4 | ||||
-rw-r--r-- | crypto/evp/p_enc.c | 4 | ||||
-rw-r--r-- | crypto/evp/p_lib.c | 17 | ||||
-rw-r--r-- | crypto/evp/p_seal.c | 4 | ||||
-rw-r--r-- | crypto/evp/pmeth_lib.c | 4 |
15 files changed, 18 insertions, 53 deletions
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 0ed884565a..aee8127d00 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -112,9 +112,7 @@ #include "internal/cryptlib.h" #include <openssl/objects.h> #include <openssl/evp.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include "internal/evp_int.h" #include "evp_locl.h" diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 360f572731..c906e6ff87 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -50,7 +50,7 @@ #include <openssl/opensslconf.h> #ifndef OPENSSL_NO_AES -#include <openssl/crypto.h> +# include <openssl/crypto.h> # include <openssl/evp.h> # include <openssl/err.h> # include <string.h> diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 484b024218..d7cc1f453c 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -60,9 +60,7 @@ #include <openssl/evp.h> #include <openssl/err.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include "internal/evp_int.h" #include "evp_locl.h" diff --git a/crypto/evp/m_md2.c b/crypto/evp/m_md2.c index 5c1ac38624..0e83dfec10 100644 --- a/crypto/evp/m_md2.c +++ b/crypto/evp/m_md2.c @@ -64,9 +64,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/md2.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> #include "internal/evp_int.h" diff --git a/crypto/evp/m_md4.c b/crypto/evp/m_md4.c index e63db4e1f9..933d82af78 100644 --- a/crypto/evp/m_md4.c +++ b/crypto/evp/m_md4.c @@ -64,9 +64,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/md4.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> # include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c index adaa8577eb..b28be91edd 100644 --- a/crypto/evp/m_md5.c +++ b/crypto/evp/m_md5.c @@ -64,9 +64,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/md5.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> # include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_md5_sha1.c b/crypto/evp/m_md5_sha1.c index 949b0e5a16..ae28ddce09 100644 --- a/crypto/evp/m_md5_sha1.c +++ b/crypto/evp/m_md5_sha1.c @@ -60,9 +60,7 @@ # include <openssl/sha.h> # include "internal/cryptlib.h" # include "internal/evp_int.h" -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> struct md5_sha1_ctx { MD5_CTX md5; diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c index dbe71dffaf..f7fa60022b 100644 --- a/crypto/evp/m_mdc2.c +++ b/crypto/evp/m_mdc2.c @@ -64,9 +64,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/mdc2.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> # include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c index 67aa3cf202..d4488bec0e 100644 --- a/crypto/evp/m_ripemd.c +++ b/crypto/evp/m_ripemd.c @@ -64,9 +64,7 @@ # include <openssl/evp.h> # include <openssl/objects.h> # include <openssl/x509.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> # include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c index fb674aee5d..e673e41725 100644 --- a/crypto/evp/m_sha1.c +++ b/crypto/evp/m_sha1.c @@ -61,9 +61,7 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/sha.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/p_dec.c b/crypto/evp/p_dec.c index 37f6822be4..5729ed7ac3 100644 --- a/crypto/evp/p_dec.c +++ b/crypto/evp/p_dec.c @@ -58,9 +58,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/rand.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> diff --git a/crypto/evp/p_enc.c b/crypto/evp/p_enc.c index d3bcaa0b7e..f1fc818750 100644 --- a/crypto/evp/p_enc.c +++ b/crypto/evp/p_enc.c @@ -58,9 +58,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/rand.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index a7d624427e..a8fa301b31 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -62,19 +62,10 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/x509.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif - -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> +#include <openssl/engine.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c index 52436d1244..d802d84b8f 100644 --- a/crypto/evp/p_seal.c +++ b/crypto/evp/p_seal.c @@ -58,9 +58,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/rand.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index a285009ad4..ff5baa7d2c 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -59,9 +59,7 @@ #include <stdio.h> #include <stdlib.h> #include "internal/cryptlib.h" -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/evp.h> #include <openssl/x509v3.h> #include "internal/asn1_int.h" |