projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change RNG test to block oriented instead of request oriented, add option
[openssl.git]
/
crypto
/
err
/
err_all.c
diff --git
a/crypto/err/err_all.c
b/crypto/err/err_all.c
index 5ab89f9498a9284aa770cdea1b9442288cd669c4..e40cda4bb3287f5e022d00acb6b079bfd1beb485 100644
(file)
--- a/
crypto/err/err_all.c
+++ b/
crypto/err/err_all.c
@@
-56,6
+56,8
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
+#define OPENSSL_NO_FIPS_ERR
+
#include <stdio.h>
#include <openssl/asn1.h>
#include <openssl/bn.h>
#include <stdio.h>
#include <openssl/asn1.h>
#include <openssl/bn.h>
@@
-95,15
+97,23
@@
#include <openssl/ui.h>
#include <openssl/ocsp.h>
#include <openssl/err.h>
#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>
#endif
#include <openssl/ts.h>
#ifndef OPENSSL_NO_CMS
#include <openssl/cms.h>
#endif
-
+#ifndef OPENSSL_NO_JPAKE
#include <openssl/jpake.h>
#include <openssl/jpake.h>
+#endif
+#include <openssl/comp.h>
void ERR_load_crypto_strings(void)
{
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();
#ifndef OPENSSL_NO_ERR
ERR_load_ERR_strings(); /* include error strings for SYSerr */
ERR_load_BN_strings();
@@
-147,9
+157,15
@@
void ERR_load_crypto_strings(void)
#endif
ERR_load_OCSP_strings();
ERR_load_UI_strings();
#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_CMS
ERR_load_CMS_strings();
#endif
+#ifndef OPENSSL_NO_JPAKE
ERR_load_JPAKE_strings();
ERR_load_JPAKE_strings();
+#endif
+ ERR_load_COMP_strings();
#endif
}
#endif
}