diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
| commit | d09435a9d2adb0d0cafa0b1f9f6cfe326346cbc6 (patch) | |
| tree | 946278cd836aa6af639675f4eb5ec7378d783dd8 /app/openssl/crypto/err/err_all.c | |
| parent | 5d47fde84a03acb1201f8650c55dc0cd981df679 (diff) | |
| parent | 3a71bc9e4aa4296f460e2e3c55de74c9852477ad (diff) | |
Merge branch 'develop' into release-0.5.2
Diffstat (limited to 'app/openssl/crypto/err/err_all.c')
| -rw-r--r-- | app/openssl/crypto/err/err_all.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/openssl/crypto/err/err_all.c b/app/openssl/crypto/err/err_all.c index fc049e8e..8eb547d9 100644 --- a/app/openssl/crypto/err/err_all.c +++ b/app/openssl/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,7 +107,6 @@ #ifndef OPENSSL_NO_JPAKE #include <openssl/jpake.h> #endif -#include <openssl/comp.h> void ERR_load_crypto_strings(void) { @@ -126,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 @@ -149,12 +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 } |