diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4

index 16e906bdc6..1a352e5a32 100644

--- a/make/autoconf/libraries.m4

+++ b/make/autoconf/libraries.m4

@@ -101,6 +101,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],

   LIB_SETUP_LIBFFI

   LIB_SETUP_BUNDLED_LIBS

   LIB_SETUP_MISC_LIBS

+  LIB_SETUP_SYSCONF_LIBS

   LIB_SETUP_SOLARIS_STLPORT

   LIB_TESTS_SETUP_GRAALUNIT

@@ -223,3 +224,62 @@ AC_DEFUN_ONCE([LIB_SETUP_SOLARIS_STLPORT],

   fi

 ])

+################################################################################

+# Setup system configuration libraries

+################################################################################

+AC_DEFUN_ONCE([LIB_SETUP_SYSCONF_LIBS],

+[

+  ###############################################################################

+  #

+  # Check for the NSS library

+  #

+

+  AC_MSG_CHECKING([whether to use the system NSS library with the System Configurator (libsysconf)])

+

+  # default is not available

+  DEFAULT_SYSCONF_NSS=no

+

+  AC_ARG_ENABLE([sysconf-nss], [AS_HELP_STRING([--enable-sysconf-nss],

+     [build the System Configurator (libsysconf) using the system NSS library if available @<:@disabled@:>@])],

+  [

+    case "${enableval}" in

+      yes)

+        sysconf_nss=yes

+        ;;

+      *)

+        sysconf_nss=no

+        ;;

+    esac

+  ],

+  [

+    sysconf_nss=${DEFAULT_SYSCONF_NSS}

+  ])

+  AC_MSG_RESULT([$sysconf_nss])

+

+  USE_SYSCONF_NSS=false

+  if test "x${sysconf_nss}" = "xyes"; then

+      PKG_CHECK_MODULES(NSS, nss >= 3.53, [NSS_FOUND=yes], [NSS_FOUND=no])

+      if test "x${NSS_FOUND}" = "xyes"; then

+         AC_MSG_CHECKING([for system FIPS support in NSS])

+         saved_libs="${LIBS}"

+         saved_cflags="${CFLAGS}"

+         CFLAGS="${CFLAGS} ${NSS_CFLAGS}"

+         LIBS="${LIBS} ${NSS_LIBS}"

+         AC_LANG_PUSH([C])

+         AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <nss3/pk11pub.h>]],

+                                         [[SECMOD_GetSystemFIPSEnabled()]])],

+                        [AC_MSG_RESULT([yes])],

+                        [AC_MSG_RESULT([no])

+                        AC_MSG_ERROR([System NSS FIPS detection unavailable])])

+         AC_LANG_POP([C])

+         CFLAGS="${saved_cflags}"

+         LIBS="${saved_libs}"

+         USE_SYSCONF_NSS=true

+      else

+         dnl NSS 3.53 is the one that introduces the SECMOD_GetSystemFIPSEnabled API

+         dnl in nss3/pk11pub.h.

+         AC_MSG_ERROR([--enable-sysconf-nss specified, but NSS 3.53 or above not found.])

+      fi

+  fi

+  AC_SUBST(USE_SYSCONF_NSS)

+])

diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in

index 3787b12600..dab108a82b 100644

--- a/make/autoconf/spec.gmk.in

+++ b/make/autoconf/spec.gmk.in

@@ -848,6 +848,10 @@ INSTALL_SYSCONFDIR=@sysconfdir@

 # Libraries

 #

+USE_SYSCONF_NSS:=@USE_SYSCONF_NSS@

+NSS_LIBS:=@NSS_LIBS@

+NSS_CFLAGS:=@NSS_CFLAGS@

+

 USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@

 LCMS_CFLAGS:=@LCMS_CFLAGS@

 LCMS_LIBS:=@LCMS_LIBS@

diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk

index 4cd656a086..e1fc94b5b4 100644

--- a/make/lib/Lib-java.base.gmk

+++ b/make/lib/Lib-java.base.gmk

@@ -178,6 +178,31 @@ ifeq ($(call isTargetOsType, unix), true)

   endif

 endif

+################################################################################

+# Create the systemconf library

+

+LIBSYSTEMCONF_CFLAGS :=

+LIBSYSTEMCONF_CXXFLAGS :=

+

+ifeq ($(USE_SYSCONF_NSS), true)

+  LIBSYSTEMCONF_CFLAGS += $(NSS_CFLAGS) -DSYSCONF_NSS

+  LIBSYSTEMCONF_CXXFLAGS += $(NSS_CFLAGS) -DSYSCONF_NSS

+endif

+

+ifeq ($(OPENJDK_BUILD_OS), linux)

+  $(eval $(call SetupJdkLibrary, BUILD_LIBSYSTEMCONF, \

+      NAME := systemconf, \

+      OPTIMIZATION := LOW, \

+      CFLAGS := $(CFLAGS_JDKLIB) $(LIBSYSTEMCONF_CFLAGS), \

+      CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBSYSTEMCONF_CXXFLAGS), \

+      LDFLAGS := $(LDFLAGS_JDKLIB) \

+          $(call SET_SHARED_LIBRARY_ORIGIN), \

+      LIBS_unix := $(LIBDL) $(NSS_LIBS), \

+  ))

+

+  TARGETS += $(BUILD_LIBSYSTEMCONF)

+endif

+

 ################################################################################

 # Create the symbols file for static builds.

diff --git a/make/nb_native/nbproject/configurations.xml b/make/nb_native/nbproject/configurations.xml

index fb07d54c1f..c5813e2b7a 100644

--- a/make/nb_native/nbproject/configurations.xml

+++ b/make/nb_native/nbproject/configurations.xml

@@ -2950,6 +2950,9 @@

                   <in>LinuxWatchService.c</in>

                 </df>

               </df>

+              <df name="libsystemconf">

+                <in>systemconf.c</in>

+              </df>

             </df>

           </df>

           <df name="macosx">

@@ -29301,6 +29304,11 @@

             tool="0"

             flavor2="0">

       </item>

+      

+            ex="false"

+            tool="0"

+            flavor2="0">

+      </item>

             ex="false"

             tool="3"

diff --git a/make/scripts/compare_exceptions.sh.incl b/make/scripts/compare_exceptions.sh.incl

index 6327040964..6b3780123b 100644

--- a/make/scripts/compare_exceptions.sh.incl

+++ b/make/scripts/compare_exceptions.sh.incl

@@ -179,6 +179,7 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ];

       ./lib/libsplashscreen.so

       ./lib/libsunec.so

       ./lib/libsunwjdga.so

+      ./lib/libsystemconf.so

       ./lib/libunpack.so

       ./lib/libverify.so

       ./lib/libzip.so

@@ -289,6 +290,7 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ]

       ./lib/libsplashscreen.so

       ./lib/libsunec.so

       ./lib/libsunwjdga.so

+      ./lib/libsystemconf.so

       ./lib/libunpack.so

       ./lib/libverify.so

       ./lib/libzip.so

diff --git a/src/java.base/linux/native/libsystemconf/systemconf.c b/src/java.base/linux/native/libsystemconf/systemconf.c

new file mode 100644

index 0000000000..8dcb7d9073

--- /dev/null

+++ b/src/java.base/linux/native/libsystemconf/systemconf.c

@@ -0,0 +1,224 @@

+/*

+ * Copyright (c) 2021, Red Hat, Inc.

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ *

+ * This code is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License version 2 only, as

+ * published by the Free Software Foundation.  Oracle designates this

+ * particular file as subject to the "Classpath" exception as provided

+ * by Oracle in the LICENSE file that accompanied this code.

+ *

+ * This code is distributed in the hope that it will be useful, but WITHOUT

+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

+ * version 2 for more details (a copy is included in the LICENSE file that

+ * accompanied this code).

+ *

+ * You should have received a copy of the GNU General Public License version

+ * 2 along with this work; if not, write to the Free Software Foundation,

+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

+ *

+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA

+ * or visit www.oracle.com if you need additional information or have any

+ * questions.

+ */

+

+#include <jni.h>

+#include <jni_util.h>

+#include "jvm_md.h"

+#include <stdio.h>

+

+#ifdef SYSCONF_NSS

+#include <nss3/pk11pub.h>

+#else

+#include <dlfcn.h>

+#endif //SYSCONF_NSS

+

+#include "java_security_SystemConfigurator.h"

+

+#define MSG_MAX_SIZE 256

+#define FIPS_ENABLED_PATH "/proc/sys/crypto/fips_enabled"

+

+typedef int (SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE)(void);

+

+static SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE *getSystemFIPSEnabled;

+static jmethodID debugPrintlnMethodID = NULL;

+static jobject debugObj = NULL;

+

+static void dbgPrint(JNIEnv *env, const char* msg)

+{

+    jstring jMsg;

+    if (debugObj != NULL) {

+        jMsg = (*env)->NewStringUTF(env, msg);

+        CHECK_NULL(jMsg);

+        (*env)->CallVoidMethod(env, debugObj, debugPrintlnMethodID, jMsg);

+    }

+}

+

+static void throwIOException(JNIEnv *env, const char *msg)

+{

+    jclass cls = (*env)->FindClass(env, "java/io/IOException");

+    if (cls != 0)

+        (*env)->ThrowNew(env, cls, msg);

+}

+

+static void handle_msg(JNIEnv *env, const char* msg, int msg_bytes)

+{

+  if (msg_bytes > 0 && msg_bytes < MSG_MAX_SIZE) {

+    dbgPrint(env, msg);

+  } else {

+    dbgPrint(env, "systemconf: cannot render message");

+  }

+}

+

+// Only used when NSS is not linked at build time

+#ifndef SYSCONF_NSS

+

+static void *nss_handle;

+

+static jboolean loadNSS(JNIEnv *env)

+{

+  char msg[MSG_MAX_SIZE];

+  int msg_bytes;

+  const char* errmsg;

+

+  nss_handle = dlopen(JNI_LIB_NAME("nss3"), RTLD_LAZY);

+  if (nss_handle == NULL) {

+    errmsg = dlerror();

+    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "loadNSS: dlopen: %s\n",

+                         errmsg);

+    handle_msg(env, msg, msg_bytes);

+    return JNI_FALSE;

+  }

+  dlerror(); /* Clear errors */

+  getSystemFIPSEnabled = (SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE*)dlsym(nss_handle, "SECMOD_GetSystemFIPSEnabled");

+  if ((errmsg = dlerror()) != NULL) {

+    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "loadNSS: dlsym: %s\n",

+                         errmsg);

+    handle_msg(env, msg, msg_bytes);

+    return JNI_FALSE;

+  }

+  return JNI_TRUE;

+}

+

+static void closeNSS(JNIEnv *env)

+{

+  char msg[MSG_MAX_SIZE];

+  int msg_bytes;

+  const char* errmsg;

+

+  if (dlclose(nss_handle) != 0) {

+    errmsg = dlerror();

+    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "closeNSS: dlclose: %s\n",

+                         errmsg);

+    handle_msg(env, msg, msg_bytes);

+  }

+}

+

+#endif

+

+/*

+ * Class:     java_security_SystemConfigurator

+ * Method:    JNI_OnLoad

+ */

+JNIEXPORT jint JNICALL DEF_JNI_OnLoad(JavaVM *vm, void *reserved)

+{

+    JNIEnv *env;

+    jclass sysConfCls, debugCls;

+    jfieldID sdebugFld;

+

+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {

+        return JNI_EVERSION; /* JNI version not supported */

+    }

+

+    sysConfCls = (*env)->FindClass(env,"java/security/SystemConfigurator");

+    if (sysConfCls == NULL) {

+        printf("libsystemconf: SystemConfigurator class not found\n");

+        return JNI_ERR;

+    }

+    sdebugFld = (*env)->GetStaticFieldID(env, sysConfCls,

+            "sdebug", "Lsun/security/util/Debug;");

+    if (sdebugFld == NULL) {

+        printf("libsystemconf: SystemConfigurator::sdebug field not found\n");

+        return JNI_ERR;

+    }

+    debugObj = (*env)->GetStaticObjectField(env, sysConfCls, sdebugFld);

+    if (debugObj != NULL) {

+        debugCls = (*env)->FindClass(env,"sun/security/util/Debug");

+        if (debugCls == NULL) {

+            printf("libsystemconf: Debug class not found\n");

+            return JNI_ERR;

+        }

+        debugPrintlnMethodID = (*env)->GetMethodID(env, debugCls,

+                "println", "(Ljava/lang/String;)V");

+        if (debugPrintlnMethodID == NULL) {

+            printf("libsystemconf: Debug::println(String) method not found\n");

+            return JNI_ERR;

+        }

+        debugObj = (*env)->NewGlobalRef(env, debugObj);

+    }

+

+#ifdef SYSCONF_NSS

+    getSystemFIPSEnabled = *SECMOD_GetSystemFIPSEnabled;

+#else

+    if (loadNSS(env) == JNI_FALSE) {

+      dbgPrint(env, "libsystemconf: Failed to load NSS library.");

+    }

+#endif

+

+    return (*env)->GetVersion(env);

+}

+

+/*

+ * Class:     java_security_SystemConfigurator

+ * Method:    JNI_OnUnload

+ */

+JNIEXPORT void JNICALL DEF_JNI_OnUnload(JavaVM *vm, void *reserved)

+{

+    JNIEnv *env;

+

+    if (debugObj != NULL) {

+        if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {

+            return; /* Should not happen */

+        }

+#ifndef SYSCONF_NSS

+        closeNSS(env);

+#endif

+        (*env)->DeleteGlobalRef(env, debugObj);

+    }

+}

+

+JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEnabled

+  (JNIEnv *env, jclass cls)

+{

+    int fips_enabled;

+    char msg[MSG_MAX_SIZE];

+    int msg_bytes;

+

+    if (getSystemFIPSEnabled != NULL) {

+      dbgPrint(env, "getSystemFIPSEnabled: calling SECMOD_GetSystemFIPSEnabled");

+      fips_enabled = (*getSystemFIPSEnabled)();

+      msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:"   \

+                           " SECMOD_GetSystemFIPSEnabled returned 0x%x", fips_enabled);

+      handle_msg(env, msg, msg_bytes);

+      return (fips_enabled == 1 ? JNI_TRUE : JNI_FALSE);

+    } else {

+      FILE *fe;

+

+      dbgPrint(env, "getSystemFIPSEnabled: reading " FIPS_ENABLED_PATH);

+      if ((fe = fopen(FIPS_ENABLED_PATH, "r")) == NULL) {

+        throwIOException(env, "Cannot open " FIPS_ENABLED_PATH);

+        return JNI_FALSE;

+      }

+      fips_enabled = fgetc(fe);

+      fclose(fe);

+      if (fips_enabled == EOF) {

+        throwIOException(env, "Cannot read " FIPS_ENABLED_PATH);

+        return JNI_FALSE;

+      }

+      msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:"   \

+                           " read character is '%c'", fips_enabled);

+      handle_msg(env, msg, msg_bytes);

+      return (fips_enabled == '1' ? JNI_TRUE : JNI_FALSE);

+    }

+}

diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java

index b36510a376..ad5182e1e7 100644

--- a/src/java.base/share/classes/java/security/Security.java

+++ b/src/java.base/share/classes/java/security/Security.java

@@ -32,6 +32,7 @@ import java.net.URL;

 import jdk.internal.event.EventHelper;

 import jdk.internal.event.SecurityPropertyModificationEvent;

+import jdk.internal.misc.JavaSecuritySystemConfiguratorAccess;

 import jdk.internal.misc.SharedSecrets;

 import jdk.internal.util.StaticProperty;

 import sun.security.util.Debug;

@@ -47,12 +48,20 @@ import sun.security.jca.*;

  * implementation-specific location, which is typically the properties file

  * {@code conf/security/java.security} in the Java installation directory.

  *

+ * 
Additional default values of security properties are read from a

+ * system-specific location, if available.

+ *

  * @author Benjamin Renaud

  * @since 1.1

  */

 public final class Security {

+    private static final String SYS_PROP_SWITCH =

+        "java.security.disableSystemPropertiesFile";

+    private static final String SEC_PROP_SWITCH =

+        "security.useSystemPropertiesFile";

+

     /* Are we debugging? -- for developers */

     private static final Debug sdebug =

                         Debug.getInstance("properties");

@@ -67,6 +76,19 @@ public final class Security {

     }

     static {

+        // Initialise here as used by code with system properties disabled

+        SharedSecrets.setJavaSecuritySystemConfiguratorAccess(

+            new JavaSecuritySystemConfiguratorAccess() {

+                @Override

+                public boolean isSystemFipsEnabled() {

+                    return SystemConfigurator.isSystemFipsEnabled();

+                }

+                @Override

+                public boolean isPlainKeySupportEnabled() {

+                    return SystemConfigurator.isPlainKeySupportEnabled();

+                }

+            });

+

         // doPrivileged here because there are multiple

         // things in initialize that might require privs.

         // (the FileInputStream call and the File.exists call,

@@ -83,6 +105,7 @@ public final class Security {

         props = new Properties();

         boolean loadedProps = false;

         boolean overrideAll = false;

+        boolean systemSecPropsEnabled = false;

         // first load the system properties file

         // to determine the value of security.overridePropertiesFile

@@ -98,6 +121,7 @@ public final class Security {

                 if (sdebug != null) {

                     sdebug.println("reading security properties file: " +

                                 propFile);

+                    sdebug.println(props.toString());

                 }

             } catch (IOException e) {

                 if (sdebug != null) {

@@ -192,6 +216,61 @@ public final class Security {

             }

         }

+        boolean sysUseProps = Boolean.valueOf(System.getProperty(SYS_PROP_SWITCH, "false"));

+        boolean secUseProps = Boolean.valueOf(props.getProperty(SEC_PROP_SWITCH));

+        if (sdebug != null) {

+            sdebug.println(SYS_PROP_SWITCH + "=" + sysUseProps);

+            sdebug.println(SEC_PROP_SWITCH + "=" + secUseProps);

+        }

+        if (!sysUseProps && secUseProps) {

+            systemSecPropsEnabled = SystemConfigurator.configureSysProps(props);

+            if (!systemSecPropsEnabled) {

+                if (sdebug != null) {

+                    sdebug.println("WARNING: System security properties could not be loaded.");

+                }

+            }

+        } else {

+            if (sdebug != null) {

+                sdebug.println("System security property support disabled by user.");

+            }

+        }

+

+        // FIPS support depends on the contents of java.security so

+        // ensure it has loaded first

+        if (loadedProps && systemSecPropsEnabled) {

+            boolean shouldEnable;

+            String sysProp = System.getProperty("com.redhat.fips");

+            if (sysProp == null) {

+                shouldEnable = true;

+                if (sdebug != null) {

+                    sdebug.println("com.redhat.fips unset, using default value of true");

+                }

+            } else {

+                shouldEnable = Boolean.valueOf(sysProp);

+                if (sdebug != null) {

+                    sdebug.println("com.redhat.fips set, using its value " + shouldEnable);

+                }

+            }

+            if (shouldEnable) {

+                boolean fipsEnabled = SystemConfigurator.configureFIPS(props);

+                if (sdebug != null) {

+                    if (fipsEnabled) {

+                        sdebug.println("FIPS mode support configured and enabled.");

+                    } else {

+                        sdebug.println("FIPS mode support disabled.");

+                    }

+                }

+            } else {

+                if (sdebug != null ) {

+                    sdebug.println("FIPS mode support disabled by user.");

+                }

+            }

+        } else {

+            if (sdebug != null) {

+                sdebug.println("WARNING: FIPS mode support can not be enabled without " +

+                               "system security properties being enabled.");

+            }

+        }

     }

     /*

diff --git a/src/java.base/share/classes/java/security/SystemConfigurator.java b/src/java.base/share/classes/java/security/SystemConfigurator.java

new file mode 100644

index 0000000000..90f6dd2ebc

--- /dev/null

+++ b/src/java.base/share/classes/java/security/SystemConfigurator.java

@@ -0,0 +1,248 @@

+/*

+ * Copyright (c) 2019, 2021, Red Hat, Inc.

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ *

+ * This code is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License version 2 only, as

+ * published by the Free Software Foundation.  Oracle designates this

+ * particular file as subject to the "Classpath" exception as provided

+ * by Oracle in the LICENSE file that accompanied this code.

+ *

+ * This code is distributed in the hope that it will be useful, but WITHOUT

+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

+ * version 2 for more details (a copy is included in the LICENSE file that

+ * accompanied this code).

+ *

+ * You should have received a copy of the GNU General Public License version

+ * 2 along with this work; if not, write to the Free Software Foundation,

+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

+ *

+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA

+ * or visit www.oracle.com if you need additional information or have any

+ * questions.

+ */

+

+package java.security;

+

+import java.io.BufferedInputStream;

+import java.io.FileInputStream;

+import java.io.IOException;

+

+import java.util.Iterator;

+import java.util.Map.Entry;

+import java.util.Properties;

+

+import sun.security.util.Debug;

+

+/**

+ * Internal class to align OpenJDK with global crypto-policies.

+ * Called from java.security.Security class initialization,

+ * during startup.

+ *

+ */

+

+final class SystemConfigurator {

+

+    private static final Debug sdebug =

+            Debug.getInstance("properties");

+

+    private static final String CRYPTO_POLICIES_BASE_DIR =

+            "/etc/crypto-policies";

+

+    private static final String CRYPTO_POLICIES_JAVA_CONFIG =

+            CRYPTO_POLICIES_BASE_DIR + "/back-ends/java.config";

+

+    private static boolean systemFipsEnabled = false;

+    private static boolean plainKeySupportEnabled = false;

+

+    private static final String SYSTEMCONF_NATIVE_LIB = "systemconf";

+

+    private static native boolean getSystemFIPSEnabled()

+            throws IOException;

+

+    static {

+        AccessController.doPrivileged(new PrivilegedAction<Void>() {

+            public Void run() {

+                System.loadLibrary(SYSTEMCONF_NATIVE_LIB);

+                return null;

+            }

+        });

+    }

+

+    /*

+     * Invoked when java.security.Security class is initialized, if

+     * java.security.disableSystemPropertiesFile property is not set and

+     * security.useSystemPropertiesFile is true.

+     */

+    static boolean configureSysProps(Properties props) {

+        boolean systemSecPropsLoaded = false;

+

+        try (BufferedInputStream bis =

+                new BufferedInputStream(

+                        new FileInputStream(CRYPTO_POLICIES_JAVA_CONFIG))) {

+            props.load(bis);

+            systemSecPropsLoaded = true;

+            if (sdebug != null) {

+                sdebug.println("reading system security properties file " +

+                        CRYPTO_POLICIES_JAVA_CONFIG);

+                sdebug.println(props.toString());

+            }

+        } catch (IOException e) {

+            if (sdebug != null) {

+                sdebug.println("unable to load security properties from " +

+                        CRYPTO_POLICIES_JAVA_CONFIG);

+                e.printStackTrace();

+            }

+        }

+        return systemSecPropsLoaded;

+    }

+

+    /*

+     * Invoked at the end of java.security.Security initialisation

+     * if java.security properties have been loaded

+     */

+    static boolean configureFIPS(Properties props) {

+        boolean loadedProps = false;

+

+        try {

+            if (enableFips()) {

+                if (sdebug != null) { sdebug.println("FIPS mode detected"); }

+                // Remove all security providers

+                Iterator<Entry<Object, Object>> i = props.entrySet().iterator();

+                while (i.hasNext()) {

+                    Entry<Object, Object> e = i.next();

+                    if (((String) e.getKey()).startsWith("security.provider")) {

+                        if (sdebug != null) { sdebug.println("Removing provider: " + e); }

+                        i.remove();

+                    }

+                }

+                // Add FIPS security providers

+                String fipsProviderValue = null;

+                for (int n = 1;

+                     (fipsProviderValue = (String) props.get("fips.provider." + n)) != null; n++) {

+                    String fipsProviderKey = "security.provider." + n;

+                    if (sdebug != null) {

+                        sdebug.println("Adding provider " + n + ": " +

+                                fipsProviderKey + "=" + fipsProviderValue);

+                    }

+                    props.put(fipsProviderKey, fipsProviderValue);

+                }

+                // Add other security properties

+                String keystoreTypeValue = (String) props.get("fips.keystore.type");

+                if (keystoreTypeValue != null) {

+                    String nonFipsKeystoreType = props.getProperty("keystore.type");

+                    props.put("keystore.type", keystoreTypeValue);

+                    if (keystoreTypeValue.equals("PKCS11")) {

+                        // If keystore.type is PKCS11, javax.net.ssl.keyStore

+                        // must be "NONE". See JDK-8238264.

+                        System.setProperty("javax.net.ssl.keyStore", "NONE");

+                    }

+                    if (System.getProperty("javax.net.ssl.trustStoreType") == null) {

+                        // If no trustStoreType has been set, use the

+                        // previous keystore.type under FIPS mode. In

+                        // a default configuration, the Trust Store will

+                        // be 'cacerts' (JKS type).

+                        System.setProperty("javax.net.ssl.trustStoreType",

+                                nonFipsKeystoreType);

+                    }

+                    if (sdebug != null) {

+                        sdebug.println("FIPS mode default keystore.type = " +

+                                keystoreTypeValue);

+                        sdebug.println("FIPS mode javax.net.ssl.keyStore = " +

+                                System.getProperty("javax.net.ssl.keyStore", ""));

+                        sdebug.println("FIPS mode javax.net.ssl.trustStoreType = " +

+                                System.getProperty("javax.net.ssl.trustStoreType", ""));

+                    }

+                }

+                loadedProps = true;

+                systemFipsEnabled = true;

+                String plainKeySupport = System.getProperty("com.redhat.fips.plainKeySupport",

+                                                            "true");

+                plainKeySupportEnabled = !"false".equals(plainKeySupport);

+                if (sdebug != null) {

+                    if (plainKeySupportEnabled) {

+                        sdebug.println("FIPS support enabled with plain key support");

+                    } else {

+                        sdebug.println("FIPS support enabled without plain key support");

+                    }

+                }

+            } else {

+                if (sdebug != null) { sdebug.println("FIPS mode not detected"); }

+            }

+        } catch (Exception e) {

+            if (sdebug != null) {

+                sdebug.println("unable to load FIPS configuration");

+                e.printStackTrace();

+            }

+        }

+        return loadedProps;