diff options
| author | jkim <jkim@FreeBSD.org> | 2013-02-13 22:15:56 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-02-13 22:15:56 +0000 |
| commit | 9069337c8384d04bea914cdfac40b533e60cade6 (patch) | |
| tree | 79d6c350c61cb2c6055ac3b21d94c152a09b44ff /crypto/err | |
| parent | 90d033541aadf8dd14ea582d23a845e6345d9687 (diff) | |
| download | FreeBSD-src-9069337c8384d04bea914cdfac40b533e60cade6.zip FreeBSD-src-9069337c8384d04bea914cdfac40b533e60cade6.tar.gz | |
Import OpenSSL 1.0.1e.
Approved by: secteam (delphij, simon), benl (silence)
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err_all.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index bd8946d..8eb547d 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -64,7 +64,9 @@ #endif #include <openssl/buffer.h> #include <openssl/bio.h> +#ifndef OPENSSL_NO_COMP #include <openssl/comp.h> +#endif #ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> #endif @@ -95,6 +97,9 @@ #include <openssl/ui.h> #include <openssl/ocsp.h> #include <openssl/err.h> +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif #include <openssl/ts.h> #ifndef OPENSSL_NO_CMS #include <openssl/cms.h> @@ -102,11 +107,6 @@ #ifndef OPENSSL_NO_JPAKE #include <openssl/jpake.h> #endif -#include <openssl/comp.h> - -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#endif void ERR_load_crypto_strings(void) { @@ -130,7 +130,9 @@ void ERR_load_crypto_strings(void) ERR_load_ASN1_strings(); ERR_load_CONF_strings(); ERR_load_CRYPTO_strings(); +#ifndef OPENSSL_NO_COMP ERR_load_COMP_strings(); +#endif #ifndef OPENSSL_NO_EC ERR_load_EC_strings(); #endif @@ -153,15 +155,14 @@ void ERR_load_crypto_strings(void) #endif ERR_load_OCSP_strings(); ERR_load_UI_strings(); +#ifdef OPENSSL_FIPS + ERR_load_FIPS_strings(); +#endif #ifndef OPENSSL_NO_CMS ERR_load_CMS_strings(); #endif #ifndef OPENSSL_NO_JPAKE ERR_load_JPAKE_strings(); #endif - ERR_load_COMP_strings(); -#endif -#ifdef OPENSSL_FIPS - ERR_load_FIPS_strings(); #endif } |
