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/pem | |
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/pem')
-rw-r--r-- | crypto/pem/pem_all.c | 12 | ||||
-rw-r--r-- | crypto/pem/pem_info.c | 8 | ||||
-rw-r--r-- | crypto/pem/pem_lib.c | 8 | ||||
-rw-r--r-- | crypto/pem/pem_pkey.c | 8 |
4 files changed, 9 insertions, 27 deletions
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index 9a08c02832..5967b6eb72 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -115,15 +115,9 @@ #include <openssl/x509.h> #include <openssl/pkcs7.h> #include <openssl/pem.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 +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> #ifndef OPENSSL_NO_RSA static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa); diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index 50a5051dad..1b1cde4b09 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -62,12 +62,8 @@ #include <openssl/evp.h> #include <openssl/x509.h> #include <openssl/pem.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> #ifndef OPENSSL_NO_STDIO STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index 54ddc1efbb..5e7aa776d9 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -66,12 +66,8 @@ #include <openssl/pem.h> #include <openssl/pkcs12.h> #include "internal/asn1_int.h" -#ifndef OPENSSL_NO_DES -# include <openssl/des.h> -#endif -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/des.h> +#include <openssl/engine.h> #define MIN_LENGTH 4 diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index 8eb398d55d..ef0c0e45d8 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -64,12 +64,8 @@ #include <openssl/x509.h> #include <openssl/pkcs12.h> #include <openssl/pem.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> #include "internal/asn1_int.h" #include "internal/evp_int.h" |