Compare commits
No commits in common. "imports/c8s/java-17-openjdk-17.0.0.0.33-0.5.ea.el8" and "c8-beta" have entirely different histories.
imports/c8
...
c8-beta
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/openjdk-jdk17-jdk-17+33.tar.xz
|
SOURCES/openjdk-jdk17u-jdk-17.0.6+9.tar.xz
|
||||||
SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
e2edecf5fbb3d791367caf2a0e148d643ad7e9cf SOURCES/openjdk-jdk17-jdk-17+33.tar.xz
|
95213324016613e314e5c97dc87f31a0576df00c SOURCES/openjdk-jdk17u-jdk-17.0.6+9.tar.xz
|
||||||
7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||||
|
65
SOURCES/CheckVendor.java
Normal file
65
SOURCES/CheckVendor.java
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
/* CheckVendor -- Check the vendor properties match specified values.
|
||||||
|
Copyright (C) 2020 Red Hat, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public class CheckVendor {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
if (args.length < 4) {
|
||||||
|
System.err.println("CheckVendor <VENDOR> <VENDOR-URL> <VENDOR-BUG-URL> <VENDOR-VERSION-STRING>");
|
||||||
|
System.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
String vendor = System.getProperty("java.vendor");
|
||||||
|
String expectedVendor = args[0];
|
||||||
|
String vendorURL = System.getProperty("java.vendor.url");
|
||||||
|
String expectedVendorURL = args[1];
|
||||||
|
String vendorBugURL = System.getProperty("java.vendor.url.bug");
|
||||||
|
String expectedVendorBugURL = args[2];
|
||||||
|
String vendorVersionString = System.getProperty("java.vendor.version");
|
||||||
|
String expectedVendorVersionString = args[3];
|
||||||
|
|
||||||
|
if (!expectedVendor.equals(vendor)) {
|
||||||
|
System.err.printf("Invalid vendor %s, expected %s\n",
|
||||||
|
vendor, expectedVendor);
|
||||||
|
System.exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedVendorURL.equals(vendorURL)) {
|
||||||
|
System.err.printf("Invalid vendor URL %s, expected %s\n",
|
||||||
|
vendorURL, expectedVendorURL);
|
||||||
|
System.exit(3);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedVendorBugURL.equals(vendorBugURL)) {
|
||||||
|
System.err.printf("Invalid vendor bug URL %s, expected %s\n",
|
||||||
|
vendorBugURL, expectedVendorBugURL);
|
||||||
|
System.exit(4);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedVendorVersionString.equals(vendorVersionString)) {
|
||||||
|
System.err.printf("Invalid vendor version string %s, expected %s\n",
|
||||||
|
vendorVersionString, expectedVendorVersionString);
|
||||||
|
System.exit(5);
|
||||||
|
}
|
||||||
|
|
||||||
|
System.err.printf("Vendor information verified as %s, %s, %s, %s\n",
|
||||||
|
vendor, vendorURL, vendorBugURL, vendorVersionString);
|
||||||
|
}
|
||||||
|
}
|
2297
SOURCES/NEWS
2297
SOURCES/NEWS
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,20 @@
|
|||||||
|
/* TestSecurityProperties -- Ensure system security properties can be used to
|
||||||
|
enable the crypto policies.
|
||||||
|
Copyright (C) 2022 Red Hat, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.security.Security;
|
import java.security.Security;
|
||||||
@ -9,9 +26,24 @@ public class TestSecurityProperties {
|
|||||||
// JDK 8
|
// JDK 8
|
||||||
private static final String JDK_PROPS_FILE_JDK_8 = System.getProperty("java.home") + "/lib/security/java.security";
|
private static final String JDK_PROPS_FILE_JDK_8 = System.getProperty("java.home") + "/lib/security/java.security";
|
||||||
|
|
||||||
|
private static final String POLICY_FILE = "/etc/crypto-policies/back-ends/java.config";
|
||||||
|
|
||||||
|
private static final String MSG_PREFIX = "DEBUG: ";
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
if (args.length == 0) {
|
||||||
|
System.err.println("TestSecurityProperties <true|false>");
|
||||||
|
System.err.println("Invoke with 'true' if system security properties should be enabled.");
|
||||||
|
System.err.println("Invoke with 'false' if system security properties should be disabled.");
|
||||||
|
System.exit(1);
|
||||||
|
}
|
||||||
|
boolean enabled = Boolean.valueOf(args[0]);
|
||||||
|
System.out.println(MSG_PREFIX + "System security properties enabled: " + enabled);
|
||||||
Properties jdkProps = new Properties();
|
Properties jdkProps = new Properties();
|
||||||
loadProperties(jdkProps);
|
loadProperties(jdkProps);
|
||||||
|
if (enabled) {
|
||||||
|
loadPolicy(jdkProps);
|
||||||
|
}
|
||||||
for (Object key: jdkProps.keySet()) {
|
for (Object key: jdkProps.keySet()) {
|
||||||
String sKey = (String)key;
|
String sKey = (String)key;
|
||||||
String securityVal = Security.getProperty(sKey);
|
String securityVal = Security.getProperty(sKey);
|
||||||
@ -21,7 +53,7 @@ public class TestSecurityProperties {
|
|||||||
sKey + "'" + " but got value '" + securityVal + "'";
|
sKey + "'" + " but got value '" + securityVal + "'";
|
||||||
throw new RuntimeException("Test failed! " + msg);
|
throw new RuntimeException("Test failed! " + msg);
|
||||||
} else {
|
} else {
|
||||||
System.out.println("DEBUG: " + sKey + " = " + jdkSecVal + " as expected.");
|
System.out.println(MSG_PREFIX + sKey + " = " + jdkSecVal + " as expected.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.out.println("TestSecurityProperties PASSED!");
|
System.out.println("TestSecurityProperties PASSED!");
|
||||||
@ -29,15 +61,24 @@ public class TestSecurityProperties {
|
|||||||
|
|
||||||
private static void loadProperties(Properties props) {
|
private static void loadProperties(Properties props) {
|
||||||
String javaVersion = System.getProperty("java.version");
|
String javaVersion = System.getProperty("java.version");
|
||||||
System.out.println("Debug: Java version is " + javaVersion);
|
System.out.println(MSG_PREFIX + "Java version is " + javaVersion);
|
||||||
String propsFile = JDK_PROPS_FILE_JDK_11;
|
String propsFile = JDK_PROPS_FILE_JDK_11;
|
||||||
if (javaVersion.startsWith("1.8.0")) {
|
if (javaVersion.startsWith("1.8.0")) {
|
||||||
propsFile = JDK_PROPS_FILE_JDK_8;
|
propsFile = JDK_PROPS_FILE_JDK_8;
|
||||||
}
|
}
|
||||||
try (FileInputStream fin = new FileInputStream(new File(propsFile))) {
|
try (FileInputStream fin = new FileInputStream(propsFile)) {
|
||||||
props.load(fin);
|
props.load(fin);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException("Test failed!", e);
|
throw new RuntimeException("Test failed!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void loadPolicy(Properties props) {
|
||||||
|
try (FileInputStream fin = new FileInputStream(POLICY_FILE)) {
|
||||||
|
props.load(fin);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException("Test failed!", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
160
SOURCES/TestTranslations.java
Normal file
160
SOURCES/TestTranslations.java
Normal file
@ -0,0 +1,160 @@
|
|||||||
|
/* TestTranslations -- Ensure translations are available for new timezones
|
||||||
|
Copyright (C) 2022 Red Hat, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.text.DateFormatSymbols;
|
||||||
|
|
||||||
|
import java.time.ZoneId;
|
||||||
|
import java.time.format.TextStyle;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.TimeZone;
|
||||||
|
|
||||||
|
public class TestTranslations {
|
||||||
|
|
||||||
|
private static Map<Locale,String[]> KYIV, CIUDAD_JUAREZ;
|
||||||
|
|
||||||
|
static {
|
||||||
|
Map<Locale,String[]> map = new HashMap<Locale,String[]>();
|
||||||
|
map.put(Locale.US, new String[] { "Eastern European Standard Time", "GMT+02:00", "EET",
|
||||||
|
"Eastern European Summer Time", "GMT+03:00", "EEST",
|
||||||
|
"Eastern European Time", "GMT+02:00", "EET"});
|
||||||
|
map.put(Locale.FRANCE, new String[] { "heure normale d\u2019Europe de l\u2019Est", "UTC+02:00", "EET",
|
||||||
|
"heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est", "UTC+03:00", "EEST",
|
||||||
|
"heure d\u2019Europe de l\u2019Est", "UTC+02:00", "EET"});
|
||||||
|
map.put(Locale.GERMANY, new String[] { "Osteurop\u00e4ische Normalzeit", "OEZ", "OEZ",
|
||||||
|
"Osteurop\u00e4ische Sommerzeit", "OESZ", "OESZ",
|
||||||
|
"Osteurop\u00e4ische Zeit", "OEZ", "OEZ"});
|
||||||
|
KYIV = Collections.unmodifiableMap(map);
|
||||||
|
|
||||||
|
map = new HashMap<Locale,String[]>();
|
||||||
|
map.put(Locale.US, new String[] { "Mountain Standard Time", "MST", "MST",
|
||||||
|
"Mountain Daylight Time", "MDT", "MDT",
|
||||||
|
"Mountain Time", "MT", "MT"});
|
||||||
|
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
|
||||||
|
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
|
||||||
|
"heure des Rocheuses", "UTC\u221207:00", "MT"});
|
||||||
|
map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
|
||||||
|
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
|
||||||
|
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
|
||||||
|
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
if (args.length < 1) {
|
||||||
|
System.err.println("Test must be started with the name of the locale provider.");
|
||||||
|
System.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
System.out.println("Checking sanity of full zone string set...");
|
||||||
|
boolean invalid = Arrays.stream(Locale.getAvailableLocales())
|
||||||
|
.peek(l -> System.out.println("Locale: " + l))
|
||||||
|
.map(l -> DateFormatSymbols.getInstance(l).getZoneStrings())
|
||||||
|
.flatMap(zs -> Arrays.stream(zs))
|
||||||
|
.flatMap(names -> Arrays.stream(names))
|
||||||
|
.filter(name -> Objects.isNull(name) || name.isEmpty())
|
||||||
|
.findAny()
|
||||||
|
.isPresent();
|
||||||
|
if (invalid) {
|
||||||
|
System.err.println("Zone string for a locale returned null or empty string");
|
||||||
|
System.exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
String localeProvider = args[0];
|
||||||
|
testZone(localeProvider, KYIV,
|
||||||
|
new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" });
|
||||||
|
testZone(localeProvider, CIUDAD_JUAREZ,
|
||||||
|
new String[] { "America/Cambridge_Bay", "America/Ciudad_Juarez" });
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testZone(String localeProvider, Map<Locale,String[]> exp, String[] ids) {
|
||||||
|
for (Locale l : exp.keySet()) {
|
||||||
|
String[] expected = exp.get(l);
|
||||||
|
System.out.printf("Expected values for %s are %s\n", l, Arrays.toString(expected));
|
||||||
|
for (String id : ids) {
|
||||||
|
String expectedShortStd = null;
|
||||||
|
String expectedShortDST = null;
|
||||||
|
String expectedShortGen = null;
|
||||||
|
|
||||||
|
System.out.printf("Checking locale %s for %s...\n", l, id);
|
||||||
|
|
||||||
|
if ("JRE".equals(localeProvider)) {
|
||||||
|
expectedShortStd = expected[2];
|
||||||
|
expectedShortDST = expected[5];
|
||||||
|
expectedShortGen = expected[8];
|
||||||
|
} else if ("CLDR".equals(localeProvider)) {
|
||||||
|
expectedShortStd = expected[1];
|
||||||
|
expectedShortDST = expected[4];
|
||||||
|
expectedShortGen = expected[7];
|
||||||
|
} else {
|
||||||
|
System.err.printf("Invalid locale provider %s\n", localeProvider);
|
||||||
|
System.exit(3);
|
||||||
|
}
|
||||||
|
System.out.printf("Locale Provider is %s, using short values %s, %s and %s\n",
|
||||||
|
localeProvider, expectedShortStd, expectedShortDST, expectedShortGen);
|
||||||
|
|
||||||
|
String longStd = TimeZone.getTimeZone(id).getDisplayName(false, TimeZone.LONG, l);
|
||||||
|
String shortStd = TimeZone.getTimeZone(id).getDisplayName(false, TimeZone.SHORT, l);
|
||||||
|
String longDST = TimeZone.getTimeZone(id).getDisplayName(true, TimeZone.LONG, l);
|
||||||
|
String shortDST = TimeZone.getTimeZone(id).getDisplayName(true, TimeZone.SHORT, l);
|
||||||
|
String longGen = ZoneId.of(id).getDisplayName(TextStyle.FULL, l);
|
||||||
|
String shortGen = ZoneId.of(id).getDisplayName(TextStyle.SHORT, l);
|
||||||
|
|
||||||
|
if (!expected[0].equals(longStd)) {
|
||||||
|
System.err.printf("Long standard display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, longStd, expected[0]);
|
||||||
|
System.exit(4);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedShortStd.equals(shortStd)) {
|
||||||
|
System.err.printf("Short standard display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, shortStd, expectedShortStd);
|
||||||
|
System.exit(5);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expected[3].equals(longDST)) {
|
||||||
|
System.err.printf("Long DST display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, longDST, expected[3]);
|
||||||
|
System.exit(6);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedShortDST.equals(shortDST)) {
|
||||||
|
System.err.printf("Short DST display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, shortDST, expectedShortDST);
|
||||||
|
System.exit(7);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expected[6].equals(longGen)) {
|
||||||
|
System.err.printf("Long generic display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, longGen, expected[6]);
|
||||||
|
System.exit(8);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedShortGen.equals(shortGen)) {
|
||||||
|
System.err.printf("Short generic display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, shortGen, expectedShortGen);
|
||||||
|
System.exit(9);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
5911
SOURCES/fips-17u-72d08e3226f.patch
Normal file
5911
SOURCES/fips-17u-72d08e3226f.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,8 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=OpenJDK @JAVA_MAJOR_VERSION@ Monitoring & Management Console @ARCH@
|
Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
|
||||||
Comment=Monitor and manage OpenJDK @JAVA_MAJOR_VERSION@ applications for @ARCH@
|
Comment=Monitor and manage OpenJDK applications
|
||||||
Exec=@JAVA_HOME@/jconsole
|
Exec=_SDKBINDIR_/jconsole
|
||||||
Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@
|
Icon=java-@JAVA_VER@-@JAVA_VENDOR@
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
StartupWMClass=sun-tools-jconsole-JConsole
|
StartupWMClass=sun-tools-jconsole-JConsole
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
name = NSS-FIPS
|
|
||||||
nssLibraryDirectory = @NSS_LIBDIR@
|
|
||||||
nssSecmodDirectory = @NSS_SECMOD@
|
|
||||||
nssDbMode = readOnly
|
|
||||||
nssModule = fips
|
|
||||||
|
|
@ -1,88 +0,0 @@
|
|||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User andrew
|
|
||||||
# Date 1478057514 0
|
|
||||||
# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
|
|
||||||
# Parent 3d53f19b48384e5252f4ec8891f7a3a82d77af2a
|
|
||||||
PR3183: Support Fedora/RHEL system crypto policy
|
|
||||||
diff -r 3d53f19b4838 -r 1c4d5cb2096a src/java.base/share/classes/java/security/Security.java
|
|
||||||
--- a/src/java.base/share/classes/java/security/Security.java Wed Oct 26 03:51:39 2016 +0100
|
|
||||||
+++ b/src/java.base/share/classes/java/security/Security.java Wed Nov 02 03:31:54 2016 +0000
|
|
||||||
@@ -43,6 +43,9 @@
|
|
||||||
* implementation-specific location, which is typically the properties file
|
|
||||||
* {@code conf/security/java.security} in the Java installation directory.
|
|
||||||
*
|
|
||||||
+ * <p>Additional default values of security properties are read from a
|
|
||||||
+ * system-specific location, if available.</p>
|
|
||||||
+ *
|
|
||||||
* @author Benjamin Renaud
|
|
||||||
* @since 1.1
|
|
||||||
*/
|
|
||||||
@@ -52,6 +55,10 @@
|
|
||||||
private static final Debug sdebug =
|
|
||||||
Debug.getInstance("properties");
|
|
||||||
|
|
||||||
+ /* System property file*/
|
|
||||||
+ private static final String SYSTEM_PROPERTIES =
|
|
||||||
+ "/etc/crypto-policies/back-ends/java.config";
|
|
||||||
+
|
|
||||||
/* The java.security properties */
|
|
||||||
private static Properties props;
|
|
||||||
|
|
||||||
@@ -93,6 +100,7 @@
|
|
||||||
if (sdebug != null) {
|
|
||||||
sdebug.println("reading security properties file: " +
|
|
||||||
propFile);
|
|
||||||
+ sdebug.println(props.toString());
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
if (sdebug != null) {
|
|
||||||
@@ -114,6 +122,31 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
if ("true".equalsIgnoreCase(props.getProperty
|
|
||||||
+ ("security.useSystemPropertiesFile"))) {
|
|
||||||
+
|
|
||||||
+ // now load the system file, if it exists, so its values
|
|
||||||
+ // will win if they conflict with the earlier values
|
|
||||||
+ try (BufferedInputStream bis =
|
|
||||||
+ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
|
|
||||||
+ props.load(bis);
|
|
||||||
+ loadedProps = true;
|
|
||||||
+
|
|
||||||
+ if (sdebug != null) {
|
|
||||||
+ sdebug.println("reading system security properties file " +
|
|
||||||
+ SYSTEM_PROPERTIES);
|
|
||||||
+ sdebug.println(props.toString());
|
|
||||||
+ }
|
|
||||||
+ } catch (IOException e) {
|
|
||||||
+ if (sdebug != null) {
|
|
||||||
+ sdebug.println
|
|
||||||
+ ("unable to load security properties from " +
|
|
||||||
+ SYSTEM_PROPERTIES);
|
|
||||||
+ e.printStackTrace();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ("true".equalsIgnoreCase(props.getProperty
|
|
||||||
("security.overridePropertiesFile"))) {
|
|
||||||
|
|
||||||
String extraPropFile = System.getProperty
|
|
||||||
diff -r 3d53f19b4838 -r 1c4d5cb2096a src/java.base/share/conf/security/java.security
|
|
||||||
--- a/src/java.base/share/conf/security/java.security Wed Oct 26 03:51:39 2016 +0100
|
|
||||||
+++ b/src/java.base/share/conf/security/java.security Wed Nov 02 03:31:54 2016 +0000
|
|
||||||
@@ -276,6 +276,13 @@
|
|
||||||
security.overridePropertiesFile=true
|
|
||||||
|
|
||||||
#
|
|
||||||
+# Determines whether this properties file will be appended to
|
|
||||||
+# using the system properties file stored at
|
|
||||||
+# /etc/crypto-policies/back-ends/java.config
|
|
||||||
+#
|
|
||||||
+security.useSystemPropertiesFile=true
|
|
||||||
+
|
|
||||||
+#
|
|
||||||
# Determines the default key and trust manager factory algorithms for
|
|
||||||
# the javax.net.ssl package.
|
|
||||||
#
|
|
@ -1,78 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User andrew
|
|
||||||
# Date 1545198926 0
|
|
||||||
# Wed Dec 19 05:55:26 2018 +0000
|
|
||||||
# Node ID f2cbd688824c128db7fa848c8732fb0ab3507776
|
|
||||||
# Parent 81f07f6d1f8b7b51b136d3974c61bc8bb513770c
|
|
||||||
PR3695: Allow use of system crypto policy to be disabled by the user
|
|
||||||
Summary: Read user overrides first so security.useSystemPropertiesFile can be disabled and add -Djava.security.disableSystemPropertiesFile
|
|
||||||
|
|
||||||
diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
|
|
||||||
--- a/src/java.base/share/classes/java/security/Security.java
|
|
||||||
+++ b/src/java.base/share/classes/java/security/Security.java
|
|
||||||
@@ -125,31 +125,6 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
if ("true".equalsIgnoreCase(props.getProperty
|
|
||||||
- ("security.useSystemPropertiesFile"))) {
|
|
||||||
-
|
|
||||||
- // now load the system file, if it exists, so its values
|
|
||||||
- // will win if they conflict with the earlier values
|
|
||||||
- try (BufferedInputStream bis =
|
|
||||||
- new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
|
|
||||||
- props.load(bis);
|
|
||||||
- loadedProps = true;
|
|
||||||
-
|
|
||||||
- if (sdebug != null) {
|
|
||||||
- sdebug.println("reading system security properties file " +
|
|
||||||
- SYSTEM_PROPERTIES);
|
|
||||||
- sdebug.println(props.toString());
|
|
||||||
- }
|
|
||||||
- } catch (IOException e) {
|
|
||||||
- if (sdebug != null) {
|
|
||||||
- sdebug.println
|
|
||||||
- ("unable to load security properties from " +
|
|
||||||
- SYSTEM_PROPERTIES);
|
|
||||||
- e.printStackTrace();
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if ("true".equalsIgnoreCase(props.getProperty
|
|
||||||
("security.overridePropertiesFile"))) {
|
|
||||||
|
|
||||||
String extraPropFile = System.getProperty
|
|
||||||
@@ -215,6 +190,33 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ String disableSystemProps = System.getProperty("java.security.disableSystemPropertiesFile");
|
|
||||||
+ if (disableSystemProps == null &&
|
|
||||||
+ "true".equalsIgnoreCase(props.getProperty
|
|
||||||
+ ("security.useSystemPropertiesFile"))) {
|
|
||||||
+
|
|
||||||
+ // now load the system file, if it exists, so its values
|
|
||||||
+ // will win if they conflict with the earlier values
|
|
||||||
+ try (BufferedInputStream bis =
|
|
||||||
+ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
|
|
||||||
+ props.load(bis);
|
|
||||||
+ loadedProps = true;
|
|
||||||
+
|
|
||||||
+ if (sdebug != null) {
|
|
||||||
+ sdebug.println("reading system security properties file " +
|
|
||||||
+ SYSTEM_PROPERTIES);
|
|
||||||
+ sdebug.println(props.toString());
|
|
||||||
+ }
|
|
||||||
+ } catch (IOException e) {
|
|
||||||
+ if (sdebug != null) {
|
|
||||||
+ sdebug.println
|
|
||||||
+ ("unable to load security properties from " +
|
|
||||||
+ SYSTEM_PROPERTIES);
|
|
||||||
+ e.printStackTrace();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!loadedProps) {
|
|
||||||
initializeStatic();
|
|
||||||
if (sdebug != null) {
|
|
@ -5,6 +5,7 @@ TREE=${1}
|
|||||||
TYPE=${2}
|
TYPE=${2}
|
||||||
|
|
||||||
ZIP_SRC=src/java.base/share/native/libzip/zlib/
|
ZIP_SRC=src/java.base/share/native/libzip/zlib/
|
||||||
|
FREETYPE_SRC=src/java.desktop/share/native/libfreetype/
|
||||||
JPEG_SRC=src/java.desktop/share/native/libjavajpeg/
|
JPEG_SRC=src/java.desktop/share/native/libjavajpeg/
|
||||||
GIF_SRC=src/java.desktop/share/native/libsplashscreen/giflib/
|
GIF_SRC=src/java.desktop/share/native/libsplashscreen/giflib/
|
||||||
PNG_SRC=src/java.desktop/share/native/libsplashscreen/libpng/
|
PNG_SRC=src/java.desktop/share/native/libsplashscreen/libpng/
|
||||||
@ -31,15 +32,21 @@ cd ${TREE}
|
|||||||
|
|
||||||
echo "Removing built-in libs (they will be linked)"
|
echo "Removing built-in libs (they will be linked)"
|
||||||
|
|
||||||
# On full runs, allow for zlib having already been deleted by minimal
|
# On full runs, allow for zlib & freetype having already been deleted by minimal
|
||||||
echo "Removing zlib"
|
echo "Removing zlib"
|
||||||
if [ "x${TYPE}" = "xminimal" -a ! -d ${ZIP_SRC} ]; then
|
if [ "x${TYPE}" = "xminimal" -a ! -d ${ZIP_SRC} ]; then
|
||||||
echo "${ZIP_SRC} does not exist. Refusing to proceed."
|
echo "${ZIP_SRC} does not exist. Refusing to proceed."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
rm -rvf ${ZIP_SRC}
|
rm -rvf ${ZIP_SRC}
|
||||||
|
echo "Removing freetype"
|
||||||
|
if [ "x${TYPE}" = "xminimal" -a ! -d ${FREETYPE_SRC} ]; then
|
||||||
|
echo "${FREETYPE_SRC} does not exist. Refusing to proceed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -rvf ${FREETYPE_SRC}
|
||||||
|
|
||||||
# Minimal is limited to just zlib so finish here
|
# Minimal is limited to just zlib and freetype so finish here
|
||||||
if test "x${TYPE}" = "xminimal"; then
|
if test "x${TYPE}" = "xminimal"; then
|
||||||
echo "Finished.";
|
echo "Finished.";
|
||||||
exit 0;
|
exit 0;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff --git openjdk/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
|
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
|
||||||
index 534bdae5a16..2df2b59cbf6 100644
|
index adfaf57d29e..abf89bbf327 100644
|
||||||
--- openjdk/src/java.base/share/conf/security/java.security
|
--- a/src/java.base/share/conf/security/java.security
|
||||||
+++ openjdk/src/java.base/share/conf/security/java.security
|
+++ b/src/java.base/share/conf/security/java.security
|
||||||
@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
|
@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
|
||||||
security.provider.tbd=Apple
|
security.provider.tbd=Apple
|
||||||
#endif
|
#endif
|
||||||
@ -9,4 +9,4 @@ index 534bdae5a16..2df2b59cbf6 100644
|
|||||||
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
||||||
|
|
||||||
#
|
#
|
||||||
# A list of preferred providers for specific algorithms. These providers will
|
# Security providers used when FIPS mode support is active
|
||||||
|
@ -1,205 +0,0 @@
|
|||||||
diff --git a/src/java.base/share/classes/javopenjdk.orig///security/Security.java openjdk///src/java.base/share/classes/java/security/Security.java
|
|
||||||
--- openjdk.orig/src/java.base/share/classes/java/security/Security.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/java/security/Security.java
|
|
||||||
@@ -196,26 +196,8 @@
|
|
||||||
if (disableSystemProps == null &&
|
|
||||||
"true".equalsIgnoreCase(props.getProperty
|
|
||||||
("security.useSystemPropertiesFile"))) {
|
|
||||||
-
|
|
||||||
- // now load the system file, if it exists, so its values
|
|
||||||
- // will win if they conflict with the earlier values
|
|
||||||
- try (BufferedInputStream bis =
|
|
||||||
- new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
|
|
||||||
- props.load(bis);
|
|
||||||
+ if (SystemConfigurator.configure(props)) {
|
|
||||||
loadedProps = true;
|
|
||||||
-
|
|
||||||
- if (sdebug != null) {
|
|
||||||
- sdebug.println("reading system security properties file " +
|
|
||||||
- SYSTEM_PROPERTIES);
|
|
||||||
- sdebug.println(props.toString());
|
|
||||||
- }
|
|
||||||
- } catch (IOException e) {
|
|
||||||
- if (sdebug != null) {
|
|
||||||
- sdebug.println
|
|
||||||
- ("unable to load security properties from " +
|
|
||||||
- SYSTEM_PROPERTIES);
|
|
||||||
- e.printStackTrace();
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/src/java.base/share/classes/javopenjdk.orig///security/SystemConfigurator.java openjdk///src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
new file mode 100644
|
|
||||||
--- /dev/null
|
|
||||||
+++ openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
@@ -0,0 +1,151 @@
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2019, 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.
|
|
||||||
+ *
|
|
||||||
+ * 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.nio.file.Files;
|
|
||||||
+import java.nio.file.Path;
|
|
||||||
+
|
|
||||||
+import java.util.Iterator;
|
|
||||||
+import java.util.Map.Entry;
|
|
||||||
+import java.util.Properties;
|
|
||||||
+import java.util.function.Consumer;
|
|
||||||
+import java.util.regex.Matcher;
|
|
||||||
+import java.util.regex.Pattern;
|
|
||||||
+
|
|
||||||
+import sun.security.util.Debug;
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ * Internal class to align OpenJDK with global crypto-policies.
|
|
||||||
+ * Called from java.security.Security class initialization,
|
|
||||||
+ * during startup.
|
|
||||||
+ *
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+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 final String CRYPTO_POLICIES_CONFIG =
|
|
||||||
+ CRYPTO_POLICIES_BASE_DIR + "/config";
|
|
||||||
+
|
|
||||||
+ private static final class SecurityProviderInfo {
|
|
||||||
+ int number;
|
|
||||||
+ String key;
|
|
||||||
+ String value;
|
|
||||||
+ SecurityProviderInfo(int number, String key, String value) {
|
|
||||||
+ this.number = number;
|
|
||||||
+ this.key = key;
|
|
||||||
+ this.value = value;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Invoked when java.security.Security class is initialized, if
|
|
||||||
+ * java.security.disableSystemPropertiesFile property is not set and
|
|
||||||
+ * security.useSystemPropertiesFile is true.
|
|
||||||
+ */
|
|
||||||
+ static boolean configure(Properties props) {
|
|
||||||
+ boolean loadedProps = false;
|
|
||||||
+
|
|
||||||
+ try (BufferedInputStream bis =
|
|
||||||
+ new BufferedInputStream(
|
|
||||||
+ new FileInputStream(CRYPTO_POLICIES_JAVA_CONFIG))) {
|
|
||||||
+ props.load(bis);
|
|
||||||
+ loadedProps = 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();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ try {
|
|
||||||
+ if (enableFips()) {
|
|
||||||
+ if (sdebug != null) { sdebug.println("FIPS mode detected"); }
|
|
||||||
+ loadedProps = false;
|
|
||||||
+ // 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);
|
|
||||||
+ }
|
|
||||||
+ loadedProps = true;
|
|
||||||
+ }
|
|
||||||
+ } catch (Exception e) {
|
|
||||||
+ if (sdebug != null) {
|
|
||||||
+ sdebug.println("unable to load FIPS configuration");
|
|
||||||
+ e.printStackTrace();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return loadedProps;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * FIPS is enabled only if crypto-policies are set to "FIPS"
|
|
||||||
+ * and the com.redhat.fips property is true.
|
|
||||||
+ */
|
|
||||||
+ private static boolean enableFips() throws Exception {
|
|
||||||
+ boolean fipsEnabled = Boolean.valueOf(System.getProperty("com.redhat.fips", "true"));
|
|
||||||
+ if (fipsEnabled) {
|
|
||||||
+ String cryptoPoliciesConfig = new String(Files.readAllBytes(Path.of(CRYPTO_POLICIES_CONFIG)));
|
|
||||||
+ if (sdebug != null) { sdebug.println("Crypto config:\n" + cryptoPoliciesConfig); }
|
|
||||||
+ Pattern pattern = Pattern.compile("^FIPS$", Pattern.MULTILINE);
|
|
||||||
+ return pattern.matcher(cryptoPoliciesConfig).find();
|
|
||||||
+ } else {
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git openjdk.orig///src/java.base/share/conf/security/java.security openjdk///src/java.base/share/conf/security/java.security
|
|
||||||
--- openjdk.orig/src/java.base/share/conf/security/java.security
|
|
||||||
+++ openjdk/src/java.base/share/conf/security/java.security
|
|
||||||
@@ -87,6 +87,14 @@
|
|
||||||
#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
|
||||||
|
|
||||||
#
|
|
||||||
+# Security providers used when global crypto-policies are set to FIPS.
|
|
||||||
+#
|
|
||||||
+fips.provider.1=SunPKCS11 ${java.home}/conf/security/nss.fips.cfg
|
|
||||||
+fips.provider.2=SUN
|
|
||||||
+fips.provider.3=SunEC
|
|
||||||
+fips.provider.4=SunJSSE
|
|
||||||
+
|
|
||||||
+#
|
|
||||||
# A list of preferred providers for specific algorithms. These providers will
|
|
||||||
# be searched for matching algorithms before the list of registered providers.
|
|
||||||
# Entries containing errors (parsing, etc) will be ignored. Use the
|
|
@ -1,52 +0,0 @@
|
|||||||
diff -r 6efbd7b35a10 src/share/classes/java/security/SystemConfigurator.java
|
|
||||||
--- openjdk.orig/src/java.base/share/classes/java/security/SystemConfigurator.java Thu Jan 23 18:22:31 2020 -0300
|
|
||||||
+++ openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java Mon Mar 02 19:20:17 2020 -0300
|
|
||||||
@@ -123,6 +123,33 @@
|
|
||||||
}
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
diff -r 6efbd7b35a10 src/share/lib/security/java.security-linux
|
|
||||||
--- openjdk.orig/src/java.base/share/conf/security/java.security Thu Jan 23 18:22:31 2020 -0300
|
|
||||||
+++ openjdk/src/java.base/share/conf/security/java.security Mon Mar 02 19:20:17 2020 -0300
|
|
||||||
@@ -299,6 +299,11 @@
|
|
||||||
keystore.type=pkcs12
|
|
||||||
|
|
||||||
#
|
|
||||||
+# Default keystore type used when global crypto-policies are set to FIPS.
|
|
||||||
+#
|
|
||||||
+fips.keystore.type=PKCS11
|
|
||||||
+
|
|
||||||
+#
|
|
||||||
# Controls compatibility mode for JKS and PKCS12 keystore types.
|
|
||||||
#
|
|
||||||
# When set to 'true', both JKS and PKCS12 keystore types support loading
|
|
@ -1,318 +0,0 @@
|
|||||||
diff --git openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
index f9baf8c9742..60fa75cab45 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
@@ -1,11 +1,13 @@
|
|
||||||
/*
|
|
||||||
- * Copyright (c) 2019, Red Hat, Inc.
|
|
||||||
+ * Copyright (c) 2019, 2020, 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.
|
|
||||||
+ * 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
|
|
||||||
@@ -34,10 +36,10 @@ import java.nio.file.Path;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.Map.Entry;
|
|
||||||
import java.util.Properties;
|
|
||||||
-import java.util.function.Consumer;
|
|
||||||
-import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
+import jdk.internal.access.JavaSecuritySystemConfiguratorAccess;
|
|
||||||
+import jdk.internal.access.SharedSecrets;
|
|
||||||
import sun.security.util.Debug;
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -47,7 +49,7 @@ import sun.security.util.Debug;
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
-class SystemConfigurator {
|
|
||||||
+final class SystemConfigurator {
|
|
||||||
|
|
||||||
private static final Debug sdebug =
|
|
||||||
Debug.getInstance("properties");
|
|
||||||
@@ -61,15 +63,16 @@ class SystemConfigurator {
|
|
||||||
private static final String CRYPTO_POLICIES_CONFIG =
|
|
||||||
CRYPTO_POLICIES_BASE_DIR + "/config";
|
|
||||||
|
|
||||||
- private static final class SecurityProviderInfo {
|
|
||||||
- int number;
|
|
||||||
- String key;
|
|
||||||
- String value;
|
|
||||||
- SecurityProviderInfo(int number, String key, String value) {
|
|
||||||
- this.number = number;
|
|
||||||
- this.key = key;
|
|
||||||
- this.value = value;
|
|
||||||
- }
|
|
||||||
+ private static boolean systemFipsEnabled = false;
|
|
||||||
+
|
|
||||||
+ static {
|
|
||||||
+ SharedSecrets.setJavaSecuritySystemConfiguratorAccess(
|
|
||||||
+ new JavaSecuritySystemConfiguratorAccess() {
|
|
||||||
+ @Override
|
|
||||||
+ public boolean isSystemFipsEnabled() {
|
|
||||||
+ return SystemConfigurator.isSystemFipsEnabled();
|
|
||||||
+ }
|
|
||||||
+ });
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -128,9 +131,9 @@ class SystemConfigurator {
|
|
||||||
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 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
|
|
||||||
@@ -144,12 +147,13 @@ class SystemConfigurator {
|
|
||||||
sdebug.println("FIPS mode default keystore.type = " +
|
|
||||||
keystoreTypeValue);
|
|
||||||
sdebug.println("FIPS mode javax.net.ssl.keyStore = " +
|
|
||||||
- System.getProperty("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;
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (sdebug != null) {
|
|
||||||
@@ -160,13 +164,30 @@ class SystemConfigurator {
|
|
||||||
return loadedProps;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /**
|
|
||||||
+ * Returns whether or not global system FIPS alignment is enabled.
|
|
||||||
+ *
|
|
||||||
+ * Value is always 'false' before java.security.Security class is
|
|
||||||
+ * initialized.
|
|
||||||
+ *
|
|
||||||
+ * Call from out of this package through SharedSecrets:
|
|
||||||
+ * SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
|
|
||||||
+ * .isSystemFipsEnabled();
|
|
||||||
+ *
|
|
||||||
+ * @return a boolean value indicating whether or not global
|
|
||||||
+ * system FIPS alignment is enabled.
|
|
||||||
+ */
|
|
||||||
+ static boolean isSystemFipsEnabled() {
|
|
||||||
+ return systemFipsEnabled;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* FIPS is enabled only if crypto-policies are set to "FIPS"
|
|
||||||
* and the com.redhat.fips property is true.
|
|
||||||
*/
|
|
||||||
private static boolean enableFips() throws Exception {
|
|
||||||
- boolean fipsEnabled = Boolean.valueOf(System.getProperty("com.redhat.fips", "true"));
|
|
||||||
- if (fipsEnabled) {
|
|
||||||
+ boolean shouldEnable = Boolean.valueOf(System.getProperty("com.redhat.fips", "true"));
|
|
||||||
+ if (shouldEnable) {
|
|
||||||
String cryptoPoliciesConfig = new String(Files.readAllBytes(Path.of(CRYPTO_POLICIES_CONFIG)));
|
|
||||||
if (sdebug != null) { sdebug.println("Crypto config:\n" + cryptoPoliciesConfig); }
|
|
||||||
Pattern pattern = Pattern.compile("^FIPS$", Pattern.MULTILINE);
|
|
||||||
diff --git openjdk/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java openjdk/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..a31e93ec02e
|
|
||||||
--- /dev/null
|
|
||||||
+++ openjdk/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
|
|
||||||
@@ -0,0 +1,30 @@
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2020, 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 jdk.internal.access;
|
|
||||||
+
|
|
||||||
+public interface JavaSecuritySystemConfiguratorAccess {
|
|
||||||
+ boolean isSystemFipsEnabled();
|
|
||||||
+}
|
|
||||||
diff --git openjdk/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java openjdk/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
|
|
||||||
index f6d3638c3dd..5a2c9eb0c46 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
|
|
||||||
@@ -81,6 +81,7 @@ public class SharedSecrets {
|
|
||||||
private static JavaSecuritySpecAccess javaSecuritySpecAccess;
|
|
||||||
private static JavaxCryptoSealedObjectAccess javaxCryptoSealedObjectAccess;
|
|
||||||
private static JavaxCryptoSpecAccess javaxCryptoSpecAccess;
|
|
||||||
+ private static JavaSecuritySystemConfiguratorAccess javaSecuritySystemConfiguratorAccess;
|
|
||||||
|
|
||||||
public static void setJavaUtilCollectionAccess(JavaUtilCollectionAccess juca) {
|
|
||||||
javaUtilCollectionAccess = juca;
|
|
||||||
@@ -442,4 +443,12 @@ public class SharedSecrets {
|
|
||||||
MethodHandles.lookup().ensureInitialized(c);
|
|
||||||
} catch (IllegalAccessException e) {}
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ public static void setJavaSecuritySystemConfiguratorAccess(JavaSecuritySystemConfiguratorAccess jssca) {
|
|
||||||
+ javaSecuritySystemConfiguratorAccess = jssca;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public static JavaSecuritySystemConfiguratorAccess getJavaSecuritySystemConfiguratorAccess() {
|
|
||||||
+ return javaSecuritySystemConfiguratorAccess;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
diff --git openjdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java openjdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
|
|
||||||
index 6ffdfeda18d..775b185fb06 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
|
|
||||||
@@ -32,6 +32,7 @@ import java.security.cert.*;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
|
||||||
import javax.net.ssl.*;
|
|
||||||
+import jdk.internal.access.SharedSecrets;
|
|
||||||
import sun.security.action.GetPropertyAction;
|
|
||||||
import sun.security.provider.certpath.AlgorithmChecker;
|
|
||||||
import sun.security.validator.Validator;
|
|
||||||
@@ -536,22 +537,40 @@ public abstract class SSLContextImpl extends SSLContextSpi {
|
|
||||||
private static final List<CipherSuite> serverDefaultCipherSuites;
|
|
||||||
|
|
||||||
static {
|
|
||||||
- supportedProtocols = Arrays.asList(
|
|
||||||
- ProtocolVersion.TLS13,
|
|
||||||
- ProtocolVersion.TLS12,
|
|
||||||
- ProtocolVersion.TLS11,
|
|
||||||
- ProtocolVersion.TLS10,
|
|
||||||
- ProtocolVersion.SSL30,
|
|
||||||
- ProtocolVersion.SSL20Hello
|
|
||||||
- );
|
|
||||||
-
|
|
||||||
- serverDefaultProtocols = getAvailableProtocols(
|
|
||||||
- new ProtocolVersion[] {
|
|
||||||
- ProtocolVersion.TLS13,
|
|
||||||
- ProtocolVersion.TLS12,
|
|
||||||
- ProtocolVersion.TLS11,
|
|
||||||
- ProtocolVersion.TLS10
|
|
||||||
- });
|
|
||||||
+ if (SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
|
|
||||||
+ .isSystemFipsEnabled()) {
|
|
||||||
+ // RH1860986: TLSv1.3 key derivation not supported with
|
|
||||||
+ // the Security Providers available in system FIPS mode.
|
|
||||||
+ supportedProtocols = Arrays.asList(
|
|
||||||
+ ProtocolVersion.TLS12,
|
|
||||||
+ ProtocolVersion.TLS11,
|
|
||||||
+ ProtocolVersion.TLS10
|
|
||||||
+ );
|
|
||||||
+
|
|
||||||
+ serverDefaultProtocols = getAvailableProtocols(
|
|
||||||
+ new ProtocolVersion[] {
|
|
||||||
+ ProtocolVersion.TLS12,
|
|
||||||
+ ProtocolVersion.TLS11,
|
|
||||||
+ ProtocolVersion.TLS10
|
|
||||||
+ });
|
|
||||||
+ } else {
|
|
||||||
+ supportedProtocols = Arrays.asList(
|
|
||||||
+ ProtocolVersion.TLS13,
|
|
||||||
+ ProtocolVersion.TLS12,
|
|
||||||
+ ProtocolVersion.TLS11,
|
|
||||||
+ ProtocolVersion.TLS10,
|
|
||||||
+ ProtocolVersion.SSL30,
|
|
||||||
+ ProtocolVersion.SSL20Hello
|
|
||||||
+ );
|
|
||||||
+
|
|
||||||
+ serverDefaultProtocols = getAvailableProtocols(
|
|
||||||
+ new ProtocolVersion[] {
|
|
||||||
+ ProtocolVersion.TLS13,
|
|
||||||
+ ProtocolVersion.TLS12,
|
|
||||||
+ ProtocolVersion.TLS11,
|
|
||||||
+ ProtocolVersion.TLS10
|
|
||||||
+ });
|
|
||||||
+ }
|
|
||||||
|
|
||||||
supportedCipherSuites = getApplicableSupportedCipherSuites(
|
|
||||||
supportedProtocols);
|
|
||||||
@@ -842,12 +861,23 @@ public abstract class SSLContextImpl extends SSLContextSpi {
|
|
||||||
ProtocolVersion[] candidates;
|
|
||||||
if (refactored.isEmpty()) {
|
|
||||||
// Client and server use the same default protocols.
|
|
||||||
- candidates = new ProtocolVersion[] {
|
|
||||||
- ProtocolVersion.TLS13,
|
|
||||||
- ProtocolVersion.TLS12,
|
|
||||||
- ProtocolVersion.TLS11,
|
|
||||||
- ProtocolVersion.TLS10
|
|
||||||
- };
|
|
||||||
+ if (SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
|
|
||||||
+ .isSystemFipsEnabled()) {
|
|
||||||
+ // RH1860986: TLSv1.3 key derivation not supported with
|
|
||||||
+ // the Security Providers available in system FIPS mode.
|
|
||||||
+ candidates = new ProtocolVersion[] {
|
|
||||||
+ ProtocolVersion.TLS12,
|
|
||||||
+ ProtocolVersion.TLS11,
|
|
||||||
+ ProtocolVersion.TLS10
|
|
||||||
+ };
|
|
||||||
+ } else {
|
|
||||||
+ candidates = new ProtocolVersion[] {
|
|
||||||
+ ProtocolVersion.TLS13,
|
|
||||||
+ ProtocolVersion.TLS12,
|
|
||||||
+ ProtocolVersion.TLS11,
|
|
||||||
+ ProtocolVersion.TLS10
|
|
||||||
+ };
|
|
||||||
+ }
|
|
||||||
} else {
|
|
||||||
// Use the customized TLS protocols.
|
|
||||||
candidates =
|
|
||||||
diff --git openjdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java openjdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
|
|
||||||
index 894e26dfad8..8b16378b96b 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
|
|
||||||
@@ -27,6 +27,8 @@ package sun.security.ssl;
|
|
||||||
|
|
||||||
import java.security.*;
|
|
||||||
import java.util.*;
|
|
||||||
+
|
|
||||||
+import jdk.internal.access.SharedSecrets;
|
|
||||||
import static sun.security.util.SecurityConstants.PROVIDER_VER;
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -102,8 +104,13 @@ public class SunJSSE extends java.security.Provider {
|
|
||||||
"sun.security.ssl.SSLContextImpl$TLS11Context", null, null);
|
|
||||||
ps("SSLContext", "TLSv1.2",
|
|
||||||
"sun.security.ssl.SSLContextImpl$TLS12Context", null, null);
|
|
||||||
- ps("SSLContext", "TLSv1.3",
|
|
||||||
- "sun.security.ssl.SSLContextImpl$TLS13Context", null, null);
|
|
||||||
+ if (!SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
|
|
||||||
+ .isSystemFipsEnabled()) {
|
|
||||||
+ // RH1860986: TLSv1.3 key derivation not supported with
|
|
||||||
+ // the Security Providers available in system FIPS mode.
|
|
||||||
+ ps("SSLContext", "TLSv1.3",
|
|
||||||
+ "sun.security.ssl.SSLContextImpl$TLS13Context", null, null);
|
|
||||||
+ }
|
|
||||||
ps("SSLContext", "TLS",
|
|
||||||
"sun.security.ssl.SSLContextImpl$TLSContext",
|
|
||||||
List.of("SSL"), null);
|
|
@ -1,70 +0,0 @@
|
|||||||
diff --git openjdk/src/java.base/share/classes/java/security/Security.java openjdk/src/java.base/share/classes/java/security/Security.java
|
|
||||||
index f1633afb627..ce32c939253 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/java/security/Security.java
|
|
||||||
+++ openjdk/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.access.JavaSecuritySystemConfiguratorAccess;
|
|
||||||
import jdk.internal.access.SharedSecrets;
|
|
||||||
import jdk.internal.util.StaticProperty;
|
|
||||||
import sun.security.util.Debug;
|
|
||||||
@@ -74,6 +75,15 @@ 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();
|
|
||||||
+ }
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
// doPrivileged here because there are multiple
|
|
||||||
// things in initialize that might require privs.
|
|
||||||
// (the FileInputStream call and the File.exists call,
|
|
||||||
@@ -194,9 +204,8 @@ public final class Security {
|
|
||||||
}
|
|
||||||
|
|
||||||
String disableSystemProps = System.getProperty("java.security.disableSystemPropertiesFile");
|
|
||||||
- if (disableSystemProps == null &&
|
|
||||||
- "true".equalsIgnoreCase(props.getProperty
|
|
||||||
- ("security.useSystemPropertiesFile"))) {
|
|
||||||
+ if ((disableSystemProps == null || "false".equalsIgnoreCase(disableSystemProps)) &&
|
|
||||||
+ "true".equalsIgnoreCase(props.getProperty("security.useSystemPropertiesFile"))) {
|
|
||||||
if (SystemConfigurator.configure(props)) {
|
|
||||||
loadedProps = true;
|
|
||||||
}
|
|
||||||
diff --git openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
index 60fa75cab45..10b54aa4ce4 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
@@ -38,8 +38,6 @@ import java.util.Map.Entry;
|
|
||||||
import java.util.Properties;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
-import jdk.internal.access.JavaSecuritySystemConfiguratorAccess;
|
|
||||||
-import jdk.internal.access.SharedSecrets;
|
|
||||||
import sun.security.util.Debug;
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -65,16 +63,6 @@ final class SystemConfigurator {
|
|
||||||
|
|
||||||
private static boolean systemFipsEnabled = false;
|
|
||||||
|
|
||||||
- static {
|
|
||||||
- SharedSecrets.setJavaSecuritySystemConfiguratorAccess(
|
|
||||||
- new JavaSecuritySystemConfiguratorAccess() {
|
|
||||||
- @Override
|
|
||||||
- public boolean isSystemFipsEnabled() {
|
|
||||||
- return SystemConfigurator.isSystemFipsEnabled();
|
|
||||||
- }
|
|
||||||
- });
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
/*
|
|
||||||
* Invoked when java.security.Security class is initialized, if
|
|
||||||
* java.security.disableSystemPropertiesFile property is not set and
|
|
@ -1,69 +0,0 @@
|
|||||||
commit 90e344e7d4987af610fa0054c92d18fe1c2edd41
|
|
||||||
Author: Andrew Hughes <gnu.andrew@redhat.com>
|
|
||||||
Date: Sat Aug 28 01:15:28 2021 +0100
|
|
||||||
|
|
||||||
RH1929465: Don't define unused throwIOException function when using NSS detection
|
|
||||||
|
|
||||||
diff --git openjdk.orig/src/java.base/linux/native/libsystemconf/systemconf.c openjdk/src/java.base/linux/native/libsystemconf/systemconf.c
|
|
||||||
index 6f4656bfcb6..38919d6bb0f 100644
|
|
||||||
--- openjdk.orig/src/java.base/linux/native/libsystemconf/systemconf.c
|
|
||||||
+++ openjdk/src/java.base/linux/native/libsystemconf/systemconf.c
|
|
||||||
@@ -34,14 +34,34 @@
|
|
||||||
|
|
||||||
#include "java_security_SystemConfigurator.h"
|
|
||||||
|
|
||||||
-#define FIPS_ENABLED_PATH "/proc/sys/crypto/fips_enabled"
|
|
||||||
#define MSG_MAX_SIZE 96
|
|
||||||
|
|
||||||
static jmethodID debugPrintlnMethodID = NULL;
|
|
||||||
static jobject debugObj = NULL;
|
|
||||||
|
|
||||||
-static void throwIOException(JNIEnv *env, const char *msg);
|
|
||||||
-static void dbgPrint(JNIEnv *env, const char* msg);
|
|
||||||
+// Only used when NSS is unavailable and FIPS_ENABLED_PATH is read
|
|
||||||
+#ifndef SYSCONF_NSS
|
|
||||||
+
|
|
||||||
+#define FIPS_ENABLED_PATH "/proc/sys/crypto/fips_enabled"
|
|
||||||
+
|
|
||||||
+static void throwIOException(JNIEnv *env, const char *msg)
|
|
||||||
+{
|
|
||||||
+ jclass cls = (*env)->FindClass(env, "java/io/IOException");
|
|
||||||
+ if (cls != 0)
|
|
||||||
+ (*env)->ThrowNew(env, cls, msg);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+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);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Class: java_security_SystemConfigurator
|
|
||||||
@@ -149,20 +169,3 @@ JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEn
|
|
||||||
|
|
||||||
#endif // SYSCONF_NSS
|
|
||||||
}
|
|
||||||
-
|
|
||||||
-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 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);
|
|
||||||
- }
|
|
||||||
-}
|
|
@ -1,428 +0,0 @@
|
|||||||
diff --git openjdk/make/autoconf/lib-sysconf.m4 openjdk/make/autoconf/lib-sysconf.m4
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..b2b1c1787da
|
|
||||||
--- /dev/null
|
|
||||||
+++ openjdk/make/autoconf/lib-sysconf.m4
|
|
||||||
@@ -0,0 +1,84 @@
|
|
||||||
+#
|
|
||||||
+# 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.
|
|
||||||
+#
|
|
||||||
+
|
|
||||||
+################################################################################
|
|
||||||
+# 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 openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
|
|
||||||
index a65d91ee974..a8f054c1397 100644
|
|
||||||
--- openjdk/make/autoconf/libraries.m4
|
|
||||||
+++ openjdk/make/autoconf/libraries.m4
|
|
||||||
@@ -33,6 +33,7 @@ m4_include([lib-std.m4])
|
|
||||||
m4_include([lib-x11.m4])
|
|
||||||
m4_include([lib-fontconfig.m4])
|
|
||||||
m4_include([lib-tests.m4])
|
|
||||||
+m4_include([lib-sysconf.m4])
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Determine which libraries are needed for this configuration
|
|
||||||
@@ -104,6 +105,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
|
||||||
LIB_SETUP_BUNDLED_LIBS
|
|
||||||
LIB_SETUP_MISC_LIBS
|
|
||||||
LIB_TESTS_SETUP_GTEST
|
|
||||||
+ LIB_SETUP_SYSCONF_LIBS
|
|
||||||
|
|
||||||
BASIC_JDKLIB_LIBS=""
|
|
||||||
if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
|
|
||||||
diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
|
|
||||||
index 29445c8c24f..9b1b512a34a 100644
|
|
||||||
--- openjdk/make/autoconf/spec.gmk.in
|
|
||||||
+++ openjdk/make/autoconf/spec.gmk.in
|
|
||||||
@@ -834,6 +834,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 openjdk/make/modules/java.base/Lib.gmk openjdk/make/modules/java.base/Lib.gmk
|
|
||||||
index 5658ff342e5..cb7a56852f7 100644
|
|
||||||
--- openjdk/make/modules/java.base/Lib.gmk
|
|
||||||
+++ openjdk/make/modules/java.base/Lib.gmk
|
|
||||||
@@ -167,6 +167,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 openjdk/src/java.base/linux/native/libsystemconf/systemconf.c openjdk/src/java.base/linux/native/libsystemconf/systemconf.c
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..6f4656bfcb6
|
|
||||||
--- /dev/null
|
|
||||||
+++ openjdk/src/java.base/linux/native/libsystemconf/systemconf.c
|
|
||||||
@@ -0,0 +1,168 @@
|
|
||||||
+/*
|
|
||||||
+ * 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 <dlfcn.h>
|
|
||||||
+#include <jni.h>
|
|
||||||
+#include <jni_util.h>
|
|
||||||
+#include <stdio.h>
|
|
||||||
+
|
|
||||||
+#ifdef SYSCONF_NSS
|
|
||||||
+#include <nss3/pk11pub.h>
|
|
||||||
+#endif //SYSCONF_NSS
|
|
||||||
+
|
|
||||||
+#include "java_security_SystemConfigurator.h"
|
|
||||||
+
|
|
||||||
+#define FIPS_ENABLED_PATH "/proc/sys/crypto/fips_enabled"
|
|
||||||
+#define MSG_MAX_SIZE 96
|
|
||||||
+
|
|
||||||
+static jmethodID debugPrintlnMethodID = NULL;
|
|
||||||
+static jobject debugObj = NULL;
|
|
||||||
+
|
|
||||||
+static void throwIOException(JNIEnv *env, const char *msg);
|
|
||||||
+static void dbgPrint(JNIEnv *env, const char* msg);
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * 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);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ 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 */
|
|
||||||
+ }
|
|
||||||
+ (*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;
|
|
||||||
+
|
|
||||||
+#ifdef SYSCONF_NSS
|
|
||||||
+
|
|
||||||
+ dbgPrint(env, "getSystemFIPSEnabled: calling SECMOD_GetSystemFIPSEnabled");
|
|
||||||
+ fips_enabled = SECMOD_GetSystemFIPSEnabled();
|
|
||||||
+ msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:" \
|
|
||||||
+ " SECMOD_GetSystemFIPSEnabled returned 0x%x", fips_enabled);
|
|
||||||
+ if (msg_bytes > 0 && msg_bytes < MSG_MAX_SIZE) {
|
|
||||||
+ dbgPrint(env, msg);
|
|
||||||
+ } else {
|
|
||||||
+ dbgPrint(env, "getSystemFIPSEnabled: cannot render" \
|
|
||||||
+ " SECMOD_GetSystemFIPSEnabled return value");
|
|
||||||
+ }
|
|
||||||
+ return (fips_enabled == 1 ? JNI_TRUE : JNI_FALSE);
|
|
||||||
+
|
|
||||||
+#else // SYSCONF_NSS
|
|
||||||
+
|
|
||||||
+ FILE *fe;
|
|
||||||
+
|
|
||||||
+ dbgPrint(env, "getSystemFIPSEnabled: reading " FIPS_ENABLED_PATH);
|
|
||||||
+ if ((fe = fopen(FIPS_ENABLED_PATH, "r")) == NULL) {
|
|
||||||
+ throwIOException(env, "Cannot open " FIPS_ENABLED_PATH);
|
|
||||||
+ }
|
|
||||||
+ fips_enabled = fgetc(fe);
|
|
||||||
+ fclose(fe);
|
|
||||||
+ if (fips_enabled == EOF) {
|
|
||||||
+ throwIOException(env, "Cannot read " FIPS_ENABLED_PATH);
|
|
||||||
+ }
|
|
||||||
+ msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:" \
|
|
||||||
+ " read character is '%c'", fips_enabled);
|
|
||||||
+ if (msg_bytes > 0 && msg_bytes < MSG_MAX_SIZE) {
|
|
||||||
+ dbgPrint(env, msg);
|
|
||||||
+ } else {
|
|
||||||
+ dbgPrint(env, "getSystemFIPSEnabled: cannot render" \
|
|
||||||
+ " read character");
|
|
||||||
+ }
|
|
||||||
+ return (fips_enabled == '1' ? JNI_TRUE : JNI_FALSE);
|
|
||||||
+
|
|
||||||
+#endif // SYSCONF_NSS
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+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 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);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
index 10b54aa4ce4..6aa1419dfd0 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/*
|
|
||||||
- * Copyright (c) 2019, 2020, Red Hat, Inc.
|
|
||||||
+ * Copyright (c) 2019, 2021, Red Hat, Inc.
|
|
||||||
*
|
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
*
|
|
||||||
@@ -30,13 +30,9 @@ import java.io.BufferedInputStream;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
-import java.nio.file.Files;
|
|
||||||
-import java.nio.file.Path;
|
|
||||||
-
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.Map.Entry;
|
|
||||||
import java.util.Properties;
|
|
||||||
-import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import sun.security.util.Debug;
|
|
||||||
|
|
||||||
@@ -58,11 +54,23 @@ final class SystemConfigurator {
|
|
||||||
private static final String CRYPTO_POLICIES_JAVA_CONFIG =
|
|
||||||
CRYPTO_POLICIES_BASE_DIR + "/back-ends/java.config";
|
|
||||||
|
|
||||||
- private static final String CRYPTO_POLICIES_CONFIG =
|
|
||||||
- CRYPTO_POLICIES_BASE_DIR + "/config";
|
|
||||||
-
|
|
||||||
private static boolean systemFipsEnabled = false;
|
|
||||||
|
|
||||||
+ private static final String SYSTEMCONF_NATIVE_LIB = "systemconf";
|
|
||||||
+
|
|
||||||
+ private static native boolean getSystemFIPSEnabled()
|
|
||||||
+ throws IOException;
|
|
||||||
+
|
|
||||||
+ static {
|
|
||||||
+ @SuppressWarnings("removal")
|
|
||||||
+ var dummy = 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
|
|
||||||
@@ -170,16 +178,34 @@ final class SystemConfigurator {
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * FIPS is enabled only if crypto-policies are set to "FIPS"
|
|
||||||
- * and the com.redhat.fips property is true.
|
|
||||||
+ * OpenJDK FIPS mode will be enabled only if the com.redhat.fips
|
|
||||||
+ * system property is true (default) and the system is in FIPS mode.
|
|
||||||
+ *
|
|
||||||
+ * There are 2 possible ways in which OpenJDK detects that the system
|
|
||||||
+ * is in FIPS mode: 1) if the NSS SECMOD_GetSystemFIPSEnabled API is
|
|
||||||
+ * available at OpenJDK's built-time, it is called; 2) otherwise, the
|
|
||||||
+ * /proc/sys/crypto/fips_enabled file is read.
|
|
||||||
*/
|
|
||||||
private static boolean enableFips() throws Exception {
|
|
||||||
boolean shouldEnable = Boolean.valueOf(System.getProperty("com.redhat.fips", "true"));
|
|
||||||
if (shouldEnable) {
|
|
||||||
- String cryptoPoliciesConfig = new String(Files.readAllBytes(Path.of(CRYPTO_POLICIES_CONFIG)));
|
|
||||||
- if (sdebug != null) { sdebug.println("Crypto config:\n" + cryptoPoliciesConfig); }
|
|
||||||
- Pattern pattern = Pattern.compile("^FIPS$", Pattern.MULTILINE);
|
|
||||||
- return pattern.matcher(cryptoPoliciesConfig).find();
|
|
||||||
+ if (sdebug != null) {
|
|
||||||
+ sdebug.println("Calling getSystemFIPSEnabled (libsystemconf)...");
|
|
||||||
+ }
|
|
||||||
+ try {
|
|
||||||
+ shouldEnable = getSystemFIPSEnabled();
|
|
||||||
+ if (sdebug != null) {
|
|
||||||
+ sdebug.println("Call to getSystemFIPSEnabled (libsystemconf) returned: "
|
|
||||||
+ + shouldEnable);
|
|
||||||
+ }
|
|
||||||
+ return shouldEnable;
|
|
||||||
+ } catch (IOException e) {
|
|
||||||
+ if (sdebug != null) {
|
|
||||||
+ sdebug.println("Call to getSystemFIPSEnabled (libsystemconf) failed:");
|
|
||||||
+ sdebug.println(e.getMessage());
|
|
||||||
+ }
|
|
||||||
+ throw e;
|
|
||||||
+ }
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
@ -1,596 +0,0 @@
|
|||||||
diff --git openjdk/src/java.base/share/classes/module-info.java openjdk/src/java.base/share/classes/module-info.java
|
|
||||||
index 9d4a794de1a..39e69362458 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/module-info.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/module-info.java
|
|
||||||
@@ -151,6 +151,7 @@ module java.base {
|
|
||||||
java.management,
|
|
||||||
java.naming,
|
|
||||||
java.rmi,
|
|
||||||
+ jdk.crypto.ec,
|
|
||||||
jdk.jartool,
|
|
||||||
jdk.jlink,
|
|
||||||
jdk.net,
|
|
||||||
diff --git openjdk/src/java.base/share/classes/sun/security/provider/SunEntries.java openjdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
|
|
||||||
index 912cad59714..c5e13c98bd9 100644
|
|
||||||
--- openjdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
|
|
||||||
@@ -30,6 +30,7 @@ import java.net.*;
|
|
||||||
import java.util.*;
|
|
||||||
import java.security.*;
|
|
||||||
|
|
||||||
+import jdk.internal.access.SharedSecrets;
|
|
||||||
import jdk.internal.util.StaticProperty;
|
|
||||||
import sun.security.action.GetPropertyAction;
|
|
||||||
import sun.security.util.SecurityProviderConstants;
|
|
||||||
@@ -83,6 +84,10 @@ import static sun.security.util.SecurityProviderConstants.getAliases;
|
|
||||||
|
|
||||||
public final class SunEntries {
|
|
||||||
|
|
||||||
+ private static final boolean systemFipsEnabled =
|
|
||||||
+ SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
|
|
||||||
+ .isSystemFipsEnabled();
|
|
||||||
+
|
|
||||||
// the default algo used by SecureRandom class for new SecureRandom() calls
|
|
||||||
public static final String DEF_SECURE_RANDOM_ALGO;
|
|
||||||
|
|
||||||
@@ -94,147 +99,149 @@ public final class SunEntries {
|
|
||||||
// common attribute map
|
|
||||||
HashMap<String, String> attrs = new HashMap<>(3);
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * SecureRandom engines
|
|
||||||
- */
|
|
||||||
- attrs.put("ThreadSafe", "true");
|
|
||||||
- if (NativePRNG.isAvailable()) {
|
|
||||||
- add(p, "SecureRandom", "NativePRNG",
|
|
||||||
- "sun.security.provider.NativePRNG", attrs);
|
|
||||||
- }
|
|
||||||
- if (NativePRNG.Blocking.isAvailable()) {
|
|
||||||
- add(p, "SecureRandom", "NativePRNGBlocking",
|
|
||||||
- "sun.security.provider.NativePRNG$Blocking", attrs);
|
|
||||||
- }
|
|
||||||
- if (NativePRNG.NonBlocking.isAvailable()) {
|
|
||||||
- add(p, "SecureRandom", "NativePRNGNonBlocking",
|
|
||||||
- "sun.security.provider.NativePRNG$NonBlocking", attrs);
|
|
||||||
+ if (!systemFipsEnabled) {
|
|
||||||
+ /*
|
|
||||||
+ * SecureRandom engines
|
|
||||||
+ */
|
|
||||||
+ attrs.put("ThreadSafe", "true");
|
|
||||||
+ if (NativePRNG.isAvailable()) {
|
|
||||||
+ add(p, "SecureRandom", "NativePRNG",
|
|
||||||
+ "sun.security.provider.NativePRNG", attrs);
|
|
||||||
+ }
|
|
||||||
+ if (NativePRNG.Blocking.isAvailable()) {
|
|
||||||
+ add(p, "SecureRandom", "NativePRNGBlocking",
|
|
||||||
+ "sun.security.provider.NativePRNG$Blocking", attrs);
|
|
||||||
+ }
|
|
||||||
+ if (NativePRNG.NonBlocking.isAvailable()) {
|
|
||||||
+ add(p, "SecureRandom", "NativePRNGNonBlocking",
|
|
||||||
+ "sun.security.provider.NativePRNG$NonBlocking", attrs);
|
|
||||||
+ }
|
|
||||||
+ attrs.put("ImplementedIn", "Software");
|
|
||||||
+ add(p, "SecureRandom", "DRBG", "sun.security.provider.DRBG", attrs);
|
|
||||||
+ add(p, "SecureRandom", "SHA1PRNG",
|
|
||||||
+ "sun.security.provider.SecureRandom", attrs);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Signature engines
|
|
||||||
+ */
|
|
||||||
+ attrs.clear();
|
|
||||||
+ String dsaKeyClasses = "java.security.interfaces.DSAPublicKey" +
|
|
||||||
+ "|java.security.interfaces.DSAPrivateKey";
|
|
||||||
+ attrs.put("SupportedKeyClasses", dsaKeyClasses);
|
|
||||||
+ attrs.put("ImplementedIn", "Software");
|
|
||||||
+
|
|
||||||
+ attrs.put("KeySize", "1024"); // for NONE and SHA1 DSA signatures
|
|
||||||
+
|
|
||||||
+ addWithAlias(p, "Signature", "SHA1withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA1withDSA", attrs);
|
|
||||||
+ addWithAlias(p, "Signature", "NONEwithDSA",
|
|
||||||
+ "sun.security.provider.DSA$RawDSA", attrs);
|
|
||||||
+
|
|
||||||
+ // for DSA signatures with 224/256-bit digests
|
|
||||||
+ attrs.put("KeySize", "2048");
|
|
||||||
+
|
|
||||||
+ addWithAlias(p, "Signature", "SHA224withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA224withDSA", attrs);
|
|
||||||
+ addWithAlias(p, "Signature", "SHA256withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA256withDSA", attrs);
|
|
||||||
+
|
|
||||||
+ addWithAlias(p, "Signature", "SHA3-224withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA3_224withDSA", attrs);
|
|
||||||
+ addWithAlias(p, "Signature", "SHA3-256withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA3_256withDSA", attrs);
|
|
||||||
+
|
|
||||||
+ attrs.put("KeySize", "3072"); // for DSA sig using 384/512-bit digests
|
|
||||||
+
|
|
||||||
+ addWithAlias(p, "Signature", "SHA384withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA384withDSA", attrs);
|
|
||||||
+ addWithAlias(p, "Signature", "SHA512withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA512withDSA", attrs);
|
|
||||||
+ addWithAlias(p, "Signature", "SHA3-384withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA3_384withDSA", attrs);
|
|
||||||
+ addWithAlias(p, "Signature", "SHA3-512withDSA",
|
|
||||||
+ "sun.security.provider.DSA$SHA3_512withDSA", attrs);
|
|
||||||
+
|
|
||||||
+ attrs.remove("KeySize");
|
|
||||||
+
|
|
||||||
+ add(p, "Signature", "SHA1withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA1withDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "NONEwithDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$RawDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "SHA224withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA224withDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "SHA256withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA256withDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "SHA384withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA384withDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "SHA512withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA512withDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "SHA3-224withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA3_224withDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "SHA3-256withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA3_256withDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "SHA3-384withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA3_384withDSAinP1363Format");
|
|
||||||
+ add(p, "Signature", "SHA3-512withDSAinP1363Format",
|
|
||||||
+ "sun.security.provider.DSA$SHA3_512withDSAinP1363Format");
|
|
||||||
+ /*
|
|
||||||
+ * Key Pair Generator engines
|
|
||||||
+ */
|
|
||||||
+ attrs.clear();
|
|
||||||
+ attrs.put("ImplementedIn", "Software");
|
|
||||||
+ attrs.put("KeySize", "2048"); // for DSA KPG and APG only
|
|
||||||
+
|
|
||||||
+ String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
|
|
||||||
+ dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
|
|
||||||
+ addWithAlias(p, "KeyPairGenerator", "DSA", dsaKPGImplClass, attrs);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Algorithm Parameter Generator engines
|
|
||||||
+ */
|
|
||||||
+ addWithAlias(p, "AlgorithmParameterGenerator", "DSA",
|
|
||||||
+ "sun.security.provider.DSAParameterGenerator", attrs);
|
|
||||||
+ attrs.remove("KeySize");
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Algorithm Parameter engines
|
|
||||||
+ */
|
|
||||||
+ addWithAlias(p, "AlgorithmParameters", "DSA",
|
|
||||||
+ "sun.security.provider.DSAParameters", attrs);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Key factories
|
|
||||||
+ */
|
|
||||||
+ addWithAlias(p, "KeyFactory", "DSA",
|
|
||||||
+ "sun.security.provider.DSAKeyFactory", attrs);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Digest engines
|
|
||||||
+ */
|
|
||||||
+ add(p, "MessageDigest", "MD2", "sun.security.provider.MD2", attrs);
|
|
||||||
+ add(p, "MessageDigest", "MD5", "sun.security.provider.MD5", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA-1", "sun.security.provider.SHA",
|
|
||||||
+ attrs);
|
|
||||||
+
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA-224",
|
|
||||||
+ "sun.security.provider.SHA2$SHA224", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA-256",
|
|
||||||
+ "sun.security.provider.SHA2$SHA256", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA-384",
|
|
||||||
+ "sun.security.provider.SHA5$SHA384", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA-512",
|
|
||||||
+ "sun.security.provider.SHA5$SHA512", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA-512/224",
|
|
||||||
+ "sun.security.provider.SHA5$SHA512_224", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA-512/256",
|
|
||||||
+ "sun.security.provider.SHA5$SHA512_256", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA3-224",
|
|
||||||
+ "sun.security.provider.SHA3$SHA224", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA3-256",
|
|
||||||
+ "sun.security.provider.SHA3$SHA256", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA3-384",
|
|
||||||
+ "sun.security.provider.SHA3$SHA384", attrs);
|
|
||||||
+ addWithAlias(p, "MessageDigest", "SHA3-512",
|
|
||||||
+ "sun.security.provider.SHA3$SHA512", attrs);
|
|
||||||
}
|
|
||||||
- attrs.put("ImplementedIn", "Software");
|
|
||||||
- add(p, "SecureRandom", "DRBG", "sun.security.provider.DRBG", attrs);
|
|
||||||
- add(p, "SecureRandom", "SHA1PRNG",
|
|
||||||
- "sun.security.provider.SecureRandom", attrs);
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Signature engines
|
|
||||||
- */
|
|
||||||
- attrs.clear();
|
|
||||||
- String dsaKeyClasses = "java.security.interfaces.DSAPublicKey" +
|
|
||||||
- "|java.security.interfaces.DSAPrivateKey";
|
|
||||||
- attrs.put("SupportedKeyClasses", dsaKeyClasses);
|
|
||||||
- attrs.put("ImplementedIn", "Software");
|
|
||||||
-
|
|
||||||
- attrs.put("KeySize", "1024"); // for NONE and SHA1 DSA signatures
|
|
||||||
-
|
|
||||||
- addWithAlias(p, "Signature", "SHA1withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA1withDSA", attrs);
|
|
||||||
- addWithAlias(p, "Signature", "NONEwithDSA",
|
|
||||||
- "sun.security.provider.DSA$RawDSA", attrs);
|
|
||||||
-
|
|
||||||
- // for DSA signatures with 224/256-bit digests
|
|
||||||
- attrs.put("KeySize", "2048");
|
|
||||||
-
|
|
||||||
- addWithAlias(p, "Signature", "SHA224withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA224withDSA", attrs);
|
|
||||||
- addWithAlias(p, "Signature", "SHA256withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA256withDSA", attrs);
|
|
||||||
-
|
|
||||||
- addWithAlias(p, "Signature", "SHA3-224withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA3_224withDSA", attrs);
|
|
||||||
- addWithAlias(p, "Signature", "SHA3-256withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA3_256withDSA", attrs);
|
|
||||||
-
|
|
||||||
- attrs.put("KeySize", "3072"); // for DSA sig using 384/512-bit digests
|
|
||||||
-
|
|
||||||
- addWithAlias(p, "Signature", "SHA384withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA384withDSA", attrs);
|
|
||||||
- addWithAlias(p, "Signature", "SHA512withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA512withDSA", attrs);
|
|
||||||
- addWithAlias(p, "Signature", "SHA3-384withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA3_384withDSA", attrs);
|
|
||||||
- addWithAlias(p, "Signature", "SHA3-512withDSA",
|
|
||||||
- "sun.security.provider.DSA$SHA3_512withDSA", attrs);
|
|
||||||
-
|
|
||||||
- attrs.remove("KeySize");
|
|
||||||
-
|
|
||||||
- add(p, "Signature", "SHA1withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA1withDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "NONEwithDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$RawDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "SHA224withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA224withDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "SHA256withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA256withDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "SHA384withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA384withDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "SHA512withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA512withDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "SHA3-224withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA3_224withDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "SHA3-256withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA3_256withDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "SHA3-384withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA3_384withDSAinP1363Format");
|
|
||||||
- add(p, "Signature", "SHA3-512withDSAinP1363Format",
|
|
||||||
- "sun.security.provider.DSA$SHA3_512withDSAinP1363Format");
|
|
||||||
- /*
|
|
||||||
- * Key Pair Generator engines
|
|
||||||
- */
|
|
||||||
- attrs.clear();
|
|
||||||
- attrs.put("ImplementedIn", "Software");
|
|
||||||
- attrs.put("KeySize", "2048"); // for DSA KPG and APG only
|
|
||||||
-
|
|
||||||
- String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
|
|
||||||
- dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
|
|
||||||
- addWithAlias(p, "KeyPairGenerator", "DSA", dsaKPGImplClass, attrs);
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Algorithm Parameter Generator engines
|
|
||||||
- */
|
|
||||||
- addWithAlias(p, "AlgorithmParameterGenerator", "DSA",
|
|
||||||
- "sun.security.provider.DSAParameterGenerator", attrs);
|
|
||||||
- attrs.remove("KeySize");
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Algorithm Parameter engines
|
|
||||||
- */
|
|
||||||
- addWithAlias(p, "AlgorithmParameters", "DSA",
|
|
||||||
- "sun.security.provider.DSAParameters", attrs);
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Key factories
|
|
||||||
- */
|
|
||||||
- addWithAlias(p, "KeyFactory", "DSA",
|
|
||||||
- "sun.security.provider.DSAKeyFactory", attrs);
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Digest engines
|
|
||||||
- */
|
|
||||||
- add(p, "MessageDigest", "MD2", "sun.security.provider.MD2", attrs);
|
|
||||||
- add(p, "MessageDigest", "MD5", "sun.security.provider.MD5", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA-1", "sun.security.provider.SHA",
|
|
||||||
- attrs);
|
|
||||||
-
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA-224",
|
|
||||||
- "sun.security.provider.SHA2$SHA224", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA-256",
|
|
||||||
- "sun.security.provider.SHA2$SHA256", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA-384",
|
|
||||||
- "sun.security.provider.SHA5$SHA384", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA-512",
|
|
||||||
- "sun.security.provider.SHA5$SHA512", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA-512/224",
|
|
||||||
- "sun.security.provider.SHA5$SHA512_224", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA-512/256",
|
|
||||||
- "sun.security.provider.SHA5$SHA512_256", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA3-224",
|
|
||||||
- "sun.security.provider.SHA3$SHA224", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA3-256",
|
|
||||||
- "sun.security.provider.SHA3$SHA256", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA3-384",
|
|
||||||
- "sun.security.provider.SHA3$SHA384", attrs);
|
|
||||||
- addWithAlias(p, "MessageDigest", "SHA3-512",
|
|
||||||
- "sun.security.provider.SHA3$SHA512", attrs);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Certificates
|
|
||||||
diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
|
||||||
index 8c9e4f9dbe6..9eeb3013e0d 100644
|
|
||||||
--- openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
|
||||||
+++ openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
|
||||||
@@ -38,6 +38,7 @@ import java.util.HashMap;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
+import jdk.internal.access.SharedSecrets;
|
|
||||||
import sun.security.ec.ed.EdDSAAlgorithmParameters;
|
|
||||||
import sun.security.ec.ed.EdDSAKeyFactory;
|
|
||||||
import sun.security.ec.ed.EdDSAKeyPairGenerator;
|
|
||||||
@@ -56,6 +57,10 @@ public final class SunEC extends Provider {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = -2279741672933606418L;
|
|
||||||
|
|
||||||
+ private static final boolean systemFipsEnabled =
|
|
||||||
+ SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
|
|
||||||
+ .isSystemFipsEnabled();
|
|
||||||
+
|
|
||||||
private static class ProviderServiceA extends ProviderService {
|
|
||||||
ProviderServiceA(Provider p, String type, String algo, String cn,
|
|
||||||
HashMap<String, String> attrs) {
|
|
||||||
@@ -249,85 +254,86 @@ public final class SunEC extends Provider {
|
|
||||||
|
|
||||||
putXDHEntries();
|
|
||||||
putEdDSAEntries();
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Signature engines
|
|
||||||
- */
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "NONEwithECDSA", "sun.security.ec.ECDSASignature$Raw",
|
|
||||||
- null, ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA1withECDSA", "sun.security.ec.ECDSASignature$SHA1",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA224withECDSA", "sun.security.ec.ECDSASignature$SHA224",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA256withECDSA", "sun.security.ec.ECDSASignature$SHA256",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA384withECDSA", "sun.security.ec.ECDSASignature$SHA384",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA512withECDSA", "sun.security.ec.ECDSASignature$SHA512",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA3-224withECDSA", "sun.security.ec.ECDSASignature$SHA3_224",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA3-256withECDSA", "sun.security.ec.ECDSASignature$SHA3_256",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA3-384withECDSA", "sun.security.ec.ECDSASignature$SHA3_384",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "SHA3-512withECDSA", "sun.security.ec.ECDSASignature$SHA3_512",
|
|
||||||
- ATTRS));
|
|
||||||
-
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "NONEwithECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$RawinP1363Format"));
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA1withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA1inP1363Format"));
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA224withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA224inP1363Format"));
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA256withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA256inP1363Format"));
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA384withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA384inP1363Format"));
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA512withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA512inP1363Format"));
|
|
||||||
-
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA3-224withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA3_224inP1363Format"));
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA3-256withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA3_256inP1363Format"));
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA3-384withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA3_384inP1363Format"));
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "SHA3-512withECDSAinP1363Format",
|
|
||||||
- "sun.security.ec.ECDSASignature$SHA3_512inP1363Format"));
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Key Pair Generator engine
|
|
||||||
- */
|
|
||||||
- putService(new ProviderService(this, "KeyPairGenerator",
|
|
||||||
- "EC", "sun.security.ec.ECKeyPairGenerator",
|
|
||||||
- List.of("EllipticCurve"), ATTRS));
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Key Agreement engine
|
|
||||||
- */
|
|
||||||
- putService(new ProviderService(this, "KeyAgreement",
|
|
||||||
- "ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
|
|
||||||
+ if (!systemFipsEnabled) {
|
|
||||||
+ /*
|
|
||||||
+ * Signature engines
|
|
||||||
+ */
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "NONEwithECDSA", "sun.security.ec.ECDSASignature$Raw",
|
|
||||||
+ null, ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA1withECDSA", "sun.security.ec.ECDSASignature$SHA1",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA224withECDSA", "sun.security.ec.ECDSASignature$SHA224",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA256withECDSA", "sun.security.ec.ECDSASignature$SHA256",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA384withECDSA", "sun.security.ec.ECDSASignature$SHA384",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA512withECDSA", "sun.security.ec.ECDSASignature$SHA512",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA3-224withECDSA", "sun.security.ec.ECDSASignature$SHA3_224",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA3-256withECDSA", "sun.security.ec.ECDSASignature$SHA3_256",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA3-384withECDSA", "sun.security.ec.ECDSASignature$SHA3_384",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "SHA3-512withECDSA", "sun.security.ec.ECDSASignature$SHA3_512",
|
|
||||||
+ ATTRS));
|
|
||||||
+
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "NONEwithECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$RawinP1363Format"));
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA1withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA1inP1363Format"));
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA224withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA224inP1363Format"));
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA256withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA256inP1363Format"));
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA384withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA384inP1363Format"));
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA512withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA512inP1363Format"));
|
|
||||||
+
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA3-224withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA3_224inP1363Format"));
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA3-256withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA3_256inP1363Format"));
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA3-384withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA3_384inP1363Format"));
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "SHA3-512withECDSAinP1363Format",
|
|
||||||
+ "sun.security.ec.ECDSASignature$SHA3_512inP1363Format"));
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Key Pair Generator engine
|
|
||||||
+ */
|
|
||||||
+ putService(new ProviderService(this, "KeyPairGenerator",
|
|
||||||
+ "EC", "sun.security.ec.ECKeyPairGenerator",
|
|
||||||
+ List.of("EllipticCurve"), ATTRS));
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Key Agreement engine
|
|
||||||
+ */
|
|
||||||
+ putService(new ProviderService(this, "KeyAgreement",
|
|
||||||
+ "ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
private void putXDHEntries() {
|
|
||||||
@@ -344,23 +350,25 @@ public final class SunEC extends Provider {
|
|
||||||
"X448", "sun.security.ec.XDHKeyFactory.X448",
|
|
||||||
ATTRS));
|
|
||||||
|
|
||||||
- putService(new ProviderService(this, "KeyPairGenerator",
|
|
||||||
- "XDH", "sun.security.ec.XDHKeyPairGenerator", null, ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "KeyPairGenerator",
|
|
||||||
- "X25519", "sun.security.ec.XDHKeyPairGenerator.X25519",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "KeyPairGenerator",
|
|
||||||
- "X448", "sun.security.ec.XDHKeyPairGenerator.X448",
|
|
||||||
- ATTRS));
|
|
||||||
-
|
|
||||||
- putService(new ProviderService(this, "KeyAgreement",
|
|
||||||
- "XDH", "sun.security.ec.XDHKeyAgreement", null, ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "KeyAgreement",
|
|
||||||
- "X25519", "sun.security.ec.XDHKeyAgreement.X25519",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "KeyAgreement",
|
|
||||||
- "X448", "sun.security.ec.XDHKeyAgreement.X448",
|
|
||||||
- ATTRS));
|
|
||||||
+ if (!systemFipsEnabled) {
|
|
||||||
+ putService(new ProviderService(this, "KeyPairGenerator",
|
|
||||||
+ "XDH", "sun.security.ec.XDHKeyPairGenerator", null, ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "KeyPairGenerator",
|
|
||||||
+ "X25519", "sun.security.ec.XDHKeyPairGenerator.X25519",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "KeyPairGenerator",
|
|
||||||
+ "X448", "sun.security.ec.XDHKeyPairGenerator.X448",
|
|
||||||
+ ATTRS));
|
|
||||||
+
|
|
||||||
+ putService(new ProviderService(this, "KeyAgreement",
|
|
||||||
+ "XDH", "sun.security.ec.XDHKeyAgreement", null, ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "KeyAgreement",
|
|
||||||
+ "X25519", "sun.security.ec.XDHKeyAgreement.X25519",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "KeyAgreement",
|
|
||||||
+ "X448", "sun.security.ec.XDHKeyAgreement.X448",
|
|
||||||
+ ATTRS));
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
private void putEdDSAEntries() {
|
|
||||||
@@ -375,21 +383,23 @@ public final class SunEC extends Provider {
|
|
||||||
putService(new ProviderServiceA(this, "KeyFactory",
|
|
||||||
"Ed448", "sun.security.ec.ed.EdDSAKeyFactory.Ed448", ATTRS));
|
|
||||||
|
|
||||||
- putService(new ProviderService(this, "KeyPairGenerator",
|
|
||||||
- "EdDSA", "sun.security.ec.ed.EdDSAKeyPairGenerator", null, ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "KeyPairGenerator",
|
|
||||||
- "Ed25519", "sun.security.ec.ed.EdDSAKeyPairGenerator.Ed25519",
|
|
||||||
- ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "KeyPairGenerator",
|
|
||||||
- "Ed448", "sun.security.ec.ed.EdDSAKeyPairGenerator.Ed448",
|
|
||||||
- ATTRS));
|
|
||||||
-
|
|
||||||
- putService(new ProviderService(this, "Signature",
|
|
||||||
- "EdDSA", "sun.security.ec.ed.EdDSASignature", null, ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "Ed25519", "sun.security.ec.ed.EdDSASignature.Ed25519", ATTRS));
|
|
||||||
- putService(new ProviderServiceA(this, "Signature",
|
|
||||||
- "Ed448", "sun.security.ec.ed.EdDSASignature.Ed448", ATTRS));
|
|
||||||
+ if (!systemFipsEnabled) {
|
|
||||||
+ putService(new ProviderService(this, "KeyPairGenerator",
|
|
||||||
+ "EdDSA", "sun.security.ec.ed.EdDSAKeyPairGenerator", null, ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "KeyPairGenerator",
|
|
||||||
+ "Ed25519", "sun.security.ec.ed.EdDSAKeyPairGenerator.Ed25519",
|
|
||||||
+ ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "KeyPairGenerator",
|
|
||||||
+ "Ed448", "sun.security.ec.ed.EdDSAKeyPairGenerator.Ed448",
|
|
||||||
+ ATTRS));
|
|
||||||
+
|
|
||||||
+ putService(new ProviderService(this, "Signature",
|
|
||||||
+ "EdDSA", "sun.security.ec.ed.EdDSASignature", null, ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "Ed25519", "sun.security.ec.ed.EdDSASignature.Ed25519", ATTRS));
|
|
||||||
+ putService(new ProviderServiceA(this, "Signature",
|
|
||||||
+ "Ed448", "sun.security.ec.ed.EdDSASignature.Ed448", ATTRS));
|
|
||||||
+ }
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,18 +0,0 @@
|
|||||||
commit bfd7c5dae9c15266799cb885b8c60199217b65b9
|
|
||||||
Author: Andrew Hughes <gnu.andrew@redhat.com>
|
|
||||||
Date: Mon Aug 30 16:14:14 2021 +0100
|
|
||||||
|
|
||||||
RH1996182: Extend default security policy to allow SunPKCS11 access to jdk.internal.access
|
|
||||||
|
|
||||||
diff --git openjdk.orig/src/java.base/share/lib/security/default.policy openjdk/src/java.base/share/lib/security/default.policy
|
|
||||||
index 8356e56367b..23925f048be 100644
|
|
||||||
--- openjdk.orig/src/java.base/share/lib/security/default.policy
|
|
||||||
+++ openjdk/src/java.base/share/lib/security/default.policy
|
|
||||||
@@ -128,6 +128,7 @@ grant codeBase "jrt:/jdk.crypto.ec" {
|
|
||||||
grant codeBase "jrt:/jdk.crypto.cryptoki" {
|
|
||||||
permission java.lang.RuntimePermission
|
|
||||||
"accessClassInPackage.com.sun.crypto.provider";
|
|
||||||
+ permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.access";
|
|
||||||
permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
|
|
||||||
permission java.lang.RuntimePermission
|
|
||||||
"accessClassInPackage.sun.security.*";
|
|
@ -1,65 +0,0 @@
|
|||||||
commit 93c9f6330bf2b4405c789bf893a5256c3f4a4923
|
|
||||||
Author: Martin Balao <mbalao@redhat.com>
|
|
||||||
Date: Sat Aug 28 00:35:44 2021 +0100
|
|
||||||
|
|
||||||
RH1996182: Login to the NSS Software Token in FIPS Mode
|
|
||||||
|
|
||||||
diff --git openjdk.orig/src/java.base/share/classes/module-info.java openjdk/src/java.base/share/classes/module-info.java
|
|
||||||
index 39e69362458..aeb5fc2eb46 100644
|
|
||||||
--- openjdk.orig/src/java.base/share/classes/module-info.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/module-info.java
|
|
||||||
@@ -151,6 +151,7 @@ module java.base {
|
|
||||||
java.management,
|
|
||||||
java.naming,
|
|
||||||
java.rmi,
|
|
||||||
+ jdk.crypto.cryptoki,
|
|
||||||
jdk.crypto.ec,
|
|
||||||
jdk.jartool,
|
|
||||||
jdk.jlink,
|
|
||||||
diff --git openjdk.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
|
|
||||||
index 112b639aa96..5d3963ea893 100644
|
|
||||||
--- openjdk.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
|
|
||||||
+++ openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
|
|
||||||
@@ -42,6 +42,7 @@ import javax.security.auth.callback.PasswordCallback;
|
|
||||||
|
|
||||||
import com.sun.crypto.provider.ChaCha20Poly1305Parameters;
|
|
||||||
|
|
||||||
+import jdk.internal.access.SharedSecrets;
|
|
||||||
import jdk.internal.misc.InnocuousThread;
|
|
||||||
import sun.security.util.Debug;
|
|
||||||
import sun.security.util.ResourcesMgr;
|
|
||||||
@@ -62,6 +63,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Exception.*;
|
|
||||||
*/
|
|
||||||
public final class SunPKCS11 extends AuthProvider {
|
|
||||||
|
|
||||||
+ private static final boolean systemFipsEnabled = SharedSecrets
|
|
||||||
+ .getJavaSecuritySystemConfiguratorAccess().isSystemFipsEnabled();
|
|
||||||
+
|
|
||||||
private static final long serialVersionUID = -1354835039035306505L;
|
|
||||||
|
|
||||||
static final Debug debug = Debug.getInstance("sunpkcs11");
|
|
||||||
@@ -379,6 +383,24 @@ public final class SunPKCS11 extends AuthProvider {
|
|
||||||
if (nssModule != null) {
|
|
||||||
nssModule.setProvider(this);
|
|
||||||
}
|
|
||||||
+ if (systemFipsEnabled) {
|
|
||||||
+ // The NSS Software Token in FIPS 140-2 mode requires a user
|
|
||||||
+ // login for most operations. See sftk_fipsCheck. The NSS DB
|
|
||||||
+ // (/etc/pki/nssdb) PIN is empty.
|
|
||||||
+ Session session = null;
|
|
||||||
+ try {
|
|
||||||
+ session = token.getOpSession();
|
|
||||||
+ p11.C_Login(session.id(), CKU_USER, new char[] {});
|
|
||||||
+ } catch (PKCS11Exception p11e) {
|
|
||||||
+ if (debug != null) {
|
|
||||||
+ debug.println("Error during token login: " +
|
|
||||||
+ p11e.getMessage());
|
|
||||||
+ }
|
|
||||||
+ throw p11e;
|
|
||||||
+ } finally {
|
|
||||||
+ token.releaseSession(session);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (config.getHandleStartupErrors() == Config.ERR_IGNORE_ALL) {
|
|
||||||
throw new UnsupportedOperationException
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user