diff options
| author | Anthony Scarpino <Anthony.Scarpino@Sun.COM> | 2009-10-08 14:08:48 -0700 |
|---|---|---|
| committer | Anthony Scarpino <Anthony.Scarpino@Sun.COM> | 2009-10-08 14:08:48 -0700 |
| commit | baaf2378006f54bfe76025b1fdd5c01f9a0a0f87 (patch) | |
| tree | 969edbd7dac2bcecdd2fb957744cb7ce77849dd5 /usr/src/uts/common/crypto | |
| parent | 4165f46543b20d435f7ef0aced6239f7e97b12ff (diff) | |
| download | illumos-joyent-baaf2378006f54bfe76025b1fdd5c01f9a0a0f87.tar.gz | |
6889491 DEBUG kernels panic during startup in fips140_actions
Diffstat (limited to 'usr/src/uts/common/crypto')
| -rw-r--r-- | usr/src/uts/common/crypto/core/kcf.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/usr/src/uts/common/crypto/core/kcf.c b/usr/src/uts/common/crypto/core/kcf.c index 114e774fa8..ccfeaffcbd 100644 --- a/usr/src/uts/common/crypto/core/kcf.c +++ b/usr/src/uts/common/crypto/core/kcf.c @@ -221,13 +221,15 @@ kcf_activate() KCF_PROV_REFRELE(pd); } + /* If we are not in FIPS 140 mode exit */ + if (global_fips140_mode == FIPS140_MODE_DISABLED) + return; + /* If we in the process of validating FIPS 140, enable it */ - if (global_fips140_mode != FIPS140_MODE_DISABLED) { - mutex_enter(&fips140_mode_lock); - global_fips140_mode = FIPS140_MODE_ENABLED; - cv_signal(&cv_fips140); - mutex_exit(&fips140_mode_lock); - } + mutex_enter(&fips140_mode_lock); + global_fips140_mode = FIPS140_MODE_ENABLED; + cv_signal(&cv_fips140); + mutex_exit(&fips140_mode_lock); verify_unverified_providers(); } |