diff options
Diffstat (limited to 'src/lib/libcrypto/err/err_all.c')
-rw-r--r-- | src/lib/libcrypto/err/err_all.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c index fc049e8e88..f21a5276ed 100644 --- a/src/lib/libcrypto/err/err_all.c +++ b/src/lib/libcrypto/err/err_all.c | |||
@@ -64,7 +64,6 @@ | |||
64 | #endif | 64 | #endif |
65 | #include <openssl/buffer.h> | 65 | #include <openssl/buffer.h> |
66 | #include <openssl/bio.h> | 66 | #include <openssl/bio.h> |
67 | #include <openssl/comp.h> | ||
68 | #ifndef OPENSSL_NO_RSA | 67 | #ifndef OPENSSL_NO_RSA |
69 | #include <openssl/rsa.h> | 68 | #include <openssl/rsa.h> |
70 | #endif | 69 | #endif |
@@ -95,14 +94,16 @@ | |||
95 | #include <openssl/ui.h> | 94 | #include <openssl/ui.h> |
96 | #include <openssl/ocsp.h> | 95 | #include <openssl/ocsp.h> |
97 | #include <openssl/err.h> | 96 | #include <openssl/err.h> |
98 | #include <openssl/ts.h> | 97 | #ifdef OPENSSL_FIPS |
98 | #include <openssl/fips.h> | ||
99 | #endif | ||
100 | |||
99 | #ifndef OPENSSL_NO_CMS | 101 | #ifndef OPENSSL_NO_CMS |
100 | #include <openssl/cms.h> | 102 | #include <openssl/cms.h> |
101 | #endif | 103 | #endif |
102 | #ifndef OPENSSL_NO_JPAKE | 104 | #ifndef OPENSSL_NO_JPAKE |
103 | #include <openssl/jpake.h> | 105 | #include <openssl/jpake.h> |
104 | #endif | 106 | #endif |
105 | #include <openssl/comp.h> | ||
106 | 107 | ||
107 | void ERR_load_crypto_strings(void) | 108 | void ERR_load_crypto_strings(void) |
108 | { | 109 | { |
@@ -126,7 +127,6 @@ void ERR_load_crypto_strings(void) | |||
126 | ERR_load_ASN1_strings(); | 127 | ERR_load_ASN1_strings(); |
127 | ERR_load_CONF_strings(); | 128 | ERR_load_CONF_strings(); |
128 | ERR_load_CRYPTO_strings(); | 129 | ERR_load_CRYPTO_strings(); |
129 | ERR_load_COMP_strings(); | ||
130 | #ifndef OPENSSL_NO_EC | 130 | #ifndef OPENSSL_NO_EC |
131 | ERR_load_EC_strings(); | 131 | ERR_load_EC_strings(); |
132 | #endif | 132 | #endif |
@@ -143,18 +143,19 @@ void ERR_load_crypto_strings(void) | |||
143 | ERR_load_PKCS12_strings(); | 143 | ERR_load_PKCS12_strings(); |
144 | ERR_load_RAND_strings(); | 144 | ERR_load_RAND_strings(); |
145 | ERR_load_DSO_strings(); | 145 | ERR_load_DSO_strings(); |
146 | ERR_load_TS_strings(); | ||
147 | #ifndef OPENSSL_NO_ENGINE | 146 | #ifndef OPENSSL_NO_ENGINE |
148 | ERR_load_ENGINE_strings(); | 147 | ERR_load_ENGINE_strings(); |
149 | #endif | 148 | #endif |
150 | ERR_load_OCSP_strings(); | 149 | ERR_load_OCSP_strings(); |
151 | ERR_load_UI_strings(); | 150 | ERR_load_UI_strings(); |
151 | #ifdef OPENSSL_FIPS | ||
152 | ERR_load_FIPS_strings(); | ||
153 | #endif | ||
152 | #ifndef OPENSSL_NO_CMS | 154 | #ifndef OPENSSL_NO_CMS |
153 | ERR_load_CMS_strings(); | 155 | ERR_load_CMS_strings(); |
154 | #endif | 156 | #endif |
155 | #ifndef OPENSSL_NO_JPAKE | 157 | #ifndef OPENSSL_NO_JPAKE |
156 | ERR_load_JPAKE_strings(); | 158 | ERR_load_JPAKE_strings(); |
157 | #endif | 159 | #endif |
158 | ERR_load_COMP_strings(); | ||
159 | #endif | 160 | #endif |
160 | } | 161 | } |