diff options
| author | Kai Engert <kaie@kuix.de> | 2016-04-11 17:12:20 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2016-04-11 17:12:20 +0200 |
| commit | ebfb3b7624a2176663f4d74f30ab6878623a9a9c (patch) | |
| tree | f118c37162fd410a5861acd04856050004cab372 | |
| parent | 5c953bc78c85d8079334f4b2896aa080b2db6e70 (diff) | |
| download | nss-hg-ebfb3b7624a2176663f4d74f30ab6878623a9a9c.tar.gz | |
backout 8b5c760a62d4, bug 1262768
| -rw-r--r-- | coreconf/config.mk | 11 | ||||
| -rw-r--r-- | lib/freebl/fipsfreebl.c | 2 | ||||
| -rw-r--r-- | lib/softoken/fipstest.c | 2 | ||||
| -rw-r--r-- | lib/softoken/legacydb/lgfips.c | 4 |
4 files changed, 4 insertions, 15 deletions
diff --git a/coreconf/config.mk b/coreconf/config.mk index a0b81e42c..61d757bcc 100644 --- a/coreconf/config.mk +++ b/coreconf/config.mk @@ -174,17 +174,6 @@ ifdef NSS_PKIX_NO_LDAP DEFINES += -DNSS_PKIX_NO_LDAP endif -# FIPS support requires startup tests to be executed at load time of shared modules. -# For performance reasons, these tests are disabled by default. -# When compiling binaries that must support FIPS mode, -# you should define NSS_FORCE_FIPS -# -# NSS_NO_INIT_SUPPORT is always defined on platforms that don't support -# executing the startup tests at library load time. -ifndef NSS_FORCE_FIPS -DEFINES += -DNSS_NO_INIT_SUPPORT -endif - # Avoid building object leak test code for optimized library ifndef BUILD_OPT ifdef PKIX_OBJECT_LEAK_TEST diff --git a/lib/freebl/fipsfreebl.c b/lib/freebl/fipsfreebl.c index 61314ba38..a4679f729 100644 --- a/lib/freebl/fipsfreebl.c +++ b/lib/freebl/fipsfreebl.c @@ -43,7 +43,7 @@ static void INIT_FUNCTION bl_startup_tests(void); /* Windows pre-defined entry */ -#if defined(XP_WIN) && !defined(NSS_NO_INIT_SUPPORT) +#ifdef XP_WIN #include <windows.h> BOOL WINAPI DllMain( diff --git a/lib/softoken/fipstest.c b/lib/softoken/fipstest.c index fc1f0d0be..8f9f8cc3c 100644 --- a/lib/softoken/fipstest.c +++ b/lib/softoken/fipstest.c @@ -34,7 +34,7 @@ static void INIT_FUNCTION sftk_startup_tests(void); /* Windows pre-defined entry */ -#if defined(XP_WIN) && !defined(NSS_NO_INIT_SUPPORT) +#ifdef XP_WIN #include <windows.h> BOOL WINAPI DllMain( diff --git a/lib/softoken/legacydb/lgfips.c b/lib/softoken/legacydb/lgfips.c index 30d443b32..9d4bb2720 100644 --- a/lib/softoken/legacydb/lgfips.c +++ b/lib/softoken/legacydb/lgfips.c @@ -24,7 +24,7 @@ /* GCC Attribute */ -#if defined(__GNUC__) && !defined(NSS_NO_INIT_SUPPORT) +#ifdef __GNUC__ #define INIT_FUNCTION __attribute__((constructor)) #else #define INIT_FUNCTION @@ -33,7 +33,7 @@ static void INIT_FUNCTION lg_startup_tests(void); /* Windows pre-defined entry */ -#if defined(XP_WIN) && !defined(NSS_NO_INIT_SUPPORT) +#ifdef XP_WIN #include <windows.h> BOOL WINAPI DllMain( |