diff options
author | djm <> | 2009-01-09 12:14:11 +0000 |
---|---|---|
committer | djm <> | 2009-01-09 12:14:11 +0000 |
commit | a0fdc9ec41594852f67ec77dfad9cb06bacc4186 (patch) | |
tree | c43f6b3a4d93ad2cb3dcf93275295679d895a033 /src/lib/libcrypto/err/err_all.c | |
parent | 5a3c0a05c7f2c5d3c584b7c8d6aec836dd724c80 (diff) | |
download | openbsd-a0fdc9ec41594852f67ec77dfad9cb06bacc4186.tar.gz openbsd-a0fdc9ec41594852f67ec77dfad9cb06bacc4186.tar.bz2 openbsd-a0fdc9ec41594852f67ec77dfad9cb06bacc4186.zip |
import openssl-0.9.8j
Diffstat (limited to 'src/lib/libcrypto/err/err_all.c')
-rw-r--r-- | src/lib/libcrypto/err/err_all.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c index 5813060ce2..f21a5276ed 100644 --- a/src/lib/libcrypto/err/err_all.c +++ b/src/lib/libcrypto/err/err_all.c | |||
@@ -94,9 +94,16 @@ | |||
94 | #include <openssl/ui.h> | 94 | #include <openssl/ui.h> |
95 | #include <openssl/ocsp.h> | 95 | #include <openssl/ocsp.h> |
96 | #include <openssl/err.h> | 96 | #include <openssl/err.h> |
97 | #ifdef OPENSSL_FIPS | ||
98 | #include <openssl/fips.h> | ||
99 | #endif | ||
100 | |||
97 | #ifndef OPENSSL_NO_CMS | 101 | #ifndef OPENSSL_NO_CMS |
98 | #include <openssl/cms.h> | 102 | #include <openssl/cms.h> |
99 | #endif | 103 | #endif |
104 | #ifndef OPENSSL_NO_JPAKE | ||
105 | #include <openssl/jpake.h> | ||
106 | #endif | ||
100 | 107 | ||
101 | void ERR_load_crypto_strings(void) | 108 | void ERR_load_crypto_strings(void) |
102 | { | 109 | { |
@@ -141,8 +148,14 @@ void ERR_load_crypto_strings(void) | |||
141 | #endif | 148 | #endif |
142 | ERR_load_OCSP_strings(); | 149 | ERR_load_OCSP_strings(); |
143 | ERR_load_UI_strings(); | 150 | ERR_load_UI_strings(); |
151 | #ifdef OPENSSL_FIPS | ||
152 | ERR_load_FIPS_strings(); | ||
153 | #endif | ||
144 | #ifndef OPENSSL_NO_CMS | 154 | #ifndef OPENSSL_NO_CMS |
145 | ERR_load_CMS_strings(); | 155 | ERR_load_CMS_strings(); |
146 | #endif | 156 | #endif |
157 | #ifndef OPENSSL_NO_JPAKE | ||
158 | ERR_load_JPAKE_strings(); | ||
159 | #endif | ||
147 | #endif | 160 | #endif |
148 | } | 161 | } |