summaryrefslogtreecommitdiffstats
path: root/crypto/o_fips.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-10-21 13:04:27 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-10-21 13:04:27 +0000
commit03f84c826056529dc3a093c810091c17e68d4557 (patch)
tree65112c8a506640caf07447fc1a979bded5f83792 /crypto/o_fips.c
parent6d5eb464c9c741711128387bb27e4732fbd2ffef (diff)
Update error codes for FIPS.
Add support for authentication in FIPS_mode_set().
Diffstat (limited to 'crypto/o_fips.c')
-rw-r--r--crypto/o_fips.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/o_fips.c b/crypto/o_fips.c
index 9474a0d9af..6a82395750 100644
--- a/crypto/o_fips.c
+++ b/crypto/o_fips.c
@@ -75,7 +75,10 @@ int FIPS_mode_set(int r)
{
OPENSSL_init();
#ifdef OPENSSL_FIPS
- if (!FIPS_module_mode_set(r))
+#ifndef FIPS_AUTH_USER_PASS
+#define FIPS_AUTH_USER_PASS "Default FIPS Crypto User Password"
+#endif
+ if (!FIPS_module_mode_set(r, FIPS_AUTH_USER_PASS))
return 0;
if (r)
RAND_set_rand_method(FIPS_rand_get_method());