|
|
@ -151,7 +151,7 @@ diff -up openssl-3.0.1/crypto/provider_conf.c.fipsact openssl-3.0.1/crypto/provi
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
OSSL_PROVIDER_INFO entry;
|
|
|
|
OSSL_PROVIDER_INFO entry;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -306,6 +317,30 @@ static int provider_conf_init(CONF_IMODU
|
|
|
|
@@ -306,6 +317,33 @@ static int provider_conf_init(CONF_IMODU
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -173,6 +173,9 @@ diff -up openssl-3.0.1/crypto/provider_conf.c.fipsact openssl-3.0.1/crypto/provi
|
|
|
|
+ if (provider_conf_activate(libctx, "fips", NULL, NULL, 0, NULL) != 1)
|
|
|
|
+ if (provider_conf_activate(libctx, "fips", NULL, NULL, 0, NULL) != 1)
|
|
|
|
+ return 0;
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ /* provider_conf_load can return 1 even wwhen the test is failed so check explicitly */
|
|
|
|
|
|
|
|
+ if (OSSL_PROVIDER_available(libctx, "fips") != 1)
|
|
|
|
|
|
|
|
+ return 0;
|
|
|
|
+ if (provider_conf_activate(libctx, "base", NULL, NULL, 0, NULL) != 1)
|
|
|
|
+ if (provider_conf_activate(libctx, "base", NULL, NULL, 0, NULL) != 1)
|
|
|
|
+ return 0;
|
|
|
|
+ return 0;
|
|
|
|
+ if (EVP_default_properties_enable_fips(libctx, 1) != 1)
|
|
|
|
+ if (EVP_default_properties_enable_fips(libctx, 1) != 1)
|
|
|
|