diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
| commit | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (patch) | |
| tree | c800a66664ea3af61eb13928db45a26275930b0b /openssl/crypto/err/err_all.c | |
| parent | d79e641dea89c0d5d651b11971c4c9e14df34629 (diff) | |
| parent | 67326634496ef21b4acbf4cef2f05040d34aef9b (diff) | |
| download | vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.gz vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.bz2 vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/crypto/opensslconf.h
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/crypto/err/err_all.c')
| -rw-r--r-- | openssl/crypto/err/err_all.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/openssl/crypto/err/err_all.c b/openssl/crypto/err/err_all.c index fc049e8e8..bd8946d8b 100644 --- a/openssl/crypto/err/err_all.c +++ b/openssl/crypto/err/err_all.c @@ -104,6 +104,10 @@ #endif #include <openssl/comp.h> +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif + void ERR_load_crypto_strings(void) { #ifndef OPENSSL_NO_ERR @@ -157,4 +161,7 @@ void ERR_load_crypto_strings(void) #endif ERR_load_COMP_strings(); #endif +#ifdef OPENSSL_FIPS + ERR_load_FIPS_strings(); +#endif } |