diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
| commit | aff03b0a67c41cf7af5df9c9eef715a8b27a2667 (patch) | |
| tree | aa2909ae4718f81c83c8cfb68c1f5a23485b3173 /security/nss/lib/freebl/nsslowhash.c | |
| parent | bdb4ff581677ad1cd411b55a68c87534f9a64882 (diff) | |
| parent | 11caf6ecb3cb8c84d2355a6c6e9580a290147e92 (diff) | |
| download | UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.gz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.lz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.xz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_dom_performance-resource-timing_1
Diffstat (limited to 'security/nss/lib/freebl/nsslowhash.c')
| -rw-r--r-- | security/nss/lib/freebl/nsslowhash.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/security/nss/lib/freebl/nsslowhash.c b/security/nss/lib/freebl/nsslowhash.c index 22f97810f..5ed039689 100644 --- a/security/nss/lib/freebl/nsslowhash.c +++ b/security/nss/lib/freebl/nsslowhash.c @@ -22,7 +22,6 @@ struct NSSLOWHASHContextStr { void *hashCtxt; }; -#ifndef NSS_FIPS_DISABLED static int nsslow_GetFIPSEnabled(void) { @@ -41,10 +40,9 @@ nsslow_GetFIPSEnabled(void) return 0; if (d != '1') return 0; -#endif /* LINUX */ +#endif return 1; } -#endif /* NSS_FIPS_DISABLED */ static NSSLOWInitContext dummyContext = { 0 }; static PRBool post_failed = PR_TRUE; @@ -56,7 +54,6 @@ NSSLOW_Init(void) (void)FREEBL_InitStubs(); #endif -#ifndef NSS_FIPS_DISABLED /* make sure the FIPS product is installed if we are trying to * go into FIPS mode */ if (nsslow_GetFIPSEnabled()) { @@ -66,7 +63,6 @@ NSSLOW_Init(void) return NULL; } } -#endif post_failed = PR_FALSE; return &dummyContext; |