Compare commits
73 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0db2c2791b | ||
|
d01ad61de5 | ||
|
a4e522b089 | ||
|
0f6c086854 | ||
|
15abf4f558 | ||
|
6faa81f4f9 | ||
|
28dd98a474 | ||
|
f6a55b568b | ||
|
ad1d006fca | ||
|
01513bdab7 | ||
|
f905d4f641 | ||
|
8494397c4f | ||
|
2d94c2eee7 | ||
|
483738b04c | ||
|
50793efd8e | ||
|
796870d0a2 | ||
|
010e57f9f6 | ||
|
ccbe3cb9b0 | ||
|
dfa89a1027 | ||
|
bed2ea1420 | ||
|
66aaf933ed | ||
|
685de6aecf | ||
|
46d78a4296 | ||
|
487aa16543 | ||
|
75e9e14608 | ||
|
d6438d977f | ||
|
680e1acb05 | ||
|
2080b40147 | ||
|
c7fa66aed4 | ||
|
987310ef1d | ||
|
6eadba01e7 | ||
|
fe87f55d67 | ||
|
a761355093 | ||
|
167363c8ad | ||
|
0b693ee02b | ||
|
b79582ca92 | ||
|
e4b8afc785 | ||
|
921ff9bba6 | ||
|
0bfdf5d3be | ||
|
60ef5c1890 | ||
|
6069fcb198 | ||
|
0d654c6f80 | ||
|
c4f65b09a1 | ||
|
145f513b98 | ||
|
5995adcda5 | ||
|
91aad61f42 | ||
|
587d6ad637 | ||
|
c27aa9f364 | ||
|
a487c73622 | ||
|
db7c86a12e | ||
|
bfdeb40bb4 | ||
|
d29f6f3b01 | ||
|
4bcf0c1dd1 | ||
|
cc2e153362 | ||
|
071adc0652 | ||
|
383ed4f978 | ||
|
54ec9bd9fc | ||
|
692c6aeb30 | ||
|
adc3dfca6c | ||
|
ba44abe729 | ||
|
dd485dcd4e | ||
|
c2143101b0 | ||
|
bc6ed4dabe | ||
|
81ad8a3a4d | ||
|
20d245ecd7 | ||
|
faca292328 | ||
|
ffd7bb2927 | ||
|
6174c4b1e0 | ||
|
2fe44f457e | ||
|
33cac71abd | ||
|
f4cd97b8db | ||
|
874ffcc633 | ||
|
9d68467bef |
10
.gitignore
vendored
10
.gitignore
vendored
@ -19,13 +19,3 @@
|
|||||||
/openjdk-jdk17-jdk-17+33.tar.xz
|
/openjdk-jdk17-jdk-17+33.tar.xz
|
||||||
/openjdk-jdk17-jdk-17+35.tar.xz
|
/openjdk-jdk17-jdk-17+35.tar.xz
|
||||||
/openjdk-jdk17u-jdk-17.0.1+12.tar.xz
|
/openjdk-jdk17u-jdk-17.0.1+12.tar.xz
|
||||||
/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
|
||||||
/openjdk-jdk17u-jdk-17.0.2+8.tar.xz
|
|
||||||
/openjdk-jdk-jdk-18+27.tar.xz
|
|
||||||
/openjdk-jdk18-jdk-18+27.tar.xz
|
|
||||||
/openjdk-jdk18-jdk-18+37.tar.xz
|
|
||||||
/openjdk-jdk18u-jdk-18.0.1+0.tar.xz
|
|
||||||
/openjdk-jdk18u-jdk-18.0.1+10.tar.xz
|
|
||||||
/openjdk-jdk18u-jdk-18.0.1.1+2.tar.xz
|
|
||||||
/openjdk-jdk18u-jdk-18.0.2+9.tar.xz
|
|
||||||
/openjdk-jdk19u-jdk-19+36.tar.xz
|
|
||||||
|
@ -1,65 +0,0 @@
|
|||||||
/* 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);
|
|
||||||
}
|
|
||||||
}
|
|
633
NEWS
633
NEWS
@ -3,13 +3,110 @@ Key:
|
|||||||
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
|
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
|
||||||
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
|
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
|
||||||
|
|
||||||
New in release OpenJDK 19.0.0 (2022-09-20):
|
New in release OpenJDK 17.0.1 (2021-10-19):
|
||||||
===========================================
|
===========================================
|
||||||
Major changes are listed below. Some changes may have been backported
|
Live versions of these release notes can be found at:
|
||||||
to earlier releases following their first appearance in OpenJDK 19.
|
* https://builds.shipilev.net/backports-monitor/release-notes-17.0.1.txt
|
||||||
|
|
||||||
The full list of changes in 19u can be found at:
|
* Security fixes
|
||||||
- * https://builds.shipilev.net/backports-monitor/release-notes-19.txt
|
- JDK-8263314: Enhance XML Dsig modes
|
||||||
|
- JDK-8265167, CVE-2021-35556: Richer Text Editors
|
||||||
|
- JDK-8265574: Improve handling of sheets
|
||||||
|
- JDK-8265580, CVE-2021-35559: Enhanced style for RTF kit
|
||||||
|
- JDK-8265776: Improve Stream handling for SSL
|
||||||
|
- JDK-8266097, CVE-2021-35561: Better hashing support
|
||||||
|
- JDK-8266103: Better specified spec values
|
||||||
|
- JDK-8266109: More Resilient Classloading
|
||||||
|
- JDK-8266115: More Manifest Jar Loading
|
||||||
|
- JDK-8266137, CVE-2021-35564: Improve Keystore integrity
|
||||||
|
- JDK-8266689, CVE-2021-35567: More Constrained Delegation
|
||||||
|
- JDK-8267086: ArrayIndexOutOfBoundsException in java.security.KeyFactory.generatePublic
|
||||||
|
- JDK-8267712: Better LDAP reference processing
|
||||||
|
- JDK-8267729, CVE-2021-35578: Improve TLS client handshaking
|
||||||
|
- JDK-8267735, CVE-2021-35586: Better BMP support
|
||||||
|
- JDK-8268193: Improve requests of certificates
|
||||||
|
- JDK-8268199: Correct certificate requests
|
||||||
|
- JDK-8268205: Enhance DTLS client handshake
|
||||||
|
- JDK-8268500: Better specified ParameterSpecs
|
||||||
|
- JDK-8268506: More Manifest Digests
|
||||||
|
- JDK-8269618, CVE-2021-35603: Better session identification
|
||||||
|
- JDK-8269624: Enhance method selection support
|
||||||
|
- JDK-8270398: Enhance canonicalization
|
||||||
|
- JDK-8270404: Better canonicalization
|
||||||
|
* Other changes
|
||||||
|
- JDK-8225082: Remove IdenTrust certificate that is expiring in September 2021
|
||||||
|
- JDK-8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails
|
||||||
|
- JDK-8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked
|
||||||
|
- JDK-8261088: Repeatable annotations without @Target cannot have containers that target module declarations
|
||||||
|
- JDK-8262731: [macOS] Exception from "Printable.print" is swallowed during "PrinterJob.print"
|
||||||
|
- JDK-8263531: Remove unused buffer int
|
||||||
|
- JDK-8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java
|
||||||
|
- JDK-8267625: AARCH64: typo in LIR_Assembler::emit_profile_type
|
||||||
|
- JDK-8267666: Add option to jcmd GC.heap_dump to use existing file
|
||||||
|
- JDK-8268019: C2: assert(no_dead_loop) failed: dead loop detected
|
||||||
|
- JDK-8268261: C2: assert(n != __null) failed: Bad immediate dominator info.
|
||||||
|
- JDK-8268427: Improve AlgorithmConstraints:checkAlgorithm performance
|
||||||
|
- JDK-8268963: [IR Framework] Some default regexes matching on PrintOptoAssembly in IRNode.java do not work on all platforms
|
||||||
|
- JDK-8269297: Bump version numbers for JDK 17.0.1
|
||||||
|
- JDK-8269478: Shenandoah: gc/shenandoah/mxbeans tests should be more resilient
|
||||||
|
- JDK-8269574: C2: Avoid redundant uncommon traps in GraphKit::builtin_throw() for JVMTI exception events
|
||||||
|
- JDK-8269763: The JEditorPane is blank after JDK-8265167
|
||||||
|
- JDK-8269851: OperatingSystemMXBean getProcessCpuLoad reports incorrect process cpu usage in containers
|
||||||
|
- JDK-8269882: stack-use-after-scope in NewObjectA
|
||||||
|
- JDK-8269897: Shenandoah: Resolve UNKNOWN access strength, where possible
|
||||||
|
- JDK-8269934: RunThese24H.java failed with EXCEPTION_ACCESS_VIOLATION in java_lang_Thread::get_thread_status
|
||||||
|
- JDK-8269993: [Test]: java/net/httpclient/DigestEchoClientSSL.java contains redundant @run tags
|
||||||
|
- JDK-8270094: Shenandoah: Provide human-readable labels for test configurations
|
||||||
|
- JDK-8270096: Shenandoah: Optimize gc/shenandoah/TestRefprocSanity.java for interpreter mode
|
||||||
|
- JDK-8270098: ZGC: ZBarrierSetC2::clone_at_expansion fails with "Guard against surprises" assert
|
||||||
|
- JDK-8270137: Kerberos Credential Retrieval from Cache not Working in Cross-Realm Setup
|
||||||
|
- JDK-8270280: security/infra/java/security/cert/CertPathValidator/certification/LetsEncryptCA.java OCSP response error
|
||||||
|
- JDK-8270344: Session resumption errors
|
||||||
|
- JDK-8271203: C2: assert(iff->Opcode() == Op_If || iff->Opcode() == Op_CountedLoopEnd || iff->Opcode() == Op_RangeCheck) failed: Check this code when new subtype is added
|
||||||
|
- JDK-8271276: C2: Wrong JVM state used for receiver null check
|
||||||
|
- JDK-8271335: Updating RE Configs for BUILD REQUEST 17.0.1+4
|
||||||
|
- JDK-8271589: fatal error with variable shift count integer rotate operation.
|
||||||
|
- JDK-8271723: Unproblemlist runtime/InvocationTests/invokevirtualTests.java
|
||||||
|
- JDK-8271730: Client authentication using RSASSA-PSS fails after correct certificate requests
|
||||||
|
- JDK-8271925: ZGC: Arraycopy stub passes invalid oop to load barrier
|
||||||
|
- JDK-8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon
|
||||||
|
- JDK-8272131: PhaseMacroExpand::generate_slow_arraycopy crash when clone null CallProjections.fallthrough_ioproj
|
||||||
|
- JDK-8272326: java/util/Random/RandomTestMoments.java had two Gaussian fails
|
||||||
|
- JDK-8272332: --with-harfbuzz=system doesn't add -lharfbuzz after JDK-8255790
|
||||||
|
- JDK-8272472: StackGuardPages test doesn't build with glibc 2.34
|
||||||
|
- JDK-8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182
|
||||||
|
- JDK-8272602: [macos] not all KEY_PRESSED events sent when control modifier is used
|
||||||
|
- JDK-8272700: [macos] Build failure with Xcode 13.0 after JDK-8264848
|
||||||
|
- JDK-8272708: [Test]: Cleanup: test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java no longer needs ocspEnabled
|
||||||
|
- JDK-8272806: [macOS] "Apple AWT Internal Exception" when input method is changed
|
||||||
|
- JDK-8273358: macOS Monterey does not have the font Times needed by Serif
|
||||||
|
|
||||||
|
Notes on individual issues:
|
||||||
|
===========================
|
||||||
|
|
||||||
|
security-libs/java.security:
|
||||||
|
|
||||||
|
JDK-8271434: Removed IdenTrust Root Certificate
|
||||||
|
===============================================
|
||||||
|
The following root certificate from IdenTrust has been removed from
|
||||||
|
the `cacerts` keystore:
|
||||||
|
|
||||||
|
Alias Name: identrustdstx3 [jdk]
|
||||||
|
Distinguished Name: CN=DST Root CA X3, O=Digital Signature Trust Co.
|
||||||
|
|
||||||
|
New in release OpenJDK 17.0.0 (2021-09-14):
|
||||||
|
===========================================
|
||||||
|
The full list of changes in the interim releases from 11u to 17u can be found at:
|
||||||
|
* https://builds.shipilev.net/backports-monitor/release-notes-12.txt
|
||||||
|
* https://builds.shipilev.net/backports-monitor/release-notes-13.txt
|
||||||
|
* https://builds.shipilev.net/backports-monitor/release-notes-14.txt
|
||||||
|
* https://builds.shipilev.net/backports-monitor/release-notes-15.txt
|
||||||
|
* https://builds.shipilev.net/backports-monitor/release-notes-16.txt
|
||||||
|
* https://builds.shipilev.net/backports-monitor/release-notes-17.txt
|
||||||
|
|
||||||
|
Major changes are listed below. Some changes may have been backported
|
||||||
|
to earlier releases following their first appearance in OpenJDK 12
|
||||||
|
through to 17.
|
||||||
|
|
||||||
NEW FEATURES
|
NEW FEATURES
|
||||||
============
|
============
|
||||||
@ -17,11 +114,94 @@ NEW FEATURES
|
|||||||
Language Features
|
Language Features
|
||||||
=================
|
=================
|
||||||
|
|
||||||
|
Switch Expressions
|
||||||
|
==================
|
||||||
|
https://openjdk.java.net/jeps/325
|
||||||
|
https://openjdk.java.net/jeps/354
|
||||||
|
https://openjdk.java.net/jeps/361
|
||||||
|
|
||||||
|
Extend the `switch` statement so that it can be used as either a
|
||||||
|
statement or an expression, and that both forms can use either a
|
||||||
|
"traditional" or "simplified" scoping and control flow behavior. Both
|
||||||
|
forms can use either traditional `case ... :` labels (with fall
|
||||||
|
through) or new `case ... ->` labels (with no fall through), with a
|
||||||
|
further new statement for yielding a value from a `switch`
|
||||||
|
expression. These changes will simplify everyday coding, and also
|
||||||
|
prepare the way for the use of pattern matching in `switch`.
|
||||||
|
|
||||||
|
This was a preview feature (http://openjdk.java.net/jeps/12) in
|
||||||
|
OpenJDK 12 & 13 and became final in OpenJDK 14.
|
||||||
|
|
||||||
|
Text Blocks
|
||||||
|
===========
|
||||||
|
https://openjdk.java.net/jeps/355
|
||||||
|
https://openjdk.java.net/jeps/368
|
||||||
|
https://openjdk.java.net/jeps/378
|
||||||
|
|
||||||
|
Add text blocks to the Java language. A text block is a multi-line
|
||||||
|
string literal that avoids the need for most escape sequences,
|
||||||
|
automatically formats the string in a predictable way, and gives the
|
||||||
|
developer control over format when desired.
|
||||||
|
|
||||||
|
This was a preview feature (http://openjdk.java.net/jeps/12) in
|
||||||
|
OpenJDK 13 & 14 and became final in OpenJDK 15.
|
||||||
|
|
||||||
|
Pattern Matching for instanceof
|
||||||
|
===============================
|
||||||
|
https://openjdk.java.net/jeps/305
|
||||||
|
https://openjdk.java.net/jeps/375
|
||||||
|
https://openjdk.java.net/jeps/394
|
||||||
|
http://cr.openjdk.java.net/~briangoetz/amber/pattern-match.html
|
||||||
|
|
||||||
|
Enhance the Java programming language with pattern matching for the
|
||||||
|
`instanceof` operator. Pattern matching allows common logic in a
|
||||||
|
program, namely the conditional extraction of components from objects,
|
||||||
|
to be expressed more concisely and safely.
|
||||||
|
|
||||||
|
This was a preview feature (http://openjdk.java.net/jeps/12) in
|
||||||
|
OpenJDK 14 & 15 and became final in OpenJDK 16.
|
||||||
|
|
||||||
|
Records
|
||||||
|
=======
|
||||||
|
https://openjdk.java.net/jeps/359
|
||||||
|
https://openjdk.java.net/jeps/384
|
||||||
|
https://openjdk.java.net/jeps/395
|
||||||
|
|
||||||
|
Enhance the Java programming language with records. Records provide a
|
||||||
|
compact syntax for declaring classes which are transparent holders for
|
||||||
|
shallowly immutable data.
|
||||||
|
|
||||||
|
This was a preview feature (http://openjdk.java.net/jeps/12) in
|
||||||
|
OpenJDK 14 & 15 and became final in OpenJDK 16.
|
||||||
|
|
||||||
|
Sealed Classes
|
||||||
|
==============
|
||||||
|
https://openjdk.java.net/jeps/360
|
||||||
|
https://openjdk.java.net/jeps/397
|
||||||
|
https://openjdk.java.net/jeps/409
|
||||||
|
https://cr.openjdk.java.net/~briangoetz/amber/datum.html
|
||||||
|
|
||||||
|
Enhance the Java programming language with sealed classes and
|
||||||
|
interfaces. Sealed classes and interfaces restrict which other classes
|
||||||
|
or interfaces may extend or implement them.
|
||||||
|
|
||||||
|
This was a preview feature (http://openjdk.java.net/jeps/12) in
|
||||||
|
OpenJDK 15 & 16 and became final in OpenJDK 17.
|
||||||
|
|
||||||
|
Restore Always-Strict Floating-Point Semantics
|
||||||
|
==============================================
|
||||||
|
https://openjdk.java.net/jeps/306
|
||||||
|
|
||||||
|
Make floating-point operations consistently strict, rather than have
|
||||||
|
both strict floating-point semantics (`strictfp`) and subtly different
|
||||||
|
default floating-point semantics. This will restore the original
|
||||||
|
floating-point semantics to the language and VM, matching the
|
||||||
|
semantics before the introduction of strict and default floating-point
|
||||||
|
modes in Java SE 1.2.
|
||||||
|
|
||||||
Pattern Matching for switch
|
Pattern Matching for switch
|
||||||
===========================
|
===========================
|
||||||
https://openjdk.org/jeps/406
|
https://openjdk.java.net/jeps/406
|
||||||
https://openjdk.org/jeps/420
|
|
||||||
https://openjdk.org/jeps/427
|
|
||||||
|
|
||||||
Enhance the Java programming language with pattern matching for
|
Enhance the Java programming language with pattern matching for
|
||||||
`switch` expressions and statements, along with extensions to the
|
`switch` expressions and statements, along with extensions to the
|
||||||
@ -30,47 +210,154 @@ expression to be tested against a number of patterns, each with a
|
|||||||
specific action, so that complex data-oriented queries can be
|
specific action, so that complex data-oriented queries can be
|
||||||
expressed concisely and safely.
|
expressed concisely and safely.
|
||||||
|
|
||||||
This was a preview feature (http://openjdk.java.net/jeps/12) in
|
This is a preview feature (http://openjdk.java.net/jeps/12) in OpenJDK
|
||||||
OpenJDK 17 (JEP 406) and saw a second preview in OpenJDK 18 (JEP 420).
|
17.
|
||||||
It reaches its third preview (JEP 427) in OpenJDK 19.
|
|
||||||
|
|
||||||
Record Patterns
|
|
||||||
===============
|
|
||||||
https://openjdk.org/jeps/405
|
|
||||||
|
|
||||||
Enhance the Java programming language with record patterns to
|
|
||||||
deconstruct record values. Record patterns and type patterns can be
|
|
||||||
nested to enable a powerful, declarative, and composable form of data
|
|
||||||
navigation and processing.
|
|
||||||
|
|
||||||
This is a preview feature (http://openjdk.java.net/jeps/12) introduced
|
|
||||||
in OpenJDK 19 (JEP 405)
|
|
||||||
|
|
||||||
Library Features
|
Library Features
|
||||||
================
|
================
|
||||||
|
|
||||||
|
JVM Constants API
|
||||||
|
=================
|
||||||
|
https://openjdk.java.net/jeps/334
|
||||||
|
|
||||||
|
Introduce an API to model nominal descriptions of key class-file and
|
||||||
|
run-time artifacts, in particular constants that are loadable from the
|
||||||
|
constant pool.
|
||||||
|
|
||||||
|
Reimplement the Legacy Socket API
|
||||||
|
=================================
|
||||||
|
https://openjdk.java.net/jeps/353
|
||||||
|
|
||||||
|
Replace the underlying implementation used by the `java.net.Socket`
|
||||||
|
and `java.net.ServerSocket` APIs with a simpler and more modern
|
||||||
|
implementation that is easy to maintain and debug. The new
|
||||||
|
implementation will be easy to adapt to work with user-mode threads,
|
||||||
|
a.k.a. fibers, currently being explored in Project Loom
|
||||||
|
(https://openjdk.java.net/projects/loom).
|
||||||
|
|
||||||
|
JFR Event Streaming
|
||||||
|
===================
|
||||||
|
https://openjdk.java.net/jeps/349
|
||||||
|
|
||||||
|
Expose JDK Flight Recorder data for continuous monitoring.
|
||||||
|
|
||||||
|
Non-Volatile Mapped Byte Buffers
|
||||||
|
================================
|
||||||
|
https://openjdk.java.net/jeps/352
|
||||||
|
|
||||||
|
Add new JDK-specific file mapping modes so that the `FileChannel` API
|
||||||
|
can be used to create `MappedByteBuffer` instances that refer to
|
||||||
|
non-volatile memory.
|
||||||
|
|
||||||
|
Helpful NullPointerExceptions
|
||||||
|
=============================
|
||||||
|
https://openjdk.java.net/jeps/358
|
||||||
|
|
||||||
|
Improve the usability of `NullPointerException`s generated by the JVM
|
||||||
|
by describing precisely which variable was `null`.
|
||||||
|
|
||||||
|
Foreign-Memory Access API
|
||||||
|
=========================
|
||||||
|
https://openjdk.java.net/jeps/370
|
||||||
|
https://openjdk.java.net/jeps/383
|
||||||
|
https://openjdk.java.net/jeps/393
|
||||||
|
|
||||||
|
Introduce an API to allow Java programs to safely and efficiently
|
||||||
|
access foreign memory outside of the Java heap.
|
||||||
|
|
||||||
|
This was a incubation feature (https://openjdk.java.net/jeps/11) in
|
||||||
|
OpenJDK 14, 15 & 16, now superseded by the Foreign Function & Memory
|
||||||
|
API in OpenJDK 17 (see below).
|
||||||
|
|
||||||
|
Edwards-Curve Digital Signature Algorithm (EdDSA)
|
||||||
|
=================================================
|
||||||
|
https://openjdk.java.net/jeps/339
|
||||||
|
|
||||||
|
Implement cryptographic signatures using the Edwards-Curve Digital
|
||||||
|
Signature Algorithm (EdDSA) as described by RFC 8032
|
||||||
|
(https://tools.ietf.org/html/rfc8032).
|
||||||
|
|
||||||
|
Hidden Classes
|
||||||
|
==============
|
||||||
|
https://openjdk.java.net/jeps/371
|
||||||
|
|
||||||
|
Introduce hidden classes, which are classes that cannot be used
|
||||||
|
directly by the bytecode of other classes. Hidden classes are intended
|
||||||
|
for use by frameworks that generate classes at run time and use them
|
||||||
|
indirectly, via reflection. A hidden class may be defined as a member
|
||||||
|
of an access control nest (https://openjdk.java.net/jeps/181), and may
|
||||||
|
be unloaded independently of other classes.
|
||||||
|
|
||||||
|
Reimplement the Legacy DatagramSocket API
|
||||||
|
=========================================
|
||||||
|
https://openjdk.java.net/jeps/373
|
||||||
|
|
||||||
|
Replace the underlying implementations of the
|
||||||
|
`java.net.DatagramSocket` and `java.net.MulticastSocket` APIs with
|
||||||
|
simpler and more modern implementations that are easy to maintain and
|
||||||
|
debug. The new implementations will be easy to adapt to work with
|
||||||
|
virtual threads, currently being explored in Project Loom
|
||||||
|
(https://openjdk.java.net/projects/loom). This is a follow-on to JEP
|
||||||
|
353 (see above), which already reimplemented the legacy Socket API.
|
||||||
|
|
||||||
Vector API
|
Vector API
|
||||||
==========
|
==========
|
||||||
https://openjdk.org/jeps/338
|
https://openjdk.java.net/jeps/338
|
||||||
https://openjdk.org/jeps/414
|
https://openjdk.java.net/jeps/414
|
||||||
https://openjdk.org/jeps/417
|
|
||||||
https://openjdk.org/jeps/426
|
|
||||||
|
|
||||||
Introduce an API to express vector computations that reliably compile
|
Provide an initial iteration of an incubator module,
|
||||||
at runtime to optimal vector hardware instructions on supported CPU
|
`jdk.incubator.vector`, to express vector computations that reliably
|
||||||
architectures and thus achieve superior performance to equivalent
|
compile at runtime to optimal vector hardware instructions on
|
||||||
scalar computations.
|
supported CPU architectures and thus achieve superior performance to
|
||||||
|
equivalent scalar computations.
|
||||||
|
|
||||||
This is an incubation feature (https://openjdk.java.net/jeps/11)
|
This is an incubation feature (https://openjdk.java.net/jeps/11)
|
||||||
introduced in OpenJDK 16 (JEP 338). A second round of incubation took
|
introduced in OpenJDK 16.
|
||||||
place in OpenJDK 17 (JEP 414), OpenJDK 18 (JEP 417) saw a third and
|
|
||||||
OpenJDK 19 sees its fourth (JEP 426).
|
Unix-Domain Socket Channels
|
||||||
|
===========================
|
||||||
|
https://openjdk.java.net/jeps/380
|
||||||
|
|
||||||
|
Add Unix-domain (`AF_UNIX`) socket support to the socket channel and
|
||||||
|
server-socket channel APIs in the `java.nio.channels` package. Extend
|
||||||
|
the inherited channel mechanism to support Unix-domain socket channels
|
||||||
|
and server socket channels.
|
||||||
|
|
||||||
|
Foreign Linker API (Incubator)
|
||||||
|
==============================
|
||||||
|
https://openjdk.java.net/jeps/389
|
||||||
|
|
||||||
|
Introduce an API that offers statically-typed, pure-Java access to
|
||||||
|
native code. This API, together with the Foreign-Memory API (see
|
||||||
|
above), will considerably simplify the otherwise error-prone process
|
||||||
|
of binding to a native library.
|
||||||
|
|
||||||
|
This was an incubation feature (https://openjdk.java.net/jeps/11)
|
||||||
|
introduced in OpenJDK 16, now superseded by the Foreign Function &
|
||||||
|
Memory API in OpenJDK 17 (see below).
|
||||||
|
|
||||||
|
Strongly Encapsulate JDK Internals by Default
|
||||||
|
=============================================
|
||||||
|
https://openjdk.java.net/jeps/396
|
||||||
|
https://openjdk.java.net/jeps/403
|
||||||
|
|
||||||
|
Strongly encapsulate all internal elements of the JDK by default,
|
||||||
|
except for critical internal APIs such as `sun.misc.Unsafe`. It will
|
||||||
|
no longer be possible to relax the strong encapsulation of internal
|
||||||
|
elements via a single command-line option, as was possible in OpenJDK
|
||||||
|
9 through 16.
|
||||||
|
|
||||||
|
Enhanced Pseudo-Random Number Generators
|
||||||
|
========================================
|
||||||
|
https://openjdk.java.net/jeps/356
|
||||||
|
|
||||||
|
Provide new interface types and implementations for pseudo-random
|
||||||
|
number generators (PRNGs), including jumpable PRNGs and an additional
|
||||||
|
class of splittable PRNG algorithms (LXM).
|
||||||
|
|
||||||
Foreign Function & Memory API
|
Foreign Function & Memory API
|
||||||
=============================
|
=============================
|
||||||
https://openjdk.org/jeps/412
|
https://openjdk.java.net/jeps/412
|
||||||
https://openjdk.org/jeps/419
|
|
||||||
https://openjdk.org/jeps/424
|
|
||||||
|
|
||||||
Introduce an API by which Java programs can interoperate with code and
|
Introduce an API by which Java programs can interoperate with code and
|
||||||
data outside of the Java runtime. By efficiently invoking foreign
|
data outside of the Java runtime. By efficiently invoking foreign
|
||||||
@ -79,48 +366,254 @@ foreign memory (i.e., memory not managed by the JVM), the API enables
|
|||||||
Java programs to call native libraries and process native data without
|
Java programs to call native libraries and process native data without
|
||||||
the brittleness and danger of JNI.
|
the brittleness and danger of JNI.
|
||||||
|
|
||||||
This API is now a preview feature (http://openjdk.java.net/jeps/12).
|
This API is an incubation feature (https://openjdk.java.net/jeps/11)
|
||||||
It was first introduced in incubation
|
introduced in OpenJDK 17, and is an evolution of the Foreign Memory
|
||||||
(https://openjdk.java.net/jeps/11) in OpenJDK 17 (JEP 412), and is an
|
Access API (OpenJDK 14 through 16) and Foreign Linker API (OpenJDK
|
||||||
evolution of the Foreign Memory Access API (OpenJDK 14 through 16) and
|
16) (see above).
|
||||||
Foreign Linker API (OpenJDK 16) (see release notes for
|
|
||||||
java-17-openjdk). OpenJDK 18 saw a second round of incubation (JEP
|
|
||||||
419) before its inclusion as a preview in OpenJDK 19 (JEP 424).
|
|
||||||
|
|
||||||
Virtual Threads
|
Context-Specific Deserialization Filters
|
||||||
===============
|
========================================
|
||||||
https://openjdk.org/jeps/425
|
https://openjdk.java.net/jeps/415
|
||||||
|
|
||||||
Introduce virtual threads to the Java Platform. Virtual threads are
|
Allow applications to configure context-specific and
|
||||||
lightweight threads that dramatically reduce the effort of writing,
|
dynamically-selected deserialization filters via a JVM-wide filter
|
||||||
maintaining, and observing high-throughput concurrent applications.
|
factory that is invoked to select a filter for each individual
|
||||||
|
deserialization operation.
|
||||||
|
|
||||||
This is a preview feature (http://openjdk.java.net/jeps/12) introduced
|
Tools
|
||||||
in OpenJDK 19 (JEP 425)
|
=====
|
||||||
|
|
||||||
Structured Concurrency
|
Packaging Tool
|
||||||
======================
|
==============
|
||||||
https://openjdk.org/jeps/428
|
https://openjdk.java.net/jeps/343
|
||||||
|
https://openjdk.java.net/jeps/392
|
||||||
|
|
||||||
Simplify multithreaded programming by introducing an API for
|
Provide the `jpackage` tool, for packaging self-contained Java
|
||||||
structured concurrency. Structured concurrency treats multiple tasks
|
applications.
|
||||||
running in different threads as a single unit of work, thereby
|
|
||||||
streamlining error handling and cancellation, improving reliability,
|
|
||||||
and enhancing observability.
|
|
||||||
|
|
||||||
This is an incubation feature (https://openjdk.java.net/jeps/11)
|
JVM Features
|
||||||
introduced in OpenJDK 19 (JEP 428).
|
============
|
||||||
|
|
||||||
|
Shenandoah: A Low-Pause-Time Garbage Collector
|
||||||
|
==============================================
|
||||||
|
https://openjdk.java.net/jeps/189
|
||||||
|
https://openjdk.java.net/jeps/379
|
||||||
|
|
||||||
|
Add a new garbage collection (GC) algorithm named Shenandoah which
|
||||||
|
reduces GC pause times by doing evacuation work concurrently with the
|
||||||
|
running Java threads. Pause times with Shenandoah are independent of
|
||||||
|
heap size, meaning you will have the same consistent pause times
|
||||||
|
whether your heap is 200 MB or 200 GB.
|
||||||
|
|
||||||
|
Shenandoah has been provided in Red Hat builds of OpenJDK 8 since
|
||||||
|
8u131 in April 2017 and in all 11u builds.
|
||||||
|
|
||||||
|
Upstream, it was introduced in OpenJDK 12 as an experimental feature
|
||||||
|
and became a production feature in OpenJDK 15. It was backported to
|
||||||
|
OpenJDK 11 with the 11.0.9 release in October 2020.
|
||||||
|
|
||||||
|
Abortable Mixed Collections for G1
|
||||||
|
==================================
|
||||||
|
https://openjdk.java.net/jeps/344
|
||||||
|
|
||||||
|
Make G1 mixed collections abortable if they might exceed the pause
|
||||||
|
target.
|
||||||
|
|
||||||
|
Promptly Return Unused Committed Memory from G1
|
||||||
|
===============================================
|
||||||
|
https://openjdk.java.net/jeps/346
|
||||||
|
|
||||||
|
Enhance the G1 garbage collector to automatically return Java heap
|
||||||
|
memory to the operating system when idle.
|
||||||
|
|
||||||
|
Dynamic CDS Archives
|
||||||
|
====================
|
||||||
|
https://openjdk.java.net/jeps/310
|
||||||
|
https://openjdk.java.net/jeps/350
|
||||||
|
|
||||||
|
Extend application class-data sharing to allow the dynamic archiving
|
||||||
|
of classes at the end of Java application execution. The archived
|
||||||
|
classes will include all loaded application classes and library
|
||||||
|
classes that are not present in the default, base-layer CDS archive.
|
||||||
|
|
||||||
|
ZGC: Uncommit Unused Memory (Experimental)
|
||||||
|
==========================================
|
||||||
|
https://openjdk.java.net/jeps/351
|
||||||
|
|
||||||
|
Enhance ZGC to return unused heap memory to the operating system.
|
||||||
|
|
||||||
|
NUMA-Aware Memory Allocation for G1
|
||||||
|
===================================
|
||||||
|
https://openjdk.java.net/jeps/345
|
||||||
|
|
||||||
|
Improve G1 performance on large machines by implementing NUMA-aware
|
||||||
|
memory allocation.
|
||||||
|
|
||||||
|
ZGC on macOS (Experimental)
|
||||||
|
===========================
|
||||||
|
https://openjdk.java.net/jeps/364
|
||||||
|
|
||||||
|
Port the ZGC garbage collector to macOS.
|
||||||
|
|
||||||
|
ZGC on Windows (Experimental)
|
||||||
|
=============================
|
||||||
|
https://openjdk.java.net/jeps/365
|
||||||
|
|
||||||
|
Port the ZGC garbage collector to Windows.
|
||||||
|
|
||||||
|
ZGC: A Scalable Low-Latency Garbage Collector (Production)
|
||||||
|
==========================================================
|
||||||
|
https://openjdk.java.net/jeps/377
|
||||||
|
|
||||||
|
Change the Z Garbage Collector from an experimental feature into a
|
||||||
|
product feature.
|
||||||
|
|
||||||
|
ZGC: Concurrent Thread-Stack Processing
|
||||||
|
=======================================
|
||||||
|
https://openjdk.java.net/jeps/376
|
||||||
|
|
||||||
|
Move ZGC thread-stack processing from safepoints to a concurrent
|
||||||
|
phase.
|
||||||
|
|
||||||
|
Elastic Metaspace
|
||||||
|
=================
|
||||||
|
https://openjdk.java.net/jeps/387
|
||||||
|
|
||||||
|
Return unused HotSpot class-metadata (i.e., metaspace) memory to the
|
||||||
|
operating system more promptly, reduce metaspace footprint, and
|
||||||
|
simplify the metaspace code in order to reduce maintenance costs.
|
||||||
|
|
||||||
Ports
|
Ports
|
||||||
=====
|
=====
|
||||||
|
|
||||||
Linux/RISC-V Port
|
Alpine Linux Port
|
||||||
=================
|
=================
|
||||||
https://openjdk.org/jeps/422
|
https://openjdk.java.net/jeps/386
|
||||||
|
|
||||||
RISC-V is a free and open-source RISC instruction set architecture
|
Port the JDK to Alpine Linux, and to other Linux distributions that
|
||||||
(ISA) designed originally at the University of California, Berkeley,
|
use musl as their primary C library, on both the x64 and AArch64
|
||||||
and now developed collaboratively under the sponsorship of RISC-V
|
architectures,
|
||||||
International. It is already supported by a wide range of language
|
|
||||||
toolchains. With the increasing availability of RISC-V hardware, a
|
Windows/AArch64 Port
|
||||||
port of the JDK would be valuable.
|
====================
|
||||||
|
https://openjdk.java.net/jeps/388
|
||||||
|
|
||||||
|
Port the JDK to Windows/AArch64.
|
||||||
|
|
||||||
|
New macOS Rendering Pipeline
|
||||||
|
============================
|
||||||
|
https://openjdk.java.net/jeps/382
|
||||||
|
|
||||||
|
Implement a Java 2D internal rendering pipeline for macOS using the
|
||||||
|
Apple Metal API as alternative to the existing pipeline, which uses
|
||||||
|
the deprecated Apple OpenGL API.
|
||||||
|
|
||||||
|
macOS/AArch64 Port
|
||||||
|
==================
|
||||||
|
https://openjdk.java.net/jeps/391
|
||||||
|
|
||||||
|
Port the JDK to macOS/AArch64.
|
||||||
|
|
||||||
|
DEPRECATIONS
|
||||||
|
============
|
||||||
|
|
||||||
|
Deprecate the ParallelScavenge + SerialOld GC Combination
|
||||||
|
=========================================================
|
||||||
|
https://openjdk.java.net/jeps/366
|
||||||
|
|
||||||
|
Deprecate the combination of the Parallel Scavenge and Serial Old
|
||||||
|
garbage collection algorithms.
|
||||||
|
|
||||||
|
Deprecate and Disable Biased Locking
|
||||||
|
====================================
|
||||||
|
https://openjdk.java.net/jeps/374
|
||||||
|
|
||||||
|
Disable biased locking by default, and deprecate all related
|
||||||
|
command-line options.
|
||||||
|
|
||||||
|
Warnings for Value-Based Classes
|
||||||
|
================================
|
||||||
|
https://openjdk.java.net/jeps/390
|
||||||
|
|
||||||
|
Designate the primitive wrapper classes as value-based and deprecate
|
||||||
|
their constructors for removal, prompting new deprecation
|
||||||
|
warnings. Provide warnings about improper attempts to synchronize on
|
||||||
|
instances of any value-based classes in the Java Platform.
|
||||||
|
|
||||||
|
Deprecate the Applet API for Removal
|
||||||
|
====================================
|
||||||
|
https://openjdk.java.net/jeps/398
|
||||||
|
|
||||||
|
Deprecate the Applet API for removal. It is essentially irrelevant
|
||||||
|
since all web-browser vendors have either removed support for Java
|
||||||
|
browser plug-ins or announced plans to do so.
|
||||||
|
|
||||||
|
Deprecate the Security Manager for Removal
|
||||||
|
==========================================
|
||||||
|
https://openjdk.java.net/jeps/411
|
||||||
|
|
||||||
|
Deprecate the Security Manager for removal in a future release. The
|
||||||
|
Security Manager dates from Java 1.0. It has not been the primary
|
||||||
|
means of securing client-side Java code for many years, and it has
|
||||||
|
rarely been used to secure server-side code. To move Java forward, we
|
||||||
|
intend to deprecate the Security Manager for removal in concert with
|
||||||
|
the legacy Applet API (see above). .
|
||||||
|
|
||||||
|
REMOVALS
|
||||||
|
========
|
||||||
|
|
||||||
|
Remove the Concurrent Mark Sweep (CMS) Garbage Collector
|
||||||
|
========================================================
|
||||||
|
https://openjdk.java.net/jeps/363
|
||||||
|
|
||||||
|
Remove the Concurrent Mark Sweep (CMS) garbage collector.
|
||||||
|
|
||||||
|
Remove the Pack200 Tools and API
|
||||||
|
================================
|
||||||
|
https://openjdk.java.net/jeps/336
|
||||||
|
https://openjdk.java.net/jeps/367
|
||||||
|
|
||||||
|
Remove the `pack200` and `unpack200` tools, and the `Pack200` API in
|
||||||
|
the `java.util.jar` package. These tools and API were deprecated for
|
||||||
|
removal in OpenJDK 11 with the express intent to remove them in a
|
||||||
|
future release.
|
||||||
|
|
||||||
|
Remove the Nashorn JavaScript Engine
|
||||||
|
====================================
|
||||||
|
https://openjdk.java.net/jeps/372
|
||||||
|
|
||||||
|
Remove the Nashorn JavaScript script engine and APIs, and the `jjs`
|
||||||
|
tool. The engine, the APIs, and the tool were deprecated for removal
|
||||||
|
in OpenJDK 11 with the express intent to remove them in a future
|
||||||
|
release.
|
||||||
|
|
||||||
|
Remove the Solaris and SPARC Ports
|
||||||
|
==================================
|
||||||
|
https://openjdk.java.net/jeps/362
|
||||||
|
https://openjdk.java.net/jeps/381
|
||||||
|
|
||||||
|
Remove the source code and build support for the Solaris/SPARC,
|
||||||
|
Solaris/x64, and Linux/SPARC ports. These ports were deprecated for
|
||||||
|
removal in OpenJDK 14 (JEP 362) and removed in OpenJDK 15 (JEP 381).
|
||||||
|
|
||||||
|
Remove RMI Activation
|
||||||
|
=====================
|
||||||
|
https://openjdk.java.net/jeps/385
|
||||||
|
https://openjdk.java.net/jeps/407
|
||||||
|
https://docs.oracle.com/en/java/javase/14/docs/specs/rmi/activation.html
|
||||||
|
|
||||||
|
Remove the Remote Method Invocation (RMI) Activation mechanism, while
|
||||||
|
preserving the rest of RMI. RMI Activation is an obsolete part of RMI
|
||||||
|
that has been optional since OpenJDK 8 and was deprecated in OpenJDK
|
||||||
|
15.
|
||||||
|
|
||||||
|
Remove the Experimental AOT and JIT Compiler
|
||||||
|
============================================
|
||||||
|
https://openjdk.java.net/jeps/410
|
||||||
|
|
||||||
|
Remove the experimental Java-based ahead-of-time (AOT) and
|
||||||
|
just-in-time (JIT) compiler. This compiler has seen little use since
|
||||||
|
its introduction and the effort required to maintain it is
|
||||||
|
significant. Retain the experimental Java-level JVM compiler
|
||||||
|
interface (JVMCI) so that developers can continue to use
|
||||||
|
externally-built versions of the compiler for JIT compilation.
|
||||||
|
@ -1,20 +1,3 @@
|
|||||||
/* 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;
|
||||||
@ -26,24 +9,9 @@ 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);
|
||||||
@ -53,7 +21,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(MSG_PREFIX + sKey + " = " + jdkSecVal + " as expected.");
|
System.out.println("DEBUG: " + sKey + " = " + jdkSecVal + " as expected.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.out.println("TestSecurityProperties PASSED!");
|
System.out.println("TestSecurityProperties PASSED!");
|
||||||
@ -61,24 +29,15 @@ 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(MSG_PREFIX + "Java version is " + javaVersion);
|
System.out.println("Debug: 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(propsFile)) {
|
try (FileInputStream fin = new FileInputStream(new File(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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
/* 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.util.Arrays;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.ResourceBundle;
|
|
||||||
|
|
||||||
import sun.util.resources.LocaleData;
|
|
||||||
import sun.util.locale.provider.LocaleProviderAdapter;
|
|
||||||
|
|
||||||
public class TestTranslations {
|
|
||||||
public static void main(String[] args) {
|
|
||||||
for (String zone : args) {
|
|
||||||
System.out.printf("Translations for %s\n", zone);
|
|
||||||
for (Locale l : Locale.getAvailableLocales()) {
|
|
||||||
ResourceBundle bundle = new LocaleData(LocaleProviderAdapter.Type.JRE).getTimeZoneNames(l);
|
|
||||||
System.out.printf("Locale: %s, language: %s, translations: %s\n", l, l.getDisplayLanguage(), Arrays.toString(bundle.getStringArray(zone)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load Diff
@ -8,8 +8,8 @@
|
|||||||
#
|
#
|
||||||
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
||||||
# PROJECT_NAME=openjdk
|
# PROJECT_NAME=openjdk
|
||||||
# REPO_NAME=jdk18u
|
# REPO_NAME=jdk16
|
||||||
# VERSION=jdk-18.0.1+10
|
# VERSION=HEAD
|
||||||
# or to eg prepare systemtap:
|
# or to eg prepare systemtap:
|
||||||
# icedtea7's jstack and other tapsets
|
# icedtea7's jstack and other tapsets
|
||||||
# VERSION=6327cf1cea9e
|
# VERSION=6327cf1cea9e
|
||||||
@ -37,8 +37,6 @@ set -e
|
|||||||
|
|
||||||
OPENJDK_URL_DEFAULT=https://github.com
|
OPENJDK_URL_DEFAULT=https://github.com
|
||||||
COMPRESSION_DEFAULT=xz
|
COMPRESSION_DEFAULT=xz
|
||||||
# Corresponding IcedTea version
|
|
||||||
ICEDTEA_VERSION=13.0
|
|
||||||
|
|
||||||
if [ "x$1" = "xhelp" ] ; then
|
if [ "x$1" = "xhelp" ] ; then
|
||||||
echo -e "Behaviour may be specified by setting the following variables:\n"
|
echo -e "Behaviour may be specified by setting the following variables:\n"
|
||||||
@ -128,10 +126,11 @@ pushd "${FILE_NAME_ROOT}"
|
|||||||
|
|
||||||
echo "Syncing EC list with NSS"
|
echo "Syncing EC list with NSS"
|
||||||
if [ "x$PR3823" = "x" ] ; then
|
if [ "x$PR3823" = "x" ] ; then
|
||||||
# get PR3823.patch (from https://github.com/icedtea-git/icedtea) in the ${ICEDTEA_VERSION} branch
|
# originally for 8:
|
||||||
# Do not push it or publish it
|
# get PR3823.patch (from http://icedtea.classpath.org/hg/icedtea16) from most correct tag
|
||||||
|
# Do not push it or publish it (see https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3823)
|
||||||
echo "PR3823 not found. Downloading..."
|
echo "PR3823 not found. Downloading..."
|
||||||
wget -v https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/pr3823.patch
|
wget https://icedtea.classpath.org/hg/icedtea16/raw-file/tip/patches/pr3823.patch
|
||||||
echo "Applying ${PWD}/pr3823.patch"
|
echo "Applying ${PWD}/pr3823.patch"
|
||||||
patch -Np1 < pr3823.patch
|
patch -Np1 < pr3823.patch
|
||||||
rm pr3823.patch
|
rm pr3823.patch
|
||||||
@ -143,14 +142,6 @@ pushd "${FILE_NAME_ROOT}"
|
|||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Generate .src-rev so build has knowledge of the revision the tarball was created from
|
|
||||||
mkdir build
|
|
||||||
pushd build
|
|
||||||
sh ${PWD}/../openjdk/configure
|
|
||||||
make store-source-revision
|
|
||||||
popd
|
|
||||||
rm -rf build
|
|
||||||
|
|
||||||
echo "Compressing remaining forest"
|
echo "Compressing remaining forest"
|
||||||
if [ "X$COMPRESSION" = "Xxz" ] ; then
|
if [ "X$COMPRESSION" = "Xxz" ] ; then
|
||||||
SWITCH=cJf
|
SWITCH=cJf
|
||||||
@ -161,3 +152,5 @@ pushd "${FILE_NAME_ROOT}"
|
|||||||
mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
|
mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
|
||||||
popd
|
popd
|
||||||
echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
|
echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
|
||||||
|
|
||||||
|
|
||||||
|
177
icedtea_sync.sh
177
icedtea_sync.sh
@ -16,31 +16,12 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
ICEDTEA_USE_VCS=true
|
|
||||||
|
|
||||||
ICEDTEA_VERSION=3.15.0
|
ICEDTEA_VERSION=3.15.0
|
||||||
ICEDTEA_URL=https://icedtea.classpath.org/download/source
|
ICEDTEA_URL=https://icedtea.classpath.org/download/source
|
||||||
ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
|
ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
|
||||||
|
|
||||||
ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
RPM_DIR=${PWD}
|
|
||||||
if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
|
|
||||||
echo "Not in RPM source tree.";
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${TMPDIR}" = "x"; then
|
|
||||||
TMPDIR=/tmp;
|
|
||||||
fi
|
|
||||||
WORKDIR=${TMPDIR}/it.sync
|
|
||||||
|
|
||||||
echo "Using working directory ${WORKDIR}"
|
|
||||||
mkdir ${WORKDIR}
|
|
||||||
pushd ${WORKDIR}
|
|
||||||
|
|
||||||
if test "x${WGET}" = "x"; then
|
if test "x${WGET}" = "x"; then
|
||||||
WGET=$(which wget);
|
WGET=$(which wget);
|
||||||
if test "x${WGET}" = "x"; then
|
if test "x${WGET}" = "x"; then
|
||||||
@ -49,144 +30,68 @@ if test "x${WGET}" = "x"; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "x${CHECKSUM}" = "x"; then
|
||||||
|
CHECKSUM=$(which sha256sum)
|
||||||
|
if test "x${CHECKSUM}" = "x"; then
|
||||||
|
echo "sha256sum not found";
|
||||||
|
exit 2;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${PGP}" = "x"; then
|
||||||
|
PGP=$(which gpg)
|
||||||
|
if test "x${PGP}" = "x"; then
|
||||||
|
echo "gpg not found";
|
||||||
|
exit 3;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x${TAR}" = "x"; then
|
if test "x${TAR}" = "x"; then
|
||||||
TAR=$(which tar)
|
TAR=$(which tar)
|
||||||
if test "x${TAR}" = "x"; then
|
if test "x${TAR}" = "x"; then
|
||||||
echo "tar not found";
|
echo "tar not found";
|
||||||
exit 2;
|
exit 4;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Dependencies:";
|
echo "Dependencies:";
|
||||||
echo -e "\tWGET: ${WGET}";
|
echo -e "\tWGET: ${WGET}";
|
||||||
|
echo -e "\tCHECKSUM: ${CHECKSUM}";
|
||||||
|
echo -e "\tPGP: ${PGP}\n";
|
||||||
echo -e "\tTAR: ${TAR}\n";
|
echo -e "\tTAR: ${TAR}\n";
|
||||||
|
|
||||||
if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
|
echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
|
||||||
echo "Mode: Using VCS";
|
if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
|
||||||
|
echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
|
||||||
|
exit 5;
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x${GREP}" = "x"; then
|
echo "Downloading IcedTea release tarball...";
|
||||||
GREP=$(which grep);
|
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
|
||||||
if test "x${GREP}" = "x"; then
|
echo "Downloading IcedTea tarball signature...";
|
||||||
echo "grep not found";
|
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||||
exit 3;
|
echo "Downloading IcedTea tarball checksums...";
|
||||||
fi
|
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${CUT}" = "x"; then
|
echo "Verifying checksums...";
|
||||||
CUT=$(which cut);
|
${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
|
||||||
if test "x${CUT}" = "x"; then
|
|
||||||
echo "cut not found";
|
|
||||||
exit 4;
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${TR}" = "x"; then
|
echo "Checking signature...";
|
||||||
TR=$(which tr);
|
${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||||
if test "x${TR}" = "x"; then
|
|
||||||
echo "tr not found";
|
|
||||||
exit 5;
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${HG}" = "x"; then
|
echo "Extracting files...";
|
||||||
HG=$(which hg);
|
${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
|
||||||
if test "x${HG}" = "x"; then
|
|
||||||
echo "hg not found";
|
|
||||||
exit 6;
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Dependencies:";
|
|
||||||
echo -e "\tGREP: ${GREP}";
|
|
||||||
echo -e "\tCUT: ${CUT}";
|
|
||||||
echo -e "\tTR: ${TR}";
|
|
||||||
echo -e "\tHG: ${HG}";
|
|
||||||
|
|
||||||
echo "Checking out repository from VCS...";
|
|
||||||
${HG} clone ${ICEDTEA_HG_URL} icedtea
|
|
||||||
|
|
||||||
echo "Obtaining version from configure.ac...";
|
|
||||||
ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
|
|
||||||
echo "Root version from configure: ${ROOT_VER}";
|
|
||||||
|
|
||||||
VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
|
|
||||||
echo "VCS revision: ${VCS_REV}";
|
|
||||||
|
|
||||||
ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
|
|
||||||
echo "Creating icedtea-${ICEDTEA_VERSION}";
|
|
||||||
mkdir icedtea-${ICEDTEA_VERSION}
|
|
||||||
echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
|
|
||||||
# Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
|
|
||||||
#cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
|
|
||||||
cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
|
|
||||||
cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
|
|
||||||
|
|
||||||
rm -rf icedtea
|
|
||||||
else
|
|
||||||
echo "Mode: Using tarball";
|
|
||||||
|
|
||||||
if test "x${ICEDTEA_VERSION}" = "x"; then
|
|
||||||
echo "No IcedTea version specified for tarball download.";
|
|
||||||
exit 3;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${CHECKSUM}" = "x"; then
|
|
||||||
CHECKSUM=$(which sha256sum)
|
|
||||||
if test "x${CHECKSUM}" = "x"; then
|
|
||||||
echo "sha256sum not found";
|
|
||||||
exit 4;
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${PGP}" = "x"; then
|
|
||||||
PGP=$(which gpg)
|
|
||||||
if test "x${PGP}" = "x"; then
|
|
||||||
echo "gpg not found";
|
|
||||||
exit 5;
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Dependencies:";
|
|
||||||
echo -e "\tCHECKSUM: ${CHECKSUM}";
|
|
||||||
echo -e "\tPGP: ${PGP}\n";
|
|
||||||
|
|
||||||
echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
|
|
||||||
if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
|
|
||||||
echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
|
|
||||||
exit 6;
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Downloading IcedTea release tarball...";
|
|
||||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
|
|
||||||
echo "Downloading IcedTea tarball signature...";
|
|
||||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
|
||||||
echo "Downloading IcedTea tarball checksums...";
|
|
||||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
|
|
||||||
|
|
||||||
echo "Verifying checksums...";
|
|
||||||
${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
|
|
||||||
|
|
||||||
echo "Checking signature...";
|
|
||||||
${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
|
||||||
|
|
||||||
echo "Extracting files...";
|
|
||||||
${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
|
|
||||||
icedtea-${ICEDTEA_VERSION}/tapset \
|
icedtea-${ICEDTEA_VERSION}/tapset \
|
||||||
icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
|
icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
|
||||||
|
|
||||||
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
|
|
||||||
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
|
||||||
rm -vf icedtea-${ICEDTEA_VERSION}.sha256
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Replacing desktop files...";
|
echo "Replacing desktop files...";
|
||||||
mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
|
mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in .
|
||||||
|
|
||||||
echo "Creating new tapset tarball...";
|
echo "Creating new tapset tarball...";
|
||||||
mv -v icedtea-${ICEDTEA_VERSION} openjdk
|
mv -v icedtea-${ICEDTEA_VERSION} openjdk
|
||||||
${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
|
${TAR} cJf tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
|
||||||
|
|
||||||
rm -rvf openjdk
|
rm -rvf openjdk
|
||||||
|
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
|
||||||
popd
|
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||||
rm -rf ${WORKDIR}
|
rm -vf icedtea-${ICEDTEA_VERSION}.sha256
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,8 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
|
Name=OpenJDK @JAVA_MAJOR_VERSION@ Monitoring & Management Console @ARCH@
|
||||||
Comment=Monitor and manage OpenJDK applications
|
Comment=Monitor and manage OpenJDK @JAVA_MAJOR_VERSION@ applications for @ARCH@
|
||||||
Exec=_SDKBINDIR_/jconsole
|
Exec=@JAVA_HOME@/jconsole
|
||||||
Icon=java-@JAVA_VER@-@JAVA_VENDOR@
|
Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
StartupWMClass=sun-tools-jconsole-JConsole
|
StartupWMClass=sun-tools-jconsole-JConsole
|
||||||
|
@ -1,132 +0,0 @@
|
|||||||
diff --git a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
|
|
||||||
index 8759aab3995..11ccbf73839 100644
|
|
||||||
--- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
|
|
||||||
+++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
|
|
||||||
@@ -847,6 +847,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Kirov", new String[] {"Kirov Standard Time", "GMT+03:00",
|
|
||||||
"Kirov Daylight Time", "GMT+03:00",
|
|
||||||
"Kirov Time", "GMT+03:00"}},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
|
|
||||||
index f007c1a8d3b..617268e4cf3 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
|
|
||||||
index 386414e16e6..14c5d89b9c5 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
|
|
||||||
index d23f5fd49e6..44117125619 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
|
|
||||||
index b4f57d4568c..efa818f3865 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
|
|
||||||
index 1a10a9f96dc..7c0565461ad 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
|
|
||||||
index 9a2d9e5c57c..8a2c805997f 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
|
|
||||||
index de5e5c82daa..e3c06417f09 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
|
|
||||||
index b53de4d8c89..3e46b6a063e 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
|
|
||||||
index 7797cda19d5..590908409a8 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
|
|
||||||
@@ -825,6 +825,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
||||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
|
|
||||||
index 2cd10554853..23c5f180b6d 100644
|
|
||||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
|
|
||||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
|
|
||||||
@@ -827,6 +827,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
|
|
||||||
{"Europe/Jersey", GMTBST},
|
|
||||||
{"Europe/Kaliningrad", EET},
|
|
||||||
{"Europe/Kiev", EET},
|
|
||||||
+ {"Europe/Kyiv", EET},
|
|
||||||
{"Europe/Lisbon", WET},
|
|
||||||
{"Europe/Ljubljana", CET},
|
|
||||||
{"Europe/London", GMTBST},
|
|
@ -4,5 +4,3 @@ nssSecmodDirectory = sql:/etc/pki/nssdb
|
|||||||
nssDbMode = readOnly
|
nssDbMode = readOnly
|
||||||
nssModule = fips
|
nssModule = fips
|
||||||
|
|
||||||
attributes(*,CKO_SECRET_KEY,CKK_GENERIC_SECRET)={ CKA_SIGN=true }
|
|
||||||
|
|
||||||
|
@ -1,76 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Copyright (C) 2022 Red Hat, Inc.
|
|
||||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>, 2012-2022
|
|
||||||
#
|
|
||||||
# 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/>.
|
|
||||||
|
|
||||||
OLD_RELEASE=$1
|
|
||||||
NEW_RELEASE=$2
|
|
||||||
SUBDIR=$3
|
|
||||||
REPO=$4
|
|
||||||
SCRIPT_DIR=$(dirname ${0})
|
|
||||||
|
|
||||||
if test "x${SUBDIR}" = "x"; then
|
|
||||||
echo "No subdirectory specified; using .";
|
|
||||||
SUBDIR=".";
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$REPO" = "x"; then
|
|
||||||
echo "No repository specified; using ${PWD}"
|
|
||||||
REPO=${PWD}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x${TMPDIR} = x; then
|
|
||||||
TMPDIR=/tmp;
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Repository: ${REPO}"
|
|
||||||
|
|
||||||
if [ -e ${REPO}/.git ] ; then
|
|
||||||
TYPE=git;
|
|
||||||
elif [ -e ${REPO}/.hg ] ; then
|
|
||||||
TYPE=hg;
|
|
||||||
else
|
|
||||||
echo "No Mercurial or Git repository detected.";
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$OLD_RELEASE" = "x" || test "x$NEW_RELEASE" = "x"; then
|
|
||||||
echo "ERROR: Need to specify old and new release";
|
|
||||||
exit 2;
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
|
|
||||||
rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 ${TMPDIR}/fixes
|
|
||||||
for repos in . $(${SCRIPT_DIR}/discover_trees.sh ${REPO});
|
|
||||||
do
|
|
||||||
if test "x$TYPE" = "xhg"; then
|
|
||||||
hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
|
|
||||||
egrep '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])# - JDK-\1#'| \
|
|
||||||
sed 's#^[o:| ]*summary:\W*# - #' >> ${TMPDIR}/fixes2;
|
|
||||||
hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
|
|
||||||
egrep '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})# - JDK-\1#' >> ${TMPDIR}/fixes3;
|
|
||||||
else
|
|
||||||
git -C ${REPO} log --no-merges --pretty=format:%B ${NEW_RELEASE}...${OLD_RELEASE} -- ${SUBDIR} |egrep '^[0-9]{7}' | \
|
|
||||||
sed -r 's#^([0-9])# - JDK-\1#' >> ${TMPDIR}/fixes2;
|
|
||||||
touch ${TMPDIR}/fixes3 ; # unused
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
sort ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 | uniq > ${TMPDIR}/fixes
|
|
||||||
rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3
|
|
||||||
|
|
||||||
echo "In ${TMPDIR}/fixes:"
|
|
||||||
cat ${TMPDIR}/fixes
|
|
@ -0,0 +1,88 @@
|
|||||||
|
|
||||||
|
# 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.
|
||||||
|
#
|
78
pr3695-toggle_system_crypto_policy.patch
Normal file
78
pr3695-toggle_system_crypto_policy.patch
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
# 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) {
|
@ -1,6 +1,6 @@
|
|||||||
diff --git openjdk.orig/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
|
diff --git openjdk/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
|
||||||
index 68a9c1a2d08..7aa25eb2cb7 100644
|
index 534bdae5a16..2df2b59cbf6 100644
|
||||||
--- openjdk.orig/src/java.base/share/conf/security/java.security
|
--- openjdk/src/java.base/share/conf/security/java.security
|
||||||
+++ openjdk/src/java.base/share/conf/security/java.security
|
+++ openjdk/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
|
||||||
@ -9,4 +9,4 @@ index 68a9c1a2d08..7aa25eb2cb7 100644
|
|||||||
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
||||||
|
|
||||||
#
|
#
|
||||||
# Security providers used when FIPS mode support is active
|
# A list of preferred providers for specific algorithms. These providers will
|
||||||
|
205
rh1655466-global_crypto_and_fips.patch
Normal file
205
rh1655466-global_crypto_and_fips.patch
Normal file
@ -0,0 +1,205 @@
|
|||||||
|
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,15 +1,13 @@
|
|||||||
diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
--- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java 2013-03-01 10:48:12.038189968 +0100
|
||||||
index bacff32efbc..ff7b3dcc81c 100644
|
+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java 2013-03-01 10:48:11.913188505 +0100
|
||||||
--- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
@@ -48,8 +48,8 @@
|
||||||
+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
|
||||||
@@ -46,8 +46,8 @@ class PlatformPCSC {
|
|
||||||
|
|
||||||
private static final String PROP_NAME = "sun.security.smartcardio.library";
|
private final static String PROP_NAME = "sun.security.smartcardio.library";
|
||||||
|
|
||||||
- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
|
- private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so";
|
||||||
- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
|
- private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
|
||||||
+ private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
|
+ private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
|
||||||
+ private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
|
+ private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
|
||||||
private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
|
private final static String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
|
||||||
|
|
||||||
PlatformPCSC() {
|
PlatformPCSC() {
|
||||||
|
52
rh1818909-fips_default_keystore_type.patch
Normal file
52
rh1818909-fips_default_keystore_type.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
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
|
318
rh1860986-disable_tlsv1.3_in_fips_mode.patch
Normal file
318
rh1860986-disable_tlsv1.3_in_fips_mode.patch
Normal file
@ -0,0 +1,318 @@
|
|||||||
|
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);
|
70
rh1915071-always_initialise_configurator_access.patch
Normal file
70
rh1915071-always_initialise_configurator_access.patch
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
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
|
69
rh1929465-dont_define_unused_throwioexception.patch
Normal file
69
rh1929465-dont_define_unused_throwioexception.patch
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
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);
|
||||||
|
- }
|
||||||
|
-}
|
428
rh1929465-improve_system_FIPS_detection.patch
Normal file
428
rh1929465-improve_system_FIPS_detection.patch
Normal file
@ -0,0 +1,428 @@
|
|||||||
|
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;
|
||||||
|
}
|
579
rh1991003-enable_fips_keys_import.patch
Normal file
579
rh1991003-enable_fips_keys_import.patch
Normal file
@ -0,0 +1,579 @@
|
|||||||
|
commit abcd0954643eddbf826d96291d44a143038ab750
|
||||||
|
Author: Martin Balao <mbalao@redhat.com>
|
||||||
|
Date: Sun Oct 10 18:14:01 2021 +0100
|
||||||
|
|
||||||
|
RH1991003: Enable the import of plain keys into the NSS software token.
|
||||||
|
|
||||||
|
This can be individually disabled using -Dcom.redhat.fips.plainKeySupport=false
|
||||||
|
|
||||||
|
diff --git openjdk.orig/src/java.base/share/classes/java/security/Security.java openjdk/src/java.base/share/classes/java/security/Security.java
|
||||||
|
index ce32c939253..dc7020ce668 100644
|
||||||
|
--- openjdk.orig/src/java.base/share/classes/java/security/Security.java
|
||||||
|
+++ openjdk/src/java.base/share/classes/java/security/Security.java
|
||||||
|
@@ -82,6 +82,10 @@ public final class Security {
|
||||||
|
public boolean isSystemFipsEnabled() {
|
||||||
|
return SystemConfigurator.isSystemFipsEnabled();
|
||||||
|
}
|
||||||
|
+ @Override
|
||||||
|
+ public boolean isPlainKeySupportEnabled() {
|
||||||
|
+ return SystemConfigurator.isPlainKeySupportEnabled();
|
||||||
|
+ }
|
||||||
|
});
|
||||||
|
|
||||||
|
// doPrivileged here because there are multiple
|
||||||
|
diff --git openjdk.orig/src/java.base/share/classes/java/security/SystemConfigurator.java openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
||||||
|
index 6aa1419dfd0..ecab722848e 100644
|
||||||
|
--- openjdk.orig/src/java.base/share/classes/java/security/SystemConfigurator.java
|
||||||
|
+++ openjdk/src/java.base/share/classes/java/security/SystemConfigurator.java
|
||||||
|
@@ -55,6 +55,7 @@ final class SystemConfigurator {
|
||||||
|
CRYPTO_POLICIES_BASE_DIR + "/back-ends/java.config";
|
||||||
|
|
||||||
|
private static boolean systemFipsEnabled = false;
|
||||||
|
+ private static boolean plainKeySupportEnabled = false;
|
||||||
|
|
||||||
|
private static final String SYSTEMCONF_NATIVE_LIB = "systemconf";
|
||||||
|
|
||||||
|
@@ -150,6 +151,16 @@ final class SystemConfigurator {
|
||||||
|
}
|
||||||
|
loadedProps = true;
|
||||||
|
systemFipsEnabled = true;
|
||||||
|
+ String plainKeySupport = System.getProperty("com.redhat.fips.plainKeySupport",
|
||||||
|
+ "true");
|
||||||
|
+ plainKeySupportEnabled = !"false".equals(plainKeySupport);
|
||||||
|
+ if (sdebug != null) {
|
||||||
|
+ if (plainKeySupportEnabled) {
|
||||||
|
+ sdebug.println("FIPS support enabled with plain key support");
|
||||||
|
+ } else {
|
||||||
|
+ sdebug.println("FIPS support enabled without plain key support");
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
if (sdebug != null) {
|
||||||
|
@@ -177,6 +188,19 @@ final class SystemConfigurator {
|
||||||
|
return systemFipsEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /**
|
||||||
|
+ * Returns {@code true} if system FIPS alignment is enabled
|
||||||
|
+ * and plain key support is allowed. Plain key support is
|
||||||
|
+ * enabled by default but can be disabled with
|
||||||
|
+ * {@code -Dcom.redhat.fips.plainKeySupport=false}.
|
||||||
|
+ *
|
||||||
|
+ * @return a boolean indicating whether plain key support
|
||||||
|
+ * should be enabled.
|
||||||
|
+ */
|
||||||
|
+ static boolean isPlainKeySupportEnabled() {
|
||||||
|
+ return plainKeySupportEnabled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* OpenJDK FIPS mode will be enabled only if the com.redhat.fips
|
||||||
|
* system property is true (default) and the system is in FIPS mode.
|
||||||
|
diff --git openjdk.orig/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java openjdk/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
|
||||||
|
index a31e93ec02e..3f3caac64dc 100644
|
||||||
|
--- openjdk.orig/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
|
||||||
|
+++ openjdk/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
|
||||||
|
@@ -27,4 +27,5 @@ package jdk.internal.access;
|
||||||
|
|
||||||
|
public interface JavaSecuritySystemConfiguratorAccess {
|
||||||
|
boolean isSystemFipsEnabled();
|
||||||
|
+ boolean isPlainKeySupportEnabled();
|
||||||
|
}
|
||||||
|
diff --git openjdk.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..bee3a1e1537
|
||||||
|
--- /dev/null
|
||||||
|
+++ openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
|
||||||
|
@@ -0,0 +1,291 @@
|
||||||
|
+/*
|
||||||
|
+ * 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.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+package sun.security.pkcs11;
|
||||||
|
+
|
||||||
|
+import java.math.BigInteger;
|
||||||
|
+import java.security.KeyFactory;
|
||||||
|
+import java.security.Provider;
|
||||||
|
+import java.security.Security;
|
||||||
|
+import java.util.HashMap;
|
||||||
|
+import java.util.Map;
|
||||||
|
+import java.util.concurrent.locks.ReentrantLock;
|
||||||
|
+
|
||||||
|
+import javax.crypto.Cipher;
|
||||||
|
+import javax.crypto.spec.DHPrivateKeySpec;
|
||||||
|
+import javax.crypto.spec.IvParameterSpec;
|
||||||
|
+
|
||||||
|
+import sun.security.jca.JCAUtil;
|
||||||
|
+import sun.security.pkcs11.TemplateManager;
|
||||||
|
+import sun.security.pkcs11.wrapper.CK_ATTRIBUTE;
|
||||||
|
+import sun.security.pkcs11.wrapper.CK_MECHANISM;
|
||||||
|
+import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
|
||||||
|
+import static sun.security.pkcs11.wrapper.PKCS11Exception.*;
|
||||||
|
+import sun.security.pkcs11.wrapper.PKCS11Exception;
|
||||||
|
+import sun.security.rsa.RSAUtil.KeyType;
|
||||||
|
+import sun.security.util.Debug;
|
||||||
|
+import sun.security.util.ECUtil;
|
||||||
|
+
|
||||||
|
+final class FIPSKeyImporter {
|
||||||
|
+
|
||||||
|
+ private static final Debug debug =
|
||||||
|
+ Debug.getInstance("sunpkcs11");
|
||||||
|
+
|
||||||
|
+ private static P11Key importerKey = null;
|
||||||
|
+ private static final ReentrantLock importerKeyLock = new ReentrantLock();
|
||||||
|
+ private static CK_MECHANISM importerKeyMechanism = null;
|
||||||
|
+ private static Cipher importerCipher = null;
|
||||||
|
+
|
||||||
|
+ private static Provider sunECProvider = null;
|
||||||
|
+ private static final ReentrantLock sunECProviderLock = new ReentrantLock();
|
||||||
|
+
|
||||||
|
+ private static KeyFactory DHKF = null;
|
||||||
|
+ private static final ReentrantLock DHKFLock = new ReentrantLock();
|
||||||
|
+
|
||||||
|
+ static Long importKey(SunPKCS11 sunPKCS11, long hSession, CK_ATTRIBUTE[] attributes)
|
||||||
|
+ throws PKCS11Exception {
|
||||||
|
+ long keyID = -1;
|
||||||
|
+ Token token = sunPKCS11.getToken();
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Private or Secret key will be imported in" +
|
||||||
|
+ " system FIPS mode.");
|
||||||
|
+ }
|
||||||
|
+ if (importerKey == null) {
|
||||||
|
+ importerKeyLock.lock();
|
||||||
|
+ try {
|
||||||
|
+ if (importerKey == null) {
|
||||||
|
+ if (importerKeyMechanism == null) {
|
||||||
|
+ // Importer Key creation has not been tried yet. Try it.
|
||||||
|
+ createImporterKey(token);
|
||||||
|
+ }
|
||||||
|
+ if (importerKey == null || importerCipher == null) {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Importer Key could not be" +
|
||||||
|
+ " generated.");
|
||||||
|
+ }
|
||||||
|
+ throw new PKCS11Exception(CKR_GENERAL_ERROR);
|
||||||
|
+ }
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Importer Key successfully" +
|
||||||
|
+ " generated.");
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ } finally {
|
||||||
|
+ importerKeyLock.unlock();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ long importerKeyID = importerKey.getKeyID();
|
||||||
|
+ try {
|
||||||
|
+ byte[] keyBytes = null;
|
||||||
|
+ byte[] encKeyBytes = null;
|
||||||
|
+ long keyClass = 0L;
|
||||||
|
+ long keyType = 0L;
|
||||||
|
+ Map<Long, CK_ATTRIBUTE> attrsMap = new HashMap<>();
|
||||||
|
+ for (CK_ATTRIBUTE attr : attributes) {
|
||||||
|
+ if (attr.type == CKA_CLASS) {
|
||||||
|
+ keyClass = attr.getLong();
|
||||||
|
+ } else if (attr.type == CKA_KEY_TYPE) {
|
||||||
|
+ keyType = attr.getLong();
|
||||||
|
+ }
|
||||||
|
+ attrsMap.put(attr.type, attr);
|
||||||
|
+ }
|
||||||
|
+ BigInteger v = null;
|
||||||
|
+ if (keyClass == CKO_PRIVATE_KEY) {
|
||||||
|
+ if (keyType == CKK_RSA) {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Importing an RSA private key...");
|
||||||
|
+ }
|
||||||
|
+ keyBytes = sun.security.rsa.RSAPrivateCrtKeyImpl.newKey(
|
||||||
|
+ KeyType.RSA,
|
||||||
|
+ null,
|
||||||
|
+ ((v = attrsMap.get(CKA_MODULUS).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_PUBLIC_EXPONENT).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_PRIVATE_EXPONENT).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_PRIME_1).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_PRIME_2).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_EXPONENT_1).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_EXPONENT_2).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_COEFFICIENT).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO
|
||||||
|
+ ).getEncoded();
|
||||||
|
+ } else if (keyType == CKK_DSA) {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Importing a DSA private key...");
|
||||||
|
+ }
|
||||||
|
+ keyBytes = new sun.security.provider.DSAPrivateKey(
|
||||||
|
+ ((v = attrsMap.get(CKA_VALUE).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_PRIME).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_SUBPRIME).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_BASE).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO
|
||||||
|
+ ).getEncoded();
|
||||||
|
+ if (token.config.getNssNetscapeDbWorkaround() &&
|
||||||
|
+ attrsMap.get(CKA_NETSCAPE_DB) == null) {
|
||||||
|
+ attrsMap.put(CKA_NETSCAPE_DB,
|
||||||
|
+ new CK_ATTRIBUTE(CKA_NETSCAPE_DB, BigInteger.ZERO));
|
||||||
|
+ }
|
||||||
|
+ } else if (keyType == CKK_EC) {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Importing an EC private key...");
|
||||||
|
+ }
|
||||||
|
+ if (sunECProvider == null) {
|
||||||
|
+ sunECProviderLock.lock();
|
||||||
|
+ try {
|
||||||
|
+ if (sunECProvider == null) {
|
||||||
|
+ sunECProvider = Security.getProvider("SunEC");
|
||||||
|
+ }
|
||||||
|
+ } finally {
|
||||||
|
+ sunECProviderLock.unlock();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ keyBytes = ECUtil.generateECPrivateKey(
|
||||||
|
+ ((v = attrsMap.get(CKA_VALUE).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ECUtil.getECParameterSpec(sunECProvider,
|
||||||
|
+ attrsMap.get(CKA_EC_PARAMS).getByteArray()))
|
||||||
|
+ .getEncoded();
|
||||||
|
+ if (token.config.getNssNetscapeDbWorkaround() &&
|
||||||
|
+ attrsMap.get(CKA_NETSCAPE_DB) == null) {
|
||||||
|
+ attrsMap.put(CKA_NETSCAPE_DB,
|
||||||
|
+ new CK_ATTRIBUTE(CKA_NETSCAPE_DB, BigInteger.ZERO));
|
||||||
|
+ }
|
||||||
|
+ } else if (keyType == CKK_DH) {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Importing a Diffie-Hellman private key...");
|
||||||
|
+ }
|
||||||
|
+ if (DHKF == null) {
|
||||||
|
+ DHKFLock.lock();
|
||||||
|
+ try {
|
||||||
|
+ if (DHKF == null) {
|
||||||
|
+ DHKF = KeyFactory.getInstance(
|
||||||
|
+ "DH", P11Util.getSunJceProvider());
|
||||||
|
+ }
|
||||||
|
+ } finally {
|
||||||
|
+ DHKFLock.unlock();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ DHPrivateKeySpec spec = new DHPrivateKeySpec
|
||||||
|
+ (((v = attrsMap.get(CKA_VALUE).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_PRIME).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO,
|
||||||
|
+ ((v = attrsMap.get(CKA_BASE).getBigInteger()) != null)
|
||||||
|
+ ? v : BigInteger.ZERO);
|
||||||
|
+ keyBytes = DHKF.generatePrivate(spec).getEncoded();
|
||||||
|
+ if (token.config.getNssNetscapeDbWorkaround() &&
|
||||||
|
+ attrsMap.get(CKA_NETSCAPE_DB) == null) {
|
||||||
|
+ attrsMap.put(CKA_NETSCAPE_DB,
|
||||||
|
+ new CK_ATTRIBUTE(CKA_NETSCAPE_DB, BigInteger.ZERO));
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Unrecognized private key type.");
|
||||||
|
+ }
|
||||||
|
+ throw new PKCS11Exception(CKR_GENERAL_ERROR);
|
||||||
|
+ }
|
||||||
|
+ } else if (keyClass == CKO_SECRET_KEY) {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Importing a secret key...");
|
||||||
|
+ }
|
||||||
|
+ keyBytes = attrsMap.get(CKA_VALUE).getByteArray();
|
||||||
|
+ }
|
||||||
|
+ if (keyBytes == null || keyBytes.length == 0) {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Private or secret key plain bytes could" +
|
||||||
|
+ " not be obtained. Import failed.");
|
||||||
|
+ }
|
||||||
|
+ throw new PKCS11Exception(CKR_GENERAL_ERROR);
|
||||||
|
+ }
|
||||||
|
+ importerCipher.init(Cipher.ENCRYPT_MODE, importerKey,
|
||||||
|
+ new IvParameterSpec((byte[])importerKeyMechanism.pParameter),
|
||||||
|
+ null);
|
||||||
|
+ attributes = new CK_ATTRIBUTE[attrsMap.size()];
|
||||||
|
+ attrsMap.values().toArray(attributes);
|
||||||
|
+ encKeyBytes = importerCipher.doFinal(keyBytes);
|
||||||
|
+ attributes = token.getAttributes(TemplateManager.O_IMPORT,
|
||||||
|
+ keyClass, keyType, attributes);
|
||||||
|
+ keyID = token.p11.C_UnwrapKey(hSession,
|
||||||
|
+ importerKeyMechanism, importerKeyID, encKeyBytes, attributes);
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Imported key ID: " + keyID);
|
||||||
|
+ }
|
||||||
|
+ } catch (Throwable t) {
|
||||||
|
+ throw new PKCS11Exception(CKR_GENERAL_ERROR);
|
||||||
|
+ } finally {
|
||||||
|
+ importerKey.releaseKeyID();
|
||||||
|
+ }
|
||||||
|
+ return Long.valueOf(keyID);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private static void createImporterKey(Token token) {
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Generating Importer Key...");
|
||||||
|
+ }
|
||||||
|
+ byte[] iv = new byte[16];
|
||||||
|
+ JCAUtil.getSecureRandom().nextBytes(iv);
|
||||||
|
+ importerKeyMechanism = new CK_MECHANISM(CKM_AES_CBC_PAD, iv);
|
||||||
|
+ try {
|
||||||
|
+ CK_ATTRIBUTE[] attributes = token.getAttributes(TemplateManager.O_GENERATE,
|
||||||
|
+ CKO_SECRET_KEY, CKK_AES, new CK_ATTRIBUTE[] {
|
||||||
|
+ new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY),
|
||||||
|
+ new CK_ATTRIBUTE(CKA_VALUE_LEN, 256 >> 3)});
|
||||||
|
+ Session s = null;
|
||||||
|
+ try {
|
||||||
|
+ s = token.getObjSession();
|
||||||
|
+ long keyID = token.p11.C_GenerateKey(
|
||||||
|
+ s.id(), new CK_MECHANISM(CKM_AES_KEY_GEN),
|
||||||
|
+ attributes);
|
||||||
|
+ if (debug != null) {
|
||||||
|
+ debug.println("Importer Key ID: " + keyID);
|
||||||
|
+ }
|
||||||
|
+ importerKey = (P11Key)P11Key.secretKey(s, keyID, "AES",
|
||||||
|
+ 256 >> 3, null);
|
||||||
|
+ } catch (PKCS11Exception e) {
|
||||||
|
+ // best effort
|
||||||
|
+ } finally {
|
||||||
|
+ token.releaseSession(s);
|
||||||
|
+ }
|
||||||
|
+ if (importerKey != null) {
|
||||||
|
+ importerCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
|
||||||
|
+ }
|
||||||
|
+ } catch (Throwable t) {
|
||||||
|
+ // best effort
|
||||||
|
+ importerKey = null;
|
||||||
|
+ importerCipher = null;
|
||||||
|
+ // importerKeyMechanism value is kept initialized to indicate that
|
||||||
|
+ // Importer Key creation has been tried and failed.
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
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 5d3963ea893..42c72b393fd 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
|
||||||
|
@@ -26,6 +26,9 @@
|
||||||
|
package sun.security.pkcs11;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
+import java.lang.invoke.MethodHandle;
|
||||||
|
+import java.lang.invoke.MethodHandles;
|
||||||
|
+import java.lang.invoke.MethodType;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
import java.security.*;
|
||||||
|
@@ -66,6 +69,26 @@ public final class SunPKCS11 extends AuthProvider {
|
||||||
|
private static final boolean systemFipsEnabled = SharedSecrets
|
||||||
|
.getJavaSecuritySystemConfiguratorAccess().isSystemFipsEnabled();
|
||||||
|
|
||||||
|
+ private static final boolean plainKeySupportEnabled = SharedSecrets
|
||||||
|
+ .getJavaSecuritySystemConfiguratorAccess().isPlainKeySupportEnabled();
|
||||||
|
+
|
||||||
|
+ private static final MethodHandle fipsImportKey;
|
||||||
|
+ static {
|
||||||
|
+ MethodHandle fipsImportKeyTmp = null;
|
||||||
|
+ if (plainKeySupportEnabled) {
|
||||||
|
+ try {
|
||||||
|
+ fipsImportKeyTmp = MethodHandles.lookup().findStatic(
|
||||||
|
+ FIPSKeyImporter.class, "importKey",
|
||||||
|
+ MethodType.methodType(Long.class, SunPKCS11.class,
|
||||||
|
+ long.class, CK_ATTRIBUTE[].class));
|
||||||
|
+ } catch (Throwable t) {
|
||||||
|
+ throw new SecurityException("FIPS key importer initialization" +
|
||||||
|
+ " failed", t);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ fipsImportKey = fipsImportKeyTmp;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
private static final long serialVersionUID = -1354835039035306505L;
|
||||||
|
|
||||||
|
static final Debug debug = Debug.getInstance("sunpkcs11");
|
||||||
|
@@ -324,10 +347,15 @@ public final class SunPKCS11 extends AuthProvider {
|
||||||
|
// request multithreaded access first
|
||||||
|
initArgs.flags = CKF_OS_LOCKING_OK;
|
||||||
|
PKCS11 tmpPKCS11;
|
||||||
|
+ MethodHandle fipsKeyImporter = null;
|
||||||
|
+ if (plainKeySupportEnabled) {
|
||||||
|
+ fipsKeyImporter = MethodHandles.insertArguments(
|
||||||
|
+ fipsImportKey, 0, this);
|
||||||
|
+ }
|
||||||
|
try {
|
||||||
|
tmpPKCS11 = PKCS11.getInstance(
|
||||||
|
library, functionList, initArgs,
|
||||||
|
- config.getOmitInitialize());
|
||||||
|
+ config.getOmitInitialize(), fipsKeyImporter);
|
||||||
|
} catch (PKCS11Exception e) {
|
||||||
|
if (debug != null) {
|
||||||
|
debug.println("Multi-threaded initialization failed: " + e);
|
||||||
|
@@ -343,7 +371,7 @@ public final class SunPKCS11 extends AuthProvider {
|
||||||
|
initArgs.flags = 0;
|
||||||
|
}
|
||||||
|
tmpPKCS11 = PKCS11.getInstance(library,
|
||||||
|
- functionList, initArgs, config.getOmitInitialize());
|
||||||
|
+ functionList, initArgs, config.getOmitInitialize(), fipsKeyImporter);
|
||||||
|
}
|
||||||
|
p11 = tmpPKCS11;
|
||||||
|
|
||||||
|
diff --git openjdk.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
|
||||||
|
index 5c0aacd1a67..4d80145cb91 100644
|
||||||
|
--- openjdk.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
|
||||||
|
+++ openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
|
||||||
|
@@ -49,6 +49,7 @@ package sun.security.pkcs11.wrapper;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
+import java.lang.invoke.MethodHandle;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
import java.security.AccessController;
|
||||||
|
@@ -152,16 +153,28 @@ public class PKCS11 {
|
||||||
|
|
||||||
|
public static synchronized PKCS11 getInstance(String pkcs11ModulePath,
|
||||||
|
String functionList, CK_C_INITIALIZE_ARGS pInitArgs,
|
||||||
|
- boolean omitInitialize) throws IOException, PKCS11Exception {
|
||||||
|
+ boolean omitInitialize, MethodHandle fipsKeyImporter)
|
||||||
|
+ throws IOException, PKCS11Exception {
|
||||||
|
// we may only call C_Initialize once per native .so/.dll
|
||||||
|
// so keep a cache using the (non-canonicalized!) path
|
||||||
|
PKCS11 pkcs11 = moduleMap.get(pkcs11ModulePath);
|
||||||
|
if (pkcs11 == null) {
|
||||||
|
+ boolean nssFipsMode = fipsKeyImporter != null;
|
||||||
|
if ((pInitArgs != null)
|
||||||
|
&& ((pInitArgs.flags & CKF_OS_LOCKING_OK) != 0)) {
|
||||||
|
- pkcs11 = new PKCS11(pkcs11ModulePath, functionList);
|
||||||
|
+ if (nssFipsMode) {
|
||||||
|
+ pkcs11 = new FIPSPKCS11(pkcs11ModulePath, functionList,
|
||||||
|
+ fipsKeyImporter);
|
||||||
|
+ } else {
|
||||||
|
+ pkcs11 = new PKCS11(pkcs11ModulePath, functionList);
|
||||||
|
+ }
|
||||||
|
} else {
|
||||||
|
- pkcs11 = new SynchronizedPKCS11(pkcs11ModulePath, functionList);
|
||||||
|
+ if (nssFipsMode) {
|
||||||
|
+ pkcs11 = new SynchronizedFIPSPKCS11(pkcs11ModulePath,
|
||||||
|
+ functionList, fipsKeyImporter);
|
||||||
|
+ } else {
|
||||||
|
+ pkcs11 = new SynchronizedPKCS11(pkcs11ModulePath, functionList);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
if (omitInitialize == false) {
|
||||||
|
try {
|
||||||
|
@@ -1911,4 +1924,69 @@ static class SynchronizedPKCS11 extends PKCS11 {
|
||||||
|
super.C_GenerateRandom(hSession, randomData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+// PKCS11 subclass that allows using plain private or secret keys in
|
||||||
|
+// FIPS-configured NSS Software Tokens. Only used when System FIPS
|
||||||
|
+// is enabled.
|
||||||
|
+static class FIPSPKCS11 extends PKCS11 {
|
||||||
|
+ private MethodHandle fipsKeyImporter;
|
||||||
|
+ FIPSPKCS11(String pkcs11ModulePath, String functionListName,
|
||||||
|
+ MethodHandle fipsKeyImporter) throws IOException {
|
||||||
|
+ super(pkcs11ModulePath, functionListName);
|
||||||
|
+ this.fipsKeyImporter = fipsKeyImporter;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public synchronized long C_CreateObject(long hSession,
|
||||||
|
+ CK_ATTRIBUTE[] pTemplate) throws PKCS11Exception {
|
||||||
|
+ // Creating sensitive key objects from plain key material in a
|
||||||
|
+ // FIPS-configured NSS Software Token is not allowed. We apply
|
||||||
|
+ // a key-unwrapping scheme to achieve so.
|
||||||
|
+ if (FIPSPKCS11Helper.isSensitiveObject(pTemplate)) {
|
||||||
|
+ try {
|
||||||
|
+ return ((Long)fipsKeyImporter.invoke(hSession, pTemplate))
|
||||||
|
+ .longValue();
|
||||||
|
+ } catch (Throwable t) {
|
||||||
|
+ throw new PKCS11Exception(CKR_GENERAL_ERROR);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return super.C_CreateObject(hSession, pTemplate);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+// FIPSPKCS11 synchronized counterpart.
|
||||||
|
+static class SynchronizedFIPSPKCS11 extends SynchronizedPKCS11 {
|
||||||
|
+ private MethodHandle fipsKeyImporter;
|
||||||
|
+ SynchronizedFIPSPKCS11(String pkcs11ModulePath, String functionListName,
|
||||||
|
+ MethodHandle fipsKeyImporter) throws IOException {
|
||||||
|
+ super(pkcs11ModulePath, functionListName);
|
||||||
|
+ this.fipsKeyImporter = fipsKeyImporter;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public synchronized long C_CreateObject(long hSession,
|
||||||
|
+ CK_ATTRIBUTE[] pTemplate) throws PKCS11Exception {
|
||||||
|
+ // See FIPSPKCS11::C_CreateObject.
|
||||||
|
+ if (FIPSPKCS11Helper.isSensitiveObject(pTemplate)) {
|
||||||
|
+ try {
|
||||||
|
+ return ((Long)fipsKeyImporter.invoke(hSession, pTemplate))
|
||||||
|
+ .longValue();
|
||||||
|
+ } catch (Throwable t) {
|
||||||
|
+ throw new PKCS11Exception(CKR_GENERAL_ERROR);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return super.C_CreateObject(hSession, pTemplate);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+private static class FIPSPKCS11Helper {
|
||||||
|
+ static boolean isSensitiveObject(CK_ATTRIBUTE[] pTemplate) {
|
||||||
|
+ for (CK_ATTRIBUTE attr : pTemplate) {
|
||||||
|
+ if (attr.type == CKA_CLASS &&
|
||||||
|
+ (attr.getLong() == CKO_PRIVATE_KEY ||
|
||||||
|
+ attr.getLong() == CKO_SECRET_KEY)) {
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
}
|
||||||
|
diff --git openjdk.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
|
||||||
|
index e2d6d371bec..dc5e7eefdd3 100644
|
||||||
|
--- openjdk.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
|
||||||
|
+++ openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
|
||||||
|
@@ -219,6 +219,14 @@ public class PKCS11Exception extends Exception {
|
||||||
|
return "0x" + Functions.toFullHexString((int)errorCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /**
|
||||||
|
+ * Constructor taking the error code (the CKR_* constants in PKCS#11) with
|
||||||
|
+ * no extra info for the error message.
|
||||||
|
+ */
|
||||||
|
+ public PKCS11Exception(long errorCode) {
|
||||||
|
+ this(errorCode, null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* Constructor taking the error code (the CKR_* constants in PKCS#11) and
|
||||||
|
* extra info for error message.
|
596
rh1995150-disable_non-fips_crypto.patch
Normal file
596
rh1995150-disable_non-fips_crypto.patch
Normal file
@ -0,0 +1,596 @@
|
|||||||
|
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));
|
||||||
|
+ }
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
18
rh1996182-extend_security_policy.patch
Normal file
18
rh1996182-extend_security_policy.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
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.*";
|
65
rh1996182-login_to_nss_software_token.patch
Normal file
65
rh1996182-login_to_nss_software_token.patch
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
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
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
|
||||||
SHA512 (openjdk-jdk19u-jdk-19+36.tar.xz) = c441e1f7dbabe3e66e062a7f661f953e06c10dd165995e2996e614d32f2333cd4532f45064ba4d098dfc8fa3637448d4dc9869c235d086ef80499a7a262f4ede
|
SHA512 (openjdk-jdk17u-jdk-17.0.1+12.tar.xz) = d9503de1001e42657ddb2600e1141d4169e333f0592ce3ad3c4ce14f817ca73a6bf6fb867e15930150c7b55e8fd4c4cd73d43984979e721df481a9ac7919580c
|
||||||
|
69
update_package.sh
Normal file
69
update_package.sh
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
#!/bin/bash -x
|
||||||
|
# this file contains defaults for currently generated source tarballs
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# TAPSET
|
||||||
|
export PROJECT_NAME="hg"
|
||||||
|
export REPO_NAME="icedtea8"
|
||||||
|
export VERSION="9d464368e06d"
|
||||||
|
export COMPRESSION=xz
|
||||||
|
export OPENJDK_URL=http://icedtea.classpath.org
|
||||||
|
export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
|
||||||
|
export TO_COMPRESS="*/tapset"
|
||||||
|
# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
|
||||||
|
CLONED_FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
|
||||||
|
TAPSET_VERSION=3.2
|
||||||
|
TAPSET=systemtap_"$TAPSET_VERSION"_tapsets_$CLONED_FILENAME
|
||||||
|
if [ ! -f ${TAPSET} ] ; then
|
||||||
|
if [ ! -f ${CLONED_FILENAME} ] ; then
|
||||||
|
echo "Generating ${CLONED_FILENAME}"
|
||||||
|
sh ./generate_source_tarball.sh
|
||||||
|
else
|
||||||
|
echo "exists exists exists exists exists exists exists "
|
||||||
|
echo "reusing reusing reusing reusing reusing reusing "
|
||||||
|
echo ${CLONED_FILENAME}
|
||||||
|
fi
|
||||||
|
mv -v $CLONED_FILENAME $TAPSET
|
||||||
|
else
|
||||||
|
echo "exists exists exists exists exists exists exists "
|
||||||
|
echo "reusing reusing reusing reusing reusing reusing "
|
||||||
|
echo ${TAPSET}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# OpenJDK from Shenandoah project
|
||||||
|
export PROJECT_NAME="jdk"
|
||||||
|
export REPO_NAME="jdk15"
|
||||||
|
export VERSION="jdk-15+36"
|
||||||
|
export COMPRESSION=xz
|
||||||
|
# unset tapsets overrides
|
||||||
|
export OPENJDK_URL=""
|
||||||
|
export TO_COMPRESS=""
|
||||||
|
# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
|
||||||
|
export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
|
||||||
|
FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
|
||||||
|
|
||||||
|
if [ ! -f ${FILENAME} ] ; then
|
||||||
|
echo "Generating ${FILENAME}"
|
||||||
|
sh ./generate_source_tarball.sh
|
||||||
|
else
|
||||||
|
echo "exists exists exists exists exists exists exists "
|
||||||
|
echo "reusing reusing reusing reusing reusing reusing "
|
||||||
|
echo ${FILENAME}
|
||||||
|
fi
|
||||||
|
|
||||||
|
set +e
|
||||||
|
|
||||||
|
major=`echo $REPO_NAME | sed 's/[a-zA-Z]*//g'`
|
||||||
|
build=`echo $VERSION | sed 's/.*+//g'`
|
||||||
|
name_helper=`echo $FILENAME | sed s/$major/'%{majorver}'/g `
|
||||||
|
name_helper=`echo $name_helper | sed s/$build/'%{buildver}'/g `
|
||||||
|
echo "align specfile acordingly:"
|
||||||
|
echo " sed 's/^Source0:.*/Source0: $name_helper/' -i *.spec"
|
||||||
|
echo " sed 's/^Source8:.*/Source8: $TAPSET/' -i *.spec"
|
||||||
|
echo " sed 's/^%global buildver.*/%global buildver $build/' -i *.spec"
|
||||||
|
echo " sed 's/Release:.*/Release: 1%{?dist}/' -i *.spec"
|
||||||
|
echo "and maybe others...."
|
||||||
|
echo "you should fedpkg/rhpkg new-sources $TAPSET $FILENAME"
|
||||||
|
echo "you should fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user