summaryrefslogtreecommitdiff
path: root/providers/fips
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2021-05-05 10:36:41 +1000
committerShane Lontis <shane.lontis@oracle.com>2021-05-25 14:57:48 +1000
commit2abffec0f02ef400ca434890f5baf08fc24dd7ca (patch)
tree6a6a370c7b6be2effd7c834cdaa687dfa499a819 /providers/fips
parenta861711bcded8e259156342be697d72ec65f0aa2 (diff)
downloadopenssl-new-2abffec0f02ef400ca434890f5baf08fc24dd7ca.tar.gz
Add fipsinstall option to run self test KATS on module load
Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15149)
Diffstat (limited to 'providers/fips')
-rw-r--r--providers/fips/self_test.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c
index 34dbf6cb85..2b3b30de27 100644
--- a/providers/fips/self_test.c
+++ b/providers/fips/self_test.c
@@ -331,7 +331,11 @@ int SELF_TEST_post(SELF_TEST_POST_PARAMS *st, int on_demand_test)
}
}
- /* Only runs the KAT's during installation OR on_demand() */
+ /*
+ * Only runs the KAT's during installation OR on_demand().
+ * NOTE: If the installation option 'self_test_onload' is chosen then this
+ * path will always be run, since kats_already_passed will always be 0.
+ */
if (on_demand_test || kats_already_passed == 0) {
if (!SELF_TEST_kats(ev, st->libctx)) {
ERR_raise(ERR_LIB_PROV, PROV_R_SELF_TEST_KAT_FAILURE);