diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:06:22 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:06:22 -0500 |
| commit | a00ae6c46e0d7907a7c9f9e85334e968aa5fd338 (patch) | |
| tree | 79a0e748842c1a3ed15b3b4a1ab08ce29bab5280 /crypto/err | |
| parent | 109f1031a8d03a7c0a7c53c82314505ec5b7b207 (diff) | |
OPENSSL_NO_xxx cleanup: many removals
The following compile options (#ifdef's) are removed:
OPENSSL_NO_BIO OPENSSL_NO_BUFFER OPENSSL_NO_CHAIN_VERIFY
OPENSSL_NO_EVP OPENSSL_NO_FIPS_ERR OPENSSL_NO_HASH_COMP
OPENSSL_NO_LHASH OPENSSL_NO_OBJECT OPENSSL_NO_SPEED OPENSSL_NO_STACK
OPENSSL_NO_X509 OPENSSL_NO_X509_VERIFY
This diff is big because of updating the indents on preprocessor lines.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.c | 2 | ||||
| -rw-r--r-- | crypto/err/err.h | 12 | ||||
| -rw-r--r-- | crypto/err/err_all.c | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index ed50511fcf..50865b8b26 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -109,8 +109,6 @@ * */ -#define OPENSSL_NO_FIPS_ERR - #include <stdio.h> #include <stdarg.h> #include <string.h> diff --git a/crypto/err/err.h b/crypto/err/err.h index d24ec9a7a6..577a121475 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -120,12 +120,8 @@ # endif # include <openssl/ossl_typ.h> -# ifndef OPENSSL_NO_BIO -# include <openssl/bio.h> -# endif -# ifndef OPENSSL_NO_LHASH -# include <openssl/lhash.h> -# endif +# include <openssl/bio.h> +# include <openssl/lhash.h> #ifdef __cplusplus extern "C" { @@ -341,9 +337,7 @@ void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u), # ifndef OPENSSL_NO_STDIO void ERR_print_errors_fp(FILE *fp); # endif -# ifndef OPENSSL_NO_BIO void ERR_print_errors(BIO *bp); -# endif void ERR_add_error_data(int num, ...); void ERR_add_error_vdata(int num, va_list args); void ERR_load_strings(int lib, ERR_STRING_DATA str[]); @@ -359,11 +353,9 @@ DECLARE_DEPRECATED(void ERR_remove_state(unsigned long pid)); /* if zero we # endif ERR_STATE *ERR_get_state(void); -# ifndef OPENSSL_NO_LHASH LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void); LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void); void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash); -# endif int ERR_get_next_error_library(void); diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 54693ed3f4..1363fb026a 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -56,8 +56,6 @@ * [including the GNU Public Licence.] */ -#define OPENSSL_NO_FIPS_ERR - #include <stdio.h> #include <openssl/asn1.h> #include <openssl/bn.h> |