src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
   * 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
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
   * 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
*** 30,40 ****
  import java.math.BigInteger;
  import java.util.*;
  
  import java.security.*;
  
- import sun.security.action.GetPropertyAction;
  import sun.security.util.PropertyExpander;
  
  import sun.security.pkcs11.wrapper.*;
  import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
  import static sun.security.pkcs11.wrapper.CK_ATTRIBUTE.*;
--- 30,39 ----
*** 56,74 ****
      // same as allowSingleThreadedModules but controlled via a system property
      // and applied to all providers. if set to false, no SunPKCS11 instances
      // will accept single threaded modules regardless of the setting in their
      // config files.
      private static final boolean staticAllowSingleThreadedModules;
  
      static {
!         String p = "sun.security.pkcs11.allowSingleThreadedModules";
!         String s = AccessController.doPrivileged(new GetPropertyAction(p));
!         if ("false".equalsIgnoreCase(s)) {
              staticAllowSingleThreadedModules = false;
          } else {
              staticAllowSingleThreadedModules = true;
          }
      }
  
      private final static boolean DEBUG = false;
  
      private static void debug(Object o) {
--- 55,88 ----
      // same as allowSingleThreadedModules but controlled via a system property
      // and applied to all providers. if set to false, no SunPKCS11 instances
      // will accept single threaded modules regardless of the setting in their
      // config files.
      private static final boolean staticAllowSingleThreadedModules;
+     private static final String osName;
+     private static final String osArch;
  
      static {
!         List<String> props = AccessController.doPrivileged(
!             new PrivilegedAction<>() {
!                 @Override
!                 public List<String> run() {
!                     return List.of(
!                         System.getProperty(
!                             "sun.security.pkcs11.allowSingleThreadedModules",
!                             "true"),
!                         System.getProperty("os.name"),
!                         System.getProperty("os.arch"));
!                 }
!             }
!         );
!         if ("false".equalsIgnoreCase(props.get(0))) {
              staticAllowSingleThreadedModules = false;
          } else {
              staticAllowSingleThreadedModules = true;
          }
+         osName = props.get(1);
+         osArch = props.get(2);
      }
  
      private final static boolean DEBUG = false;
  
      private static void debug(Object o) {
*** 648,659 ****
          int i = lib.indexOf("/$ISA/");
          if (i != -1) {
              // replace "/$ISA/" with "/sparcv9/" on 64-bit Solaris SPARC
              // and with "/amd64/" on Solaris AMD64.
              // On all other platforms, just turn it into a "/"
-             String osName = System.getProperty("os.name", "");
-             String osArch = System.getProperty("os.arch", "");
              String prefix = lib.substring(0, i);
              String suffix = lib.substring(i + 5);
              if (osName.equals("SunOS") && osArch.equals("sparcv9")) {
                  lib = prefix + "/sparcv9" + suffix;
              } else if (osName.equals("SunOS") && osArch.equals("amd64")) {
--- 662,671 ----