projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Harmonize Tru64 and Linux make rules.
[oweals/openssl.git]
/
crypto
/
o_fips.c
diff --git
a/crypto/o_fips.c
b/crypto/o_fips.c
index 9474a0d9afa4199f113935f91865167c48c20dfc..f6d1b21855ce54e2905ff4004ee698f6f3ae1436 100644
(file)
--- a/
crypto/o_fips.c
+++ b/
crypto/o_fips.c
@@
-64,6
+64,7
@@
int FIPS_mode(void)
{
int FIPS_mode(void)
{
+ OPENSSL_init();
#ifdef OPENSSL_FIPS
return FIPS_module_mode();
#else
#ifdef OPENSSL_FIPS
return FIPS_module_mode();
#else
@@
-75,7
+76,10
@@
int FIPS_mode_set(int r)
{
OPENSSL_init();
#ifdef OPENSSL_FIPS
{
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());
return 0;
if (r)
RAND_set_rand_method(FIPS_rand_get_method());