aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/err/err_all.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-26 15:53:07 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-01-26 15:53:07 +0000
commit5ca9cb7cbd6e69408221c80350e5e038cf9bfd04 (patch)
tree8778baa84010c71e683387c88f305927bf5161ff /crypto/err/err_all.c
parent83c3410b94ae3c845142fdfb55e245273846ecf0 (diff)
downloadopenssl-5ca9cb7cbd6e69408221c80350e5e038cf9bfd04.tar.gz
FIPS mode ERR changes. Redirect errors to tiny FIPS callbacks to avoid ERR
library dependencies.
Diffstat (limited to 'crypto/err/err_all.c')
-rw-r--r--crypto/err/err_all.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index fc049e8e88..3544e8fecd 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -56,6 +56,8 @@
* [including the GNU Public Licence.]
*/
+#define OPENSSL_NO_FIPS_ERR
+
#include <stdio.h>
#include <openssl/asn1.h>
#include <openssl/bn.h>
@@ -106,6 +108,9 @@
void ERR_load_crypto_strings(void)
{
+#ifdef OPENSSL_FIPS
+ FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata);
+#endif
#ifndef OPENSSL_NO_ERR
ERR_load_ERR_strings(); /* include error strings for SYSerr */
ERR_load_BN_strings();