Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Revert openssl fips mode setting" #26

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Revert openssl fips mode setting" #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/openssl.patch/10-support-fips-mode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,23 @@ index 1b0d523bea..31fbd42cd2 100644
# ifndef OPENSSL_NO_STATIC_ENGINE
# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
if ((opts & OPENSSL_INIT_ENGINE_PADLOCK)
diff --git a/crypto/o_fips.c b/crypto/o_fips.c
index 050ea9c216..6e9ffdb1d9 100644
--- a/crypto/o_fips.c
+++ b/crypto/o_fips.c
@@ -9,8 +9,12 @@

#include "internal/cryptlib.h"

+extern int g_fips_mode_enabled;
int FIPS_mode(void)
{
+ if (g_fips_mode_enabled == 1){
+ return g_fips_mode_enabled;
+ }
/* This version of the library does not support FIPS mode. */
return 0;
}
diff --git a/crypto/engine/build.info b/crypto/engine/build.info
index e00802a3fd..66bb39fa38 100644
--- a/crypto/engine/build.info
Expand Down