diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-12-23 19:02:52 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-12-23 19:02:52 +0000 |
| commit | 029bcfe189eae5eebbaf58ccff4e1200dd78b228 (patch) | |
| tree | 1c226a334ea1a88e2d1c6f949c9320eb0c3bff59 /security/nss/lib/sysinit | |
| parent | 149d2ffa779826cb48a381099858e76e4624d471 (diff) | |
| download | UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.gz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.lz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.tar.xz UXP-029bcfe189eae5eebbaf58ccff4e1200dd78b228.zip | |
Issue #1693 - Update NSS to 3.59.1.1
This updates to MoonchildProductions/NSS@bd49b2b88 in the repo created for our
consumption of the library.
Diffstat (limited to 'security/nss/lib/sysinit')
| -rw-r--r-- | security/nss/lib/sysinit/nsssysinit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/security/nss/lib/sysinit/nsssysinit.c b/security/nss/lib/sysinit/nsssysinit.c index bd0fac2f4..8793bf559 100644 --- a/security/nss/lib/sysinit/nsssysinit.c +++ b/security/nss/lib/sysinit/nsssysinit.c @@ -149,6 +149,7 @@ userCanModifySystemDB() return (access(NSS_DEFAULT_SYSTEM, W_OK) == 0); } +#ifndef NSS_FIPS_DISABLED static PRBool getFIPSEnv(void) { @@ -164,10 +165,12 @@ getFIPSEnv(void) } return PR_FALSE; } +#endif /* NSS_FIPS_DISABLED */ static PRBool getFIPSMode(void) { +#ifndef NSS_FIPS_DISABLED FILE *f; char d; size_t size; @@ -186,6 +189,9 @@ getFIPSMode(void) if (d != '1') return PR_FALSE; return PR_TRUE; +#else + return PR_FALSE; +#endif /* NSS_FIPS_DISABLED */ } #define NSS_DEFAULT_FLAGS "flags=readonly" |