Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 89aaf16

Browse filesBrowse files
richardlauRafaelGSS
authored andcommitted
crypto: remove OPENSSL_FIPS guard for OpenSSL 3
The OPENSSL_FIPS guard is only needed for versions of OpenSSL earlier than 3.0. Removing the guard for OpenSSL 3 fixes `parallel/test-crypto-fips` when run with a FIPS enabled OpenSSL 3 configuration. PR-URL: #48392 Refs: #48379 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
1 parent b9c643e commit 89aaf16
Copy full SHA for 89aaf16

File tree

Expand file treeCollapse file tree

1 file changed

+2
-2
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-2
lines changed
Open diff view settings
Collapse file

‎src/crypto/crypto_util.cc‎

Copy file name to clipboardExpand all lines: src/crypto/crypto_util.cc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ void TestFipsCrypto(const v8::FunctionCallbackInfo<v8::Value>& args) {
253253
Mutex::ScopedLock lock(per_process::cli_options_mutex);
254254
Mutex::ScopedLock fips_lock(fips_mutex);
255255

256-
#ifdef OPENSSL_FIPS
257256
#if OPENSSL_VERSION_MAJOR >= 3
258257
OSSL_PROVIDER* fips_provider = nullptr;
259258
if (OSSL_PROVIDER_available(nullptr, "fips")) {
@@ -262,11 +261,12 @@ void TestFipsCrypto(const v8::FunctionCallbackInfo<v8::Value>& args) {
262261
const auto enabled = fips_provider == nullptr ? 0 :
263262
OSSL_PROVIDER_self_test(fips_provider) ? 1 : 0;
264263
#else
264+
#ifdef OPENSSL_FIPS
265265
const auto enabled = FIPS_selftest() ? 1 : 0;
266-
#endif
267266
#else // OPENSSL_FIPS
268267
const auto enabled = 0;
269268
#endif // OPENSSL_FIPS
269+
#endif
270270

271271
args.GetReturnValue().Set(enabled);
272272
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.