088d6711db
* bmo#1915792 - Allow importing PKCS#8 private EC keys missing public key
* bmo#1909768 - UBSAN fix: applying zero offset to null pointer in sslsnce.c
* bmo#1919577 - set KRML_MUSTINLINE=inline in makefile builds
* bmo#1918965 - Don't set CKA_SIGN for CKK_EC_MONTGOMERY private keys
* bmo#1918767 - override default definition of KRML_MUSTINLINE
* bmo#1916525 - libssl support for mlkem768x25519
* bmo#1916524 - support for ML-KEM-768 in softoken and pk11wrap
* bmo#1866841 - Add Libcrux implementation of ML-KEM 768 to FreeBL
* bmo#1911912 - Avoid misuse of ctype(3) functions
* bmo#1917311 - part 2: run clang-format
* bmo#1917311 - part 1: upgrade to clang-format 13
* bmo#1916953 - clang-format fuzz
* bmo#1910370 - DTLS client message buffer may not empty be on retransmit
* bmo#1916413 - Optionally print config for TLS client and server
fuzz target
* bmo#1916059 - Fix some simple documentation issues in NSS.
* bmo#1915439 - improve performance of NSC_FindObjectsInit when
template has CKA_TOKEN attr
* bmo#1912828 - define CKM_NSS_ECDHE_NO_PAIRWISE_CHECK_KEY_PAIR_GEN
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=463
77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
# HG changeset patch
|
|
# User M. Sirringhaus <msirringhaus@suse.de>
|
|
# Date 1584305671 -3600
|
|
# Sun Mar 15 21:54:31 2020 +0100
|
|
# Node ID 715834d4a258c535f3abbf116d69d5e77392593b
|
|
# Parent 4ddd7d49eeed4ea32850daf41a472ccb50dee45e
|
|
commit facacdb9078693d7a4219e84f73ea7b8f977ddc2
|
|
Author: Hans Petter Jansson <hpj@cl.no>
|
|
Patch 32: nss-fips-detect-fips-mode-fixes.patch
|
|
|
|
Index: nss/lib/freebl/nsslowhash.c
|
|
===================================================================
|
|
--- nss.orig/lib/freebl/nsslowhash.c
|
|
+++ nss/lib/freebl/nsslowhash.c
|
|
@@ -2,9 +2,13 @@
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
+#define _GNU_SOURCE 1
|
|
+#include <stdlib.h>
|
|
+
|
|
#ifdef FREEBL_NO_DEPEND
|
|
#include "stubs.h"
|
|
#endif
|
|
+
|
|
#include "prtypes.h"
|
|
#include "prenv.h"
|
|
#include "secerr.h"
|
|
@@ -27,6 +31,22 @@ struct NSSLOWHASHContextStr {
|
|
static NSSLOWInitContext dummyContext = { 0 };
|
|
static PRBool post_failed = PR_TRUE;
|
|
|
|
+static PRBool
|
|
+getFIPSEnv(void)
|
|
+{
|
|
+ char *fipsEnv = secure_getenv("NSS_FIPS");
|
|
+ if (!fipsEnv) {
|
|
+ return PR_FALSE;
|
|
+ }
|
|
+ if ((strcasecmp(fipsEnv, "fips") == 0) ||
|
|
+ (strcasecmp(fipsEnv, "true") == 0) ||
|
|
+ (strcasecmp(fipsEnv, "on") == 0) ||
|
|
+ (strcasecmp(fipsEnv, "1") == 0)) {
|
|
+ return PR_TRUE;
|
|
+ }
|
|
+ return PR_FALSE;
|
|
+}
|
|
+
|
|
NSSLOWInitContext *
|
|
NSSLOW_Init(void)
|
|
{
|
|
@@ -37,7 +57,7 @@ NSSLOW_Init(void)
|
|
#ifndef NSS_FIPS_DISABLED
|
|
/* make sure the FIPS product is installed if we are trying to
|
|
* go into FIPS mode */
|
|
- if (NSS_GetSystemFIPSEnabled()) {
|
|
+ if (NSS_GetSystemFIPSEnabled() || getFIPSEnv()) {
|
|
if (BL_FIPSEntryOK(PR_TRUE, PR_FALSE) != SECSuccess) {
|
|
PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
|
|
post_failed = PR_TRUE;
|
|
Index: nss/lib/sysinit/nsssysinit.c
|
|
===================================================================
|
|
--- nss.orig/lib/sysinit/nsssysinit.c
|
|
+++ nss/lib/sysinit/nsssysinit.c
|
|
@@ -185,9 +185,9 @@ getFIPSMode(void)
|
|
size = fread(&d, 1, 1, f);
|
|
fclose(f);
|
|
if (size != 1)
|
|
- return PR_FALSE;
|
|
+ return getFIPSEnv();
|
|
if (d != '1')
|
|
- return PR_FALSE;
|
|
+ return getFIPSEnv();
|
|
return PR_TRUE;
|
|
#else
|
|
return PR_FALSE;
|