public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/java-21-openjdk-portable] f43: Oracle CPUI 2026-11
@ 2026-11-20 15:17 Jiri Vanek
  0 siblings, 0 replies; only message in thread
From: Jiri Vanek @ 2026-11-20 15:17 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/java-21-openjdk-portable
            Branch : f43
            Commit : 6a3c9a6eb6d48c48882d6d86a9bbb1853c8361ea
            Author : Jiri Vanek <jvanek@redhat.com>
            Date   : 2026-11-20T15:41:10+01:00
            Stats  : +4583/-5409 in 9 file(s)
            URL    : https://src.fedoraproject.org/rpms/java-21-openjdk-portable/c/6a3c9a6eb6d48c48882d6d86a9bbb1853c8361ea?branch=f43

            Log:
            Oracle CPUI 2026-11

Note, that `Add fallback on the last portable JDK's cacerts if the
builder provided one failsopenjdk-portable-rhel-8` is not applicable

---
diff --git a/.gitignore b/.gitignore
index 13a85db..0646a1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /openjdk-21.0.12+8.tar.xz
 /openjdk-21.0.12.1+1.tar.xz
 /openjdk-21.0.13+9.tar.xz
+/openjdk-21.0.13.1+2.tar.xz

diff --git a/0001-8395142-CA-Enhancements.patch b/0001-8395142-CA-Enhancements.patch
deleted file mode 100644
index bc2f5b0..0000000
--- a/0001-8395142-CA-Enhancements.patch
+++ /dev/null
@@ -1,590 +0,0 @@
-From 04f8d990a3312d6c283b4bdd176e1afb10b844df Mon Sep 17 00:00:00 2001
-From: Sergey Bylokhov <serb@openjdk.org>
-Date: Tue, 20 Oct 2026 17:55:11 -0700
-Subject: [PATCH] 8395142: CA Enhancements
-
-Backport-of: b0839d834f6a94e74013da9e55dbcf2e73d371c9
----
- .../BlockedCertsConverter.java                |  41 +-
- .../blockedcertsconverter/blocked.certs.pem   | 430 ++++++++++++++++++
- .../sun/security/lib/CheckBlockedCerts.java   |  16 +-
- 3 files changed, 468 insertions(+), 19 deletions(-)
-
-diff --git a/make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java b/make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java
-index 1b2a3ebeb..9103f47bd 100644
---- a/make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java
-+++ b/make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -27,12 +27,14 @@ package build.tools.blockedcertsconverter;
- 
- import java.io.IOException;
- import java.math.BigInteger;
-+import java.security.AlgorithmParameters;
-+import java.security.GeneralSecurityException;
- import java.security.MessageDigest;
--import java.security.PublicKey;
- import java.security.cert.Certificate;
- import java.security.cert.CertificateFactory;
- import java.security.cert.X509Certificate;
--import java.security.interfaces.ECPublicKey;
-+import java.security.spec.ECGenParameterSpec;
-+import java.security.spec.ECParameterSpec;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collection;
-@@ -140,11 +142,8 @@ public class BlockedCertsConverter {
-         List<DerValue> algIds = Arrays.asList(seq[1], altAlgId(seq[1]));
- 
-         List<DerValue> sigs;
--        PublicKey p = c.getPublicKey();
--        if (p instanceof ECPublicKey) {
--            ECPublicKey ep = (ECPublicKey) p;
--            BigInteger mod = ep.getParams().getOrder();
--            sigs = Arrays.asList(seq[2], altSig(mod, seq[2]));
-+        if (c.getSigAlgName().contains("ECDSA")) {
-+            sigs = Arrays.asList(seq[2], altSig(seq[2]));
-         } else {
-             sigs = Arrays.asList(seq[2]);
-         }
-@@ -163,14 +162,27 @@ public class BlockedCertsConverter {
-         return result;
-     }
- 
--    private static DerValue altSig(BigInteger mod, DerValue sig)
-+    private static DerValue altSig(DerValue sig)
-             throws IOException {
-         byte[] sigBits = sig.getBitString();
-+        int sigLength = sigBits.length;
-         DerInputStream in =
--            new DerInputStream(sigBits, 0, sigBits.length, false);
-+            new DerInputStream(sigBits, 0, sigLength, false);
-         DerValue[] values = in.getSequence(2);
-         BigInteger r = values[0].getBigInteger();
-         BigInteger s = values[1].getBigInteger();
-+        BigInteger mod;
-+        // The following checks cover more than 99.99999% of signature lengths
-+        // for the three NIST-P curves. Fail if the length lies outside.
-+        if (sigLength >= 100 && sigLength <= 104) {
-+            mod = order("secp384r1");
-+        } else if (sigLength >= 68 && sigLength <= 72) {
-+            mod = order("secp256r1");
-+        } else if (sigLength >= 135 && sigLength <= 139) {
-+            mod = order("secp521r1");
-+        } else {
-+            throw new RuntimeException("Unrecognized signature length: " + sigLength);
-+        }
-         BigInteger s2 = s.negate().mod(mod);
-         DerOutputStream out = new DerOutputStream();
-         out.putInteger(r);
-@@ -193,4 +205,13 @@ public class BlockedCertsConverter {
-         tmp.write(DerValue.tag_Sequence, bytes);
-         return new DerValue(tmp.toByteArray());
-     }
-+    private static BigInteger order(String curve) throws IOException {
-+        try {
-+            AlgorithmParameters ap = AlgorithmParameters.getInstance("EC");
-+            ap.init(new ECGenParameterSpec(curve));
-+            return ap.getParameterSpec(ECParameterSpec.class).getOrder();
-+        } catch (GeneralSecurityException e) {
-+            throw new IOException(e);
-+        }
-+    }
- }
-diff --git a/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem b/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem
-index 4a3b33b03..59b08d76b 100644
---- a/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem
-+++ b/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem
-@@ -747,3 +747,433 @@ lZA8SFd5CTDy3EBUU5UwzXUc5HoIRUxXSPycu3aIBWawg3sCdKiAoikScPAWj0bM
- 0vmsP/8QSlTOBqO+QFQ6R82BtTvBNU3qbVICV4QObsxib++FAFL56NApPqskg7Vz
- LfNIAjKabHUcjbuZkmg6jr4BfYW7+oQDHCsYgADjjKGdKz/8U/fP
- -----END CERTIFICATE-----
-+
-+// Subject: CN=EM DV TLS CA - G3B, O=eMudhra BV, C=NL
-+// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-+// Serial Number:
-+//     a0:24:fd:f4:ba:66:5c:78:5c:e4:a0:20:48:38:58:b7
-+-----BEGIN CERTIFICATE-----
-+MIIDzjCCAragAwIBAgIRAKAk/fS6Zlx4XOSgIEg4WLcwDQYJKoZIhvcNAQELBQAw
-+ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y
-+ODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJW
-+MRswGQYDVQQDDBJFTSBEViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQA
-+IgNiAATnntnASpdzxHNeUREdqFrCvV5kqzdLgOEsvCA47B5PDjuBL8mFnh5nr7BO
-+L4vJf3SFumWqkR7opORbYtXMA9Vr5nizw4y03JN8okYOI4RTyJKTXSnUT5HhVga2
-+PM7atGijggE1MIIBMTAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd
-+BgNVHQ4EFgQU4h4v5xwZOQ5VS2LBICRXNSSKJRQwDgYDVR0PAQH/BAQDAgEGMBIG
-+A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-+MDEGA1UdIAQqMCgwCAYGZ4EMAQIBMA0GCysGAQQBg44hAQABMA0GCysGAQQBg44h
-+AQJkMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FB
-+QUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEF
-+BQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IB
-+AQBzQ1IoqpdotM6gFrR4Q3YrKifOLeaj5XXunldpVE/vZn2TxC2y0s8oYiLR5ICE
-+wqVXSB7N6BM1Mp+Nif7Jbhb2IswAfSR4Iik8+B0iRmi7lYoNlycCgHjmsjOmZaxM
-+QkPmjXAJbG5f4V41OsvJZmS7lI3r0IuvEDVX3GAZ13on6IImSs9ybNpHQ7NCqkMQ
-+7wH4uAO1dtpFycgJSdHaCOhHjrox2BTYGLdpUrYwY3EOAjlZ8UGgsxs7mG+xquMl
-+bN1LFURwfnkVMP3T/DBIZ/ys2+lNFyxK3FlArrV4/000uTnVB1lO8oGORYdXoT5V
-+GUyRCEIDhF5TBUuKF4E3kf1h
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM EV TLS CA - G3B, O=eMudhra BV, C=NL
-+// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-+// Serial Number:
-+//     d8:f8:68:5e:4f:2b:d9:d8:24:02:a8:5a:1c:1e:b7:31
-+-----BEGIN CERTIFICATE-----
-+MIIDzTCCArWgAwIBAgIRANj4aF5PK9nYJAKoWhwetzEwDQYJKoZIhvcNAQELBQAw
-+ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y
-+ODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJW
-+MRswGQYDVQQDDBJFTSBFViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQA
-+IgNiAAQl26haZNOX2gsQUunqVG5Ie+/qnJ2daKDF6tz+73Wmm7XW/AH0K/vKbrQL
-+zWTAdn42/9Bdl6gTxaoMbJUw55z18IZkaPE4BkIKpchRhAseJSVA55DktlTDhS7W
-+SvHoZX2jggE0MIIBMDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd
-+BgNVHQ4EFgQUPtwg2YlGmId7hz/YgUeyXBXYRwYwDgYDVR0PAQH/BAQDAgEGMBIG
-+A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-+MDAGA1UdIAQpMCcwBwYFZ4EMAQEwDQYLKwYBBAGDjiEBAAEwDQYLKwYBBAGDjiEB
-+AngwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFB
-+Q2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUF
-+BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQELBQADggEB
-+AJNFuAFW9Gnw/8+kCO4KIlZdnM1Sh2u+8cK0EYAHhXpb5FlGvYkcARigo5oS7VoM
-+7FOYlTueV6yICZKNAYawZPJPhNCGK+rp3cQBEz6d0n8OZEYZov9lb3ll8ORgSDuf
-+FVIW6Gagg/UnOamLBTOR8eD5V73SCme/B2cHUDw+m5E8cc+0Ujzz3Cn3ex5JrhXk
-+2T3s8PoVzEmhTgGboFfcWO1EYhPPrYwdxPYRQIXAXUXhLEOVNL9ASbZJLFI8E1IM
-+m7NwxVN2s38jWpaCUaaF0tg7hfiy7oe13rzJfHsdqldJVTTUTPWVx8TC4ju0VLet
-+bAlwhwFT6AP8uIVMGUHNw24=
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM OV TLS CA - G3B, O=eMudhra BV, C=NL
-+// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-+// Serial Number:
-+//     e9:42:23:bd:e9:2f:91:4e:5a:b9:ac:ab:fd:ac:37:10
-+-----BEGIN CERTIFICATE-----
-+MIIDzjCCAragAwIBAgIRAOlCI73pL5FOWrmsq/2sNxAwDQYJKoZIhvcNAQELBQAw
-+ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y
-+ODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJW
-+MRswGQYDVQQDDBJFTSBPViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQA
-+IgNiAARziXqg6zz9yosSQC/68KvE4SErr43ud4rJ7i1tuD+sKAxeBWOK56Ks1xwy
-+Ko42HN659pxDArndjXPRzGyqsswK7k4hbOl53VGKSvS2JuVoTN1lgDftDIVOTMEv
-+TPhkbQ2jggE1MIIBMTAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd
-+BgNVHQ4EFgQUm9hlUa/n5yw3rQjuaRnZvzeErgowDgYDVR0PAQH/BAQDAgEGMBIG
-+A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-+MDEGA1UdIAQqMCgwCAYGZ4EMAQICMA0GCysGAQQBg44hAQABMA0GCysGAQQBg44h
-+AQJuMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FB
-+QUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEF
-+BQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IB
-+AQALRoOSvkzRa+tN5Rje9W5GiXd/qsicd9N6Gnh0SWC7VyWH+HycIqAnFCMYZznj
-+CeGusomFYHE42SHWr85JDIbgzy6y3dO4i9n9w0Bx7yrXWBbDzFS8VgA3+EY4Cg7y
-+mtoC3RPOJVtaXXPZ+68X804g1Mj+3vCSHj2lNPVgco0OzSIOJ/KMg1R9MLBkiKzb
-+bERAGZHejY0HBhYd76IINZN8z6bBNah2UdFYxsOisLynPQUkol6gRLum024/FzVl
-+CCDfnUusrkr+mAfPAvD/Vb8bhpA7jYtepuU+2mIdShj5lLlvAwZphn+ypWycuo2x
-+0k9mldz2dqI9nhCiY+TTIOOR
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM DV TLS CA - G3C, O=eMudhra Inc, C=US
-+// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-+// Serial Number:
-+//     91:f3:47:f1:a5:b7:d3:99:62:b9:5e:0e:e4:e2:99:d1
-+-----BEGIN CERTIFICATE-----
-+MIIDzzCCAregAwIBAgIRAJHzR/Glt9OZYrleDuTimdEwDQYJKoZIhvcNAQELBQAw
-+ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y
-+ODEyMzEyMzU5NTlaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIElu
-+YzEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EE
-+ACIDYgAEOnp4YsjETTJN3WkDOmeCwO/u/kBV5ooSP6A3G6O9kZRRTuFypDPjYw8C
-+vRiAN9nlFJ+bd9uUooHfmHsv6oiLdL3+j9pMEJnubKGVZv4+8OX2sJpVbMyLpQVh
-+3xsqRB0Bo4IBNTCCATEwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQw
-+HQYDVR0OBBYEFK5+EFw8KZbBqEcnBVnx4D3U5QrzMA4GA1UdDwEB/wQEAwIBBjAS
-+BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-+AjAxBgNVHSAEKjAoMAgGBmeBDAECATANBgsrBgEEAYOOIQEAATANBgsrBgEEAYOO
-+IQECZDBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9B
-+QUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYB
-+BQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOC
-+AQEAr7b6Mx11TIJgVzHt6EH5qGNWeiiqoMrp8E5/k8s+jvupx1n083pZ5XOzUzND
-+wEUe0W4C4FIGUHNQ4XDwqOw0yK42xqm2dvCKgsko2UvDlT0haZVtTCeWMQOe5J/J
-+ziaMfZwsZNfZ3aaI6XPtWDZtwY8AaNfyaeCpbtm5GcGnyNWk4jSNpbtpo6NjfXuP
-+CFOm3rTjJ4zytP7Tso6iMm0L01cYFOlTmoPv4515R2r3SPnKDtijoB/D/vgxzojv
-+DafgyG9afX8+laO9NbMMz4sqC1vZx3984i/sBNFiugm3Vvdq5OdJRjuGC1QILIs6
-+dg/K3i8VQqRpbfaM9kIlMzZ3dQ==
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM OV TLS CA - G3C, O=eMudhra Inc, C=US
-+// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-+// Serial Number:
-+//     8d:5a:48:11:93:9e:f4:47:d7:71:11:cd:d9:84:9a:e9
-+-----BEGIN CERTIFICATE-----
-+MIIDzzCCAregAwIBAgIRAI1aSBGTnvRH13ERzdmEmukwDQYJKoZIhvcNAQELBQAw
-+ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y
-+ODEyMzEyMzU5NTlaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIElu
-+YzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EE
-+ACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZfjpRIOHv
-+1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+N7ulaVSf
-+HAKycO1no4IBNTCCATEwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQw
-+HQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMA4GA1UdDwEB/wQEAwIBBjAS
-+BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-+AjAxBgNVHSAEKjAoMAgGBmeBDAECAjANBgsrBgEEAYOOIQEAATANBgsrBgEEAYOO
-+IQECbjBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9B
-+QUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYB
-+BQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOC
-+AQEAHlbhZpjhkPEAQVhPHRtBDaHqiisVD20pQ1TUeSx3l62Qe7NQ0b7vWQy7DN0i
-+KOu7BGpP5EnIjvXbz9FhpfPJ4FhKEt3tQ51rqXz2oD8vRaryvExWPobDUz3j7HN6
-+OzBsVMIe3PD7AAkpky0x8zMSi/ep5R9OMzybmNptbtppyuB5ytgq+h7lQdRIP+CQ
-+TaJX3qTgfMqzntYre5GljmEB5hU2/rSn8zoSU2APkJidlZFpghtgbD4I2VRHZvCw
-+FFr/SrFM9pwrgbJNZ1MtyTSVgI5NlNb0aMfLR+/r6jJt3ROeY2yh2QQ2dx+Yqgdb
-+uL5ChFWOQU+ErSDnUq7yr+pjBQ==
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM OV CS CA - G3C, O=eMudhra Inc, C=US
-+// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-+// Serial Number:
-+//     d6:a5:ef:61:3b:39:0f:32:ef:9c:df:34:9f:77:28:41
-+-----BEGIN CERTIFICATE-----
-+MIIDxTCCAq2gAwIBAgIRANal72E7OQ8y75zfNJ93KEEwDQYJKoZIhvcNAQELBQAw
-+ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y
-+ODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIElu
-+YzEaMBgGA1UEAwwRRU0gT1YgQ1MgQ0EgLSBHM0MwdjAQBgcqhkjOPQIBBgUrgQQA
-+IgNiAAS58OBjRwKmnKaq3UQ8/WLEG5uksgkkaX15dOdpGhJvuWr7PjTC/TvF9IMG
-+HyZdwqWENjRzI1EENrKPBPOGI2MGeYDiUD4CUy1lRiNacWWiWaHvSW90G1/e53hy
-+COS4+u+jggEsMIIBKDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd
-+BgNVHQ4EFgQU7m9zKY1vv6ezG8OVNPYVVkR4ZrcwDgYDVR0PAQH/BAQDAgEGMBIG
-+A1UdEwEB/wQIMAYBAf8CAQAwEwYDVR0lBAwwCgYIKwYBBQUHAwMwMgYDVR0gBCsw
-+KTAIBgZngQwBBAEwDQYLKwYBBAGDjiEBAAEwDgYMKwYBBAGDjiEBAoFIMEMGA1Ud
-+HwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FBQUNlcnRpZmlj
-+YXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-+cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBgGbZ+NDkn
-+2Fr5dCVs/51+6cT5iEPP1stglX4TI2UaNh9LmPdltxXw3crV8gK5L8i+d+ScGibF
-+y0obtBHNTldXDgLnAHIzY3n+pceyKj7O2ae9CYnyuu5RBifeI3XYKowWE+oXnVGF
-+Oy0CvCJ/JsdP6aYgoCa9hGnAYicYQQL6MOMQZ5PuhcSM8t4giIzrpgrEkUP93GYE
-+emDG5Z8BYwKs80lLeQNBnwg/VHJ3iEF/o84RXYwrlrKqJ+33C094o6LNikMJCqOK
-+/WYHZSR8Xyhf8GXFAj5pZuI6Bcpug2V/E7i42j8OBhc25aNYDqK+B0qmb90sjNUB
-+g3tJeSIb/599
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM OV CS CA - G3B, O=eMudhra BV, C=NL
-+// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-+// Serial Number:
-+//     41:e3:2b:73:ac:18:5d:6c:e0:d7:48:0b:ac:f8:4e:69
-+-----BEGIN CERTIFICATE-----
-+MIIDwzCCAqugAwIBAgIQQeMrc6wYXWzg10gLrPhOaTANBgkqhkiG9w0BAQsFADB7
-+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
-+VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
-+AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTI1MDUxNDAwMDAwMFoXDTI4
-+MTIzMTIzNTk1OVowPjELMAkGA1UEBhMCTkwxEzARBgNVBAoMCmVNdWRocmEgQlYx
-+GjAYBgNVBAMMEUVNIE9WIENTIENBIC0gRzNCMHYwEAYHKoZIzj0CAQYFK4EEACID
-+YgAEqrsPsGZqz88B+tUr/P1MK/LLPDSX3nOVDlgZth/mlQmHQcjEkUObNKBDHK/+
-+W/m0wcjorgAB+fTcitgsWfNjnpbNbD1NsM7+wmw9YlF7N3YTcnQ/jordd7EAZPKr
-+5eBQo4IBLDCCASgwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYD
-+VR0OBBYEFHn66OzP2w11jaRY1p+27dx8Sd7mMA4GA1UdDwEB/wQEAwIBBjASBgNV
-+HRMBAf8ECDAGAQH/AgEAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMDIGA1UdIAQrMCkw
-+CAYGZ4EMAQQBMA0GCysGAQQBg44hAQABMA4GDCsGAQQBg44hAQKBSDBDBgNVHR8E
-+PDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9BQUFDZXJ0aWZpY2F0
-+ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6
-+Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAIh0OzWsdBYhY
-+7+yxPGyosRL+uUSN6/Mrd30fBuougs5FVWQ3cRgLhImnUUgXADY9buugWhMmfT3c
-+yU5T1MFXZXClCILm5mfg+oqm/ikUWJl3Ayf2GvYf2O++6vzqvkn418nI5Lpdt0O7
-+Li524YS/3CZHDA+zZQ7rrHpZXgQ9Hmp8AUQ4FneaGjNanFoYxiZxwCyW5z4u7AoK
-+0bmOVqKtcDFoVNz5++G9TYDJdhWOXmKKgzqRo1MK0PjazNT7MGHqknP93SqMVJ1g
-+mX/qNWxYteAjlvFanQxBNX/+TRxDjuFsEHO/7BvqSpIIck0UEEfizhN8zNpWLbcl
-+EqVgl0g39A==
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM DV TLS CA - G3B, O=eMudhra BV, C=NL
-+// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN
-+// Serial Number:
-+//     a4:ae:e6:78:f2:33:62:b4:c0:e4:60:b7:72:f2:14
-+-----BEGIN CERTIFICATE-----
-+MIIDaDCCAu6gAwIBAgIQAKSu5njyM2K0wORgt3LyFDAKBggqhkjOPQQDAzBWMQsw
-+CQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
-+ZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTU1
-+NDA4WhcNNDAwNDI4MTgzMDAwWjA/MQswCQYDVQQGEwJOTDETMBEGA1UECgwKZU11
-+ZGhyYSBCVjEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNCMHYwEAYHKoZIzj0C
-+AQYFK4EEACIDYgAE557ZwEqXc8RzXlERHahawr1eZKs3S4DhLLwgOOweTw47gS/J
-+hZ4eZ6+wTi+LyX90hbplqpEe6KTkW2LVzAPVa+Z4s8OMtNyTfKJGDiOEU8iSk10p
-+1E+R4VYGtjzO2rRoo4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L
-+WUIgkFQwHQYDVR0OBBYEFOIeL+ccGTkOVUtiwSAkVzUkiiUUMB0GA1UdJQQWMBQG
-+CCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCow
-+KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB
-+BAGDjiEBAmQwCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY
-+aHR0cDovL29jc3AtYi5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw
-+b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRFZUTFNDQUczQi5wN2MwNwYDVR0f
-+BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j
-+cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E
-+AwMDaAAwZQIwLmsGXi6oFMJ2klkcEMXMug6gvxQWZWkewiDWVzQyl2L6z6DuQfPO
-+Ibh1grvdULDCAjEAxZvLlxUavG69J6wnSjC8XBbqNIQsJ6CE2QdNOe84Ptxb6VG8
-+gt2TlfJbHii+KNvK
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM DV TLS CA - G3C, O=eMudhra Inc, C=US
-+// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN
-+// Serial Number:
-+//     58:8b:2e:3c:2b:b8:cd:a1:3e:1a:12:09:25:43:21
-+-----BEGIN CERTIFICATE-----
-+MIIDaDCCAu6gAwIBAgIPWIsuPCu4zaE+GhIJJUMhMAoGCCqGSM49BAMDMFYxCzAJ
-+BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk
-+MSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNTM1
-+MDlaFw00MDA0MjgxODMwMDBaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVk
-+aHJhIEluYzEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0C
-+AQYFK4EEACIDYgAEOnp4YsjETTJN3WkDOmeCwO/u/kBV5ooSP6A3G6O9kZRRTuFy
-+pDPjYw8CvRiAN9nlFJ+bd9uUooHfmHsv6oiLdL3+j9pMEJnubKGVZv4+8OX2sJpV
-+bMyLpQVh3xsqRB0Bo4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L
-+WUIgkFQwHQYDVR0OBBYEFK5+EFw8KZbBqEcnBVnx4D3U5QrzMB0GA1UdJQQWMBQG
-+CCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCow
-+KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB
-+BAGDjiEBAmQwCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY
-+aHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw
-+b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRFZUTFNDQUczQy5wN2MwNwYDVR0f
-+BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j
-+cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E
-+AwMDaAAwZQIxAMEN2HWMocbuWdy1d33pH6JpMvP/V/DIS5PtZbv1Q7TXEbxrcyxg
-+yuddOJscYDJJlAIwB4sH1BpbScDzkdD4tJBSwrG/1Mx82vb8YaySehNuu1+1oXNd
-+AEKwaJ0mVzScy2+6
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM EV TLS CA - G3B, O=eMudhra BV, C=NL
-+// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN
-+// Serial Number:
-+//     c7:c4:1e:fe:92:d8:25:f0:5e:ae:84:1a:4a:82:c1
-+-----BEGIN CERTIFICATE-----
-+MIIDaDCCAu2gAwIBAgIQAMfEHv6S2CXwXq6EGkqCwTAKBggqhkjOPQQDAzBWMQsw
-+CQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
-+ZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTYw
-+MzMxWhcNNDAwNDI4MTgzMDAwWjA/MQswCQYDVQQGEwJOTDETMBEGA1UECgwKZU11
-+ZGhyYSBCVjEbMBkGA1UEAwwSRU0gRVYgVExTIENBIC0gRzNCMHYwEAYHKoZIzj0C
-+AQYFK4EEACIDYgAEJduoWmTTl9oLEFLp6lRuSHvv6pydnWigxerc/u91ppu11vwB
-+9Cv7ym60C81kwHZ+Nv/QXZeoE8WqDGyVMOec9fCGZGjxOAZCCqXIUYQLHiUlQOeQ
-+5LZUw4Uu1krx6GV9o4IBlTCCAZEwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L
-+WUIgkFQwHQYDVR0OBBYEFD7cINmJRpiHe4c/2IFHslwV2EcGMB0GA1UdJQQWMBQG
-+CCsGAQUFBwMBBggrBgEFBQcDAjBcBgNVHSAEVTBTMDkGCysGAQQBg44hAQABMCow
-+KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB
-+BAGDjiEBAngwBwYFZ4EMAQEwdQYIKwYBBQUHAQEEaTBnMCQGCCsGAQUFBzABhhho
-+dHRwOi8vb2NzcC1iLmVtc2lnbi5jb20wPwYIKwYBBQUHMAKGM2h0dHA6Ly9yZXBv
-+c2l0b3J5LmVtc2lnbi5jb20vY2VydHMvRU1FVlRMU0NBRzNCLnA3YzA3BgNVHR8E
-+MDAuMCygKqAohiZodHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3R0bHNjYWczLmNy
-+bDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQD
-+AwNpADBmAjEA9Jq999oaOUKhFwopw33iCmt0OHIn3gjT43GfuOHR/YckXdwoNdDA
-+lIEhz0NgRO3/AjEAvY/a3OMvktIZLYjn+WLKmp0QhrIMV+e6EpS7j4GVeOKouNp6
-+MN/P+ByGeiRMghzB
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM EV TLS CA - G3C, O=eMudhra Inc, C=US
-+// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN
-+// Serial Number:
-+//     80:09:92:8a:64:10:76:01:af:05:fa:2f:19:f1:09
-+-----BEGIN CERTIFICATE-----
-+MIIDaDCCAu6gAwIBAgIQAIAJkopkEHYBrwX6LxnxCTAKBggqhkjOPQQDAzBWMQsw
-+CQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
-+ZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTUz
-+OTMxWhcNNDAwNDI4MTgzMDAwWjBAMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLZU11
-+ZGhyYSBJbmMxGzAZBgNVBAMMEkVNIEVWIFRMUyBDQSAtIEczQzB2MBAGByqGSM49
-+AgEGBSuBBAAiA2IABC1W6Cmm+4LGSkaX2WCvlR6QZ66R+SbTQwbaSKiq63hptqZ+
-+bSdCbgRCqgOzbhmI3/Y2UU7hzwf1uks/8qBmRa59MdWGatMao9JG6wsxd+6Zy3Vm
-+xRbOdICKZo+R8MR/yqOCAZUwggGRMB8GA1UdIwQYMBaAFOE6qyF88eNNVK7Ucrf9
-+i1lCIJBUMB0GA1UdDgQWBBSmJV6AqU2385Z8G8eR35K87kvrXzAdBgNVHSUEFjAU
-+BggrBgEFBQcDAQYIKwYBBQUHAwIwXAYDVR0gBFUwUzA5BgsrBgEEAYOOIQEAATAq
-+MCgGCCsGAQUFBwIBFhxodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tMA0GCysG
-+AQQBg44hAQJ4MAcGBWeBDAEBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY
-+aHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw
-+b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRVZUTFNDQUczQy5wN2MwNwYDVR0f
-+BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j
-+cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E
-+AwMDaAAwZQIwBy1wTnzH4lXDTy2PD91ysLjvnlVN3JbJmc1BIMEU8TOLkYVHibMc
-+9HeyonikFSfmAjEA6uE3QRxlrZTz/1/lXPTEMUhoauAtycagtlNFp79kjhvNa2/f
-+Aal1GNxsOutLnr0Y
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM OV CS CA - G3B, O=eMudhra BV, C=NL
-+// Issuer: CN=emSign Root CS CA - G3, O=eMudhra Technologies Limited, C=IN
-+// Serial Number:
-+//     78:18:93:3f:8f:85:b4:61:9a:2b:35:fb:a8:3d:0a
-+-----BEGIN CERTIFICATE-----
-+MIIDWzCCAuCgAwIBAgIPeBiTP4+FtGGaKzX7qD0KMAoGCCqGSM49BAMDMFUxCzAJ
-+BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk
-+MR8wHQYDVQQDDBZlbVNpZ24gUm9vdCBDUyBDQSAtIEczMB4XDTI1MDQzMDE2MDgy
-+N1oXDTQwMDQyODE4MzAwMFowPjELMAkGA1UEBhMCTkwxEzARBgNVBAoMCmVNdWRo
-+cmEgQlYxGjAYBgNVBAMMEUVNIE9WIENTIENBIC0gRzNCMHYwEAYHKoZIzj0CAQYF
-+K4EEACIDYgAEqrsPsGZqz88B+tUr/P1MK/LLPDSX3nOVDlgZth/mlQmHQcjEkUOb
-+NKBDHK/+W/m0wcjorgAB+fTcitgsWfNjnpbNbD1NsM7+wmw9YlF7N3YTcnQ/jord
-+d7EAZPKr5eBQo4IBizCCAYcwHwYDVR0jBBgwFoAUaHQD+IXKjVRQVx0W4MjeRQ2r
-+zS0wHQYDVR0OBBYEFHn66OzP2w11jaRY1p+27dx8Sd7mMBMGA1UdJQQMMAoGCCsG
-+AQUFBwMDMF4GA1UdIARXMFUwOQYLKwYBBAGDjiEBAAEwKjAoBggrBgEFBQcCARYc
-+aHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbTAOBgwrBgEEAYOOIQECgUgwCAYG
-+Z4EMAQQBMHQGCCsGAQUFBwEBBGgwZjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3At
-+Yi5lbXNpZ24uY29tMD4GCCsGAQUFBzAChjJodHRwOi8vcmVwb3NpdG9yeS5lbXNp
-+Z24uY29tL2NlcnRzL0VNT1ZDU0NBRzNCLnA3YzA2BgNVHR8ELzAtMCugKaAnhiVo
-+dHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3Rjc2NhZzMuY3JsMA4GA1UdDwEB/wQE
-+AwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMAoGCCqGSM49BAMDA2kAMGYCMQC/zr03
-+YEELsNKqzUtH2dVFi4BaKFdyrr/6G1dIWp8KAVgsw2/u4lyyboUDaC9jDvICMQC9
-+HTxku84tNX9dmHOtH7aC2Nu/JM0jTf6KjZAvovCJzzv1IFWSZpVLZibynMLXOrM=
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM OV CS CA - G3C, O=eMudhra Inc, C=US
-+// Issuer: CN=emSign Root CS CA - G3, O=eMudhra Technologies Limited, C=IN
-+// Serial Number:
-+//     54:4b:7f:92:2c:31:ae:22:0a:4a:92:29:16:f6:e6
-+-----BEGIN CERTIFICATE-----
-+MIIDWzCCAuGgAwIBAgIPVEt/kiwxriIKSpIpFvbmMAoGCCqGSM49BAMDMFUxCzAJ
-+BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk
-+MR8wHQYDVQQDDBZlbVNpZ24gUm9vdCBDUyBDQSAtIEczMB4XDTI1MDQzMDE2Mzg0
-+MFoXDTQwMDQyODE4MzAwMFowPzELMAkGA1UEBhMCVVMxFDASBgNVBAoMC2VNdWRo
-+cmEgSW5jMRowGAYDVQQDDBFFTSBPViBDUyBDQSAtIEczQzB2MBAGByqGSM49AgEG
-+BSuBBAAiA2IABLnw4GNHAqacpqrdRDz9YsQbm6SyCSRpfXl052kaEm+5avs+NML9
-+O8X0gwYfJl3CpYQ2NHMjUQQ2so8E84YjYwZ5gOJQPgJTLWVGI1pxZaJZoe9Jb3Qb
-+X97neHII5Lj676OCAYswggGHMB8GA1UdIwQYMBaAFGh0A/iFyo1UUFcdFuDI3kUN
-+q80tMB0GA1UdDgQWBBTub3MpjW+/p7Mbw5U09hVWRHhmtzATBgNVHSUEDDAKBggr
-+BgEFBQcDAzBeBgNVHSAEVzBVMDkGCysGAQQBg44hAQABMCowKAYIKwYBBQUHAgEW
-+HGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDgYMKwYBBAGDjiEBAoFIMAgG
-+BmeBDAEEATB0BggrBgEFBQcBAQRoMGYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-+LWMuZW1zaWduLmNvbTA+BggrBgEFBQcwAoYyaHR0cDovL3JlcG9zaXRvcnkuZW1z
-+aWduLmNvbS9jZXJ0cy9FTU9WQ1NDQUczQy5wN2MwNgYDVR0fBC8wLTAroCmgJ4Yl
-+aHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290Y3NjYWczLmNybDAOBgNVHQ8BAf8E
-+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQDAwNoADBlAjEA8yPg
-+8sntOhLwV2QXJ5LEaKSpo/fnE3uOgTadK73fDhyjiqr0Io9GVuQTYqBPbQ2TAjBg
-+euApmBS486+iei03lRrp139dPw6k28jjGNvWsAU7A1N86J1zPJVDEyVH+nMAWC0=
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM OV TLS CA - G3B, O=eMudhra BV, C=NL
-+// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN
-+// Serial Number:
-+//     6c:ad:a3:67:fb:1c:10:00:88:12:0e:a2:02:d5:68
-+-----BEGIN CERTIFICATE-----
-+MIIDZjCCAu2gAwIBAgIPbK2jZ/scEACIEg6iAtVoMAoGCCqGSM49BAMDMFYxCzAJ
-+BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk
-+MSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNjAw
-+MTJaFw00MDA0MjgxODMwMDBaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVk
-+aHJhIEJWMRswGQYDVQQDDBJFTSBPViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIB
-+BgUrgQQAIgNiAARziXqg6zz9yosSQC/68KvE4SErr43ud4rJ7i1tuD+sKAxeBWOK
-+56Ks1xwyKo42HN659pxDArndjXPRzGyqsswK7k4hbOl53VGKSvS2JuVoTN1lgDft
-+DIVOTMEvTPhkbQ2jggGWMIIBkjAfBgNVHSMEGDAWgBThOqshfPHjTVSu1HK3/YtZ
-+QiCQVDAdBgNVHQ4EFgQUm9hlUa/n5yw3rQjuaRnZvzeErgowHQYDVR0lBBYwFAYI
-+KwYBBQUHAwEGCCsGAQUFBwMCMF0GA1UdIARWMFQwOQYLKwYBBAGDjiEBAAEwKjAo
-+BggrBgEFBQcCARYcaHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbTANBgsrBgEE
-+AYOOIQECbjAIBgZngQwBAgIwdQYIKwYBBQUHAQEEaTBnMCQGCCsGAQUFBzABhhho
-+dHRwOi8vb2NzcC1iLmVtc2lnbi5jb20wPwYIKwYBBQUHMAKGM2h0dHA6Ly9yZXBv
-+c2l0b3J5LmVtc2lnbi5jb20vY2VydHMvRU1PVlRMU0NBRzNCLnA3YzA3BgNVHR8E
-+MDAuMCygKqAohiZodHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3R0bHNjYWczLmNy
-+bDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQD
-+AwNnADBkAjBAk+5BizdJhrED3wb7F2Gm7bWI60dlNd075nghT2TrR4NWKZtJZcbc
-+28xxIY/NONICMF6mPdsjosaqmvEMWqKcBh4vsIvXSKnQj5o8zrFB4oKS+accjYTe
-+8Dz3bQjauvy9uw==
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM OV TLS CA - G3C, O=eMudhra Inc, C=US
-+// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN
-+// Serial Number:
-+//     29:69:26:c2:27:a3:a1:52:63:92:b1:94:82:a5:04
-+-----BEGIN CERTIFICATE-----
-+MIIDaDCCAu6gAwIBAgIPKWkmwiejoVJjkrGUgqUEMAoGCCqGSM49BAMDMFYxCzAJ
-+BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk
-+MSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNTM3
-+NDFaFw00MDA0MjgxODMwMDBaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVk
-+aHJhIEluYzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0C
-+AQYFK4EEACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZ
-+fjpRIOHv1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+
-+N7ulaVSfHAKycO1no4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L
-+WUIgkFQwHQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMB0GA1UdJQQWMBQG
-+CCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCow
-+KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB
-+BAGDjiEBAm4wCAYGZ4EMAQICMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY
-+aHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw
-+b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNT1ZUTFNDQUczQy5wN2MwNwYDVR0f
-+BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j
-+cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E
-+AwMDaAAwZQIxAMSZt2xsPeumRdeSMSQ3CbzIZeQ/q7GDCWfeE1Pq+mhgA6gRM44c
-+NVF3xJ+wsxJk+wIwFJbaDMokD8Ei6eNOiA8yUMYvfzQyngmrhZQMdPCK1SewrR79
-+4rSb9vGqxZzelQth
-+-----END CERTIFICATE-----
-+
-+// Subject: CN=EM EV TLS CA - G3C, O=eMudhra Inc, C=US
-+// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
-+// Serial Number:
-+//     05:f0:78:75:2d:ec:e7:a1:bb:85:95:d3:03:16:71:71
-+-----BEGIN CERTIFICATE-----
-+MIIDzTCCArWgAwIBAgIQBfB4dS3s56G7hZXTAxZxcTANBgkqhkiG9w0BAQsFADB7
-+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
-+VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
-+AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTI1MDUxNDAwMDAwMFoXDTI4
-+MTIzMTIzNTk1OVowQDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC2VNdWRocmEgSW5j
-+MRswGQYDVQQDDBJFTSBFViBUTFMgQ0EgLSBHM0MwdjAQBgcqhkjOPQIBBgUrgQQA
-+IgNiAAQtVugppvuCxkpGl9lgr5UekGeukfkm00MG2kioqut4abamfm0nQm4EQqoD
-+s24ZiN/2NlFO4c8H9bpLP/KgZkWufTHVhmrTGqPSRusLMXfumct1ZsUWznSAimaP
-+kfDEf8qjggE0MIIBMDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd
-+BgNVHQ4EFgQUpiVegKlNt/OWfBvHkd+SvO5L618wDgYDVR0PAQH/BAQDAgEGMBIG
-+A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-+MDAGA1UdIAQpMCcwBwYFZ4EMAQEwDQYLKwYBBAGDjiEBAAEwDQYLKwYBBAGDjiEB
-+AngwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFB
-+Q2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUF
-+BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQELBQADggEB
-+AIFfHiaMSjnrdZygRYV4ekRBmG7ybcFk4hGQWMMyMFi0cAEk2+dGfz5bl8IaIbLq
-+z+uVJzhOgVEX7WqIfgbWfFsfPYHYjPHBmy7SlZ3BwA86IQ6qF/etpX2/qL9A5yRN
-+N3nVowUpaqV6H3aCpkAh3wR2ZNkvAbLDvPz3J0l+sEWjWv+ZISOV4R+hXDTdPXV0
-+1lKxnbwqEsdo/sE2QkCDKwFrZh/0uKjWspydJj+jSaDLTrGNx50Dgmn7VEcD1ZI5
-+FXjknVUiO25YlmS1dtVZSBbyUKSjlrP/yDwPcZunoAsmCAAtCKsFLviLaymzvsKI
-+eSSDGxpSySp2VCxompGDk8g=
-+-----END CERTIFICATE-----
-diff --git a/test/jdk/sun/security/lib/CheckBlockedCerts.java b/test/jdk/sun/security/lib/CheckBlockedCerts.java
-index 5afbf4b61..f739b022b 100644
---- a/test/jdk/sun/security/lib/CheckBlockedCerts.java
-+++ b/test/jdk/sun/security/lib/CheckBlockedCerts.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -56,21 +56,19 @@ public class CheckBlockedCerts {
-             }
-         }
- 
--        // All certs in the pem files
--        Set<Certificate> blocked = new HashSet<>();
--
-         // Assumes the full src is available
-         File blockedCertsFile = new File(System.getProperty("test.src"),
-                 "../../../../../src/java.base/share/data/blockedcertsconverter/blocked.certs.pem");
- 
-         CertificateFactory cf = CertificateFactory.getInstance("X.509");
-+        int expectedCount = 0;
-         try (FileInputStream fis = new FileInputStream(blockedCertsFile)) {
-             Collection<? extends Certificate> certs
-                     = cf.generateCertificates(fis);
-             System.out.println(certs.size());
-             for (Certificate c: certs) {
--                blocked.add(c);
-                 X509Certificate cert = ((X509Certificate)c);
-+                expectedCount += cert.getSigAlgName().contains("ECDSA") ? 4 : 2;
-                 if (!UntrustedCertificates.isUntrusted(cert)) {
-                     System.out.println(cert.getSubjectX500Principal() +
-                             " is trusted");
-@@ -101,11 +99,11 @@ public class CheckBlockedCerts {
-                 failed = true;
-             }
-             // There are two unique fingerprints for each RSA certificate
--            if (ccount != blocked.size() * 2
--                    && !blocked.isEmpty()) {
-+            if (ccount != expectedCount
-+                    && expectedCount != 0) {
-                 System.out.println("Wrong blocked.certs size: "
--                        + ccount + " fingerprints, "
--                        + blocked.size() + " certs");
-+                        + ccount + " fingerprints, expected"
-+                        + expectedCount);
-                 failed = true;
-             }
-         }
--- 
-2.54.0 (Apple Git-157)
-

diff --git a/NEWS b/NEWS
index 5dff8e0..32e834a 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,133 @@ Key:
 JDK-X  - https://bugs.openjdk.java.net/browse/JDK-X
 CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release OpenJDK 21.0.13.1 (2026-11-17):
+==============================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk210131
+
+* CVEs
+  - CVE-2026-114938
+  - CVE-2026-114939
+  - CVE-2026-114940
+  - CVE-2026-114941
+  - CVE-2026-114942
+  - CVE-2026-114943
+  - CVE-2026-114944
+  - CVE-2026-114945
+  - CVE-2026-114946
+* Changes
+  - JDK-8316771: Krb5.java has not defined messages for all error codes
+  - JDK-8387162: Enhance Kerberos tickets
+  - JDK-8387541: Enhance StringBuilder checks
+  - JDK-8389830: Enhance JFR Events
+  - JDK-8389989: Enhance loop handling
+  - JDK-8390694: Enhance vector masks
+  - JDK-8390852: Improve integer compression
+  - JDK-8391595: [REDO] Enhance JMX Connections
+  - JDK-8393195: Update Libpng to 1.6.59
+  - JDK-8393212: Base64 optimization improvements
+  - JDK-8393456: Improve TLS client connections
+  - JDK-8394492: Update FreeType to 2.15.0
+  - JDK-8394664: Bump update version for OpenJDK: jdk-21.0.13.1
+  - JDK-8395690: CA certificate improvements
+  - JDK-8396048: (tz) Update to tzdata2026f
+
+Notes on individual issues:
+===========================
+
+security-libs/org.ietf.jgss:krb5:
+
+JDK-8387162: Enhance Kerberos tickets
+=====================================
+A Kerberos Ticket-Granting Ticket (TGT) may contain a transited field
+[0] which lists the other realms the ticket has passed through.  With
+this OpenJDK release, this field is now checked to make sure that each
+transited realm is in the list of allowed realms retrieved from
+sun.security.krb5.Realm.getRealmsList(String, String).  If the check
+fails, a KrbApErrException is thrown with KRB_AP_PATH_NOT_ACCEPTED as
+the reason.
+
+This check is enabled by default.  To retain the original behaviour,
+the new System property
+`sun.security.krb5.acceptor.checkTransitedPolicy` should be set to
+`false`.
+
+[0] https://datatracker.ietf.org/doc/html/rfc4120#section-3.3.3.2
+
+JDK-8391595: [REDO] Enhance JMX Connections
+===========================================
+The RMI stub URL service:jmx:rmi:///stub/<base64> carries a serialized
+Java object, encoded as base64.  With this OpenJDK release,
+deserialization of this object is now filtered to ensure it is of an
+appropriate type.  The default list of approved types is:
+
+* "java.lang.reflect.Proxy;"
+* "java.rmi.server.RemoteObjectInvocationHandler;"
+* "com.sun.proxy.$Proxy*;"
+* "java.rmi.server.RemoteStub;"
+* "java.rmi.server.RemoteObject;"
+* "javax.management.remote.rmi.RMIServerImpl_Stub;"
+
+This list is always checked.  Additional classes may be prepended to
+the list by using the environment map passed to the `connect` method
+and by setting a System property.  Both settings share the same key
+`jmx.remote.rmi.connector.url.filter.pattern` and both sources of
+additional classes are always checked.
+
+New in release OpenJDK 21.0.13.0.3 (2026-10-27):
+================================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk2112
+
+* CVEs
+  - CVE-2026-114820
+* Changes
+  - JDK-8385585: EmSignRootG2CA.java test fails with: couldn't determine EE certificate status
+  - JDK-8395690: CA certificate improvements
+  - JDK-8395788: Bump update version for OpenJDK: jdk-21.0.13.0.3
+  - JDK-8395978: [21u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 21.0.13.0.3
+
+Notes on individual issues:
+===========================
+
+JDK-8395690: CA certificate improvements
+========================================
+The following root certificates associated with eMudhra have been
+removed from the `cacerts` keystore:
+
+Alias Name: comodoaaaca [jdk]
+Distinguished Name: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
+SHA256: D7:A7:A0:FB:5D:7E:27:31:D7:71:E9:48:4E:BC:DE:F7:1D:5F:0C:3E:0A:29:48:78:2B:C8:3E:E0:EA:69:9E:F4
+
+Alias Name: emsignrootcag1 [jdk]
+Distinguished Name: CN=emSign Root CA - G1, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
+SHA256: 40:F6:AF:03:46:A9:9A:A1:CD:1D:55:5A:4E:9C:CE:62:C7:F9:63:46:03:EE:40:66:15:83:3D:C8:C8:D0:03:67
+
+Alias Name: emsigneccrootcag3 [jdk]
+Distinguished Name: CN=emSign ECC Root CA - G3, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
+SHA256: 86:A1:EC:BA:08:9C:4A:8D:3B:BE:27:34:C6:12:BA:34:1D:81:3E:04:3C:F9:E8:A8:62:CD:5C:57:A3:6B:BE:6B
+
+Alias Name: emsignrootcag2 [jdk]
+Distinguished Name: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
+SHA256: 1A:A0:C2:70:9E:83:1B:D6:E3:B5:12:9A:00:BA:41:F7:EE:EF:02:08:72:F1:E6:50:4B:F0:F6:C3:F2:4F:3A:F3
+
+New in release OpenJDK 21.0.13.0.2 (2026-10-22):
+================================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk2112
+
+* CVEs
+  - CVE-2026-91403
+* Changes
+  - JDK-8395142: CA Enhancements
+  - JDK-8395373: Bump update version for OpenJDK: jdk-21.0.13.0.2
+  - JDK-8395623: [21u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 21.0.13.0.2
+
 New in release OpenJDK 21.0.13 (2026-10-20):
-============================================
+===========================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk2112
 
 * CVEs
   - CVE-2026-83374
@@ -14,38 +139,38 @@ New in release OpenJDK 21.0.13 (2026-10-20):
   - CVE-2026-83381
   - CVE-2026-83387
   - CVE-2026-83395
-  - CVE-2026-87294
+  - CVE-2026-83400
   - CVE-2026-87290
   - CVE-2026-87291
   - CVE-2026-87292
-  - CVE-2026-83400
+  - CVE-2026-87294
+  - CVE-2026-87367
+  - CVE-2026-91332
   - CVE-2026-91333
   - CVE-2026-91334
-  - CVE-2026-87367
   - CVE-2026-91335
+  - CVE-2026-91373
+  - CVE-2026-91374
   - CVE-2026-91375
   - CVE-2026-91379
+  - CVE-2026-91379
   - CVE-2026-91380
-  - CVE-2026-91373
-  - CVE-2026-91332
-  - CVE-2026-91382
-  - CVE-2026-91374
   - CVE-2026-91394
   - CVE-2026-91397
   - CVE-2026-91398
   - CVE-2026-91400
   - CVE-2026-91410
-  - CVE-2026-91411
   - CVE-2026-91415
+  - CVE-2026-91418
   - CVE-2026-91451
   - CVE-2026-91452
   - CVE-2026-91453
-  - CVE-2026-91418
   - CVE-2026-91461
   - CVE-2026-91462
   - CVE-2026-91463
   - CVE-2026-91464
   - CVE-2026-91487
+  - CVE-2026-101516
 * Changes
   - JDK-7067310: 3 tests from closed/javax/sound/sampled caused BSOD on win 7 x86
   - JDK-8189441: Define algorithm names for keys derived from KeyAgreement
@@ -151,7 +276,7 @@ New in release OpenJDK 21.0.13 (2026-10-20):
   - JDK-8384654: Enhance Template Handling
   - JDK-8384664: Enhance Image Handling
   - JDK-8384688: Enhance jmod handling
-  - JDK-8384736: Enhance JShell 8387235: JShell tests failing
+  - JDK-8384736: Enhance JShell
   - JDK-8384746: Enhance Preferences
   - JDK-8384771: Enhance TLS handshakes
   - JDK-8384804: JMX remote bootstrap tests fail on Windows
@@ -171,7 +296,6 @@ New in release OpenJDK 21.0.13 (2026-10-20):
   - JDK-8386515: Enhance HTTP server parsing
   - JDK-8386525: Enhance HTTP Server Handler
   - JDK-8386535: Improve HTTP headers
-  - JDK-8386551: Windows build broken because of MSys2/Make update
   - JDK-8386552: Enhance GIF loading
   - JDK-8386578: double_keccak stub does not set its return value on x86
   - JDK-8386783: WebRowSet empty elements read value of previous element
@@ -180,6 +304,7 @@ New in release OpenJDK 21.0.13 (2026-10-20):
   - JDK-8387123: Remove LuxTrust Global Root CA
   - JDK-8387152: Enhance krb5 tokens
   - JDK-8387217: Enhance krb5 client
+  - JDK-8387235: JShell tests failing
   - JDK-8387238: Enhance Kerberos validation
   - JDK-8387593: Using XOR mode to clear the content leaves some traces in metal
   - JDK-8387625: Add "dt_socket" to `CheckedFeatures.notImplemented` for Windows/ARM64
@@ -201,30 +326,104 @@ New in release OpenJDK 21.0.13 (2026-10-20):
   - JDK-8393344: Cherry-pick metazone changes from CLDR to support tzdata2026e for JDK update releases
   - JDK-8393848: Align the JDK with Microsoft's new timezone name for Manitoba
   - JDK-8394265: [21u] Add explicit zone offset test for America/Rainy_River
+  - JDK-8394844: [21u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 21.0.13
 
 Notes on individual issues:
 ===========================
 
+core-libs/java.sql:
+
+JDK-8383301: Enhance WebRowSets
+===============================
+WebRowSet XML is now validated against the standard schema, which is
+packaged with this release (webrowset.xsd and sqlxml.xsd).  If
+validation causes issues with legacy documents, it may be disabled by
+setting the new System property `jdk.sql.rowset.webrowsetValidation`
+to `false`.
+
+core-libs/javax.naming:
+
+JDK-8382407: Enhance LDAP Lookups
+=================================
+In the October 2024 security update, the LDAP provider was altered to
+require an explicit opt-in for the transparent deserialisation of Java
+objects.  Since that release, applications that wish to reconstruct
+Java objects and RMI stubs from LDAP attributes have needed to set the
+System property `com.sun.jndi.ldap.object.trustSerialData` to `true`.
+
+A new System property is introduced in this release,
+`jdk.jndi.ldap.disabledURLSchemes`, to increase the flexibility of
+this filtering.  By default, the setting of this new property will
+follow `com.sun.jndi.ldap.object.trustSerialData` by being set to
+empty if `trustSerialData` is `true` (i.e. no filtering) and "rmi" if
+`trustSerialData` is `false` (the default).  Setting the new property
+to a comma-separated list of schemes allows further filtering to be
+specified, superseding the limited filtering of `trustSerialData`.
+
 hotspot/compiler:
 
-JDK-8348561, JDK-8351034: Improved ML-DSA Performance
-=====================================================
-This release contains significant performance improvements to ML-DSA operations,
-on platforms that support AVX-512 instructions.
+JDK-8341527: AVX-512 intrinsic for SHA3
+=======================================
+The release includes a SHA3 intrinsic for x86_64 platforms with the
+AVX-512 Byte and Word (BW) instructions, providing a 30-40% performance improvement,
+depending on the length of the digested message.
 
-JDK-8349721, JDK-8351412: Improved ML-KEM Performance
-=====================================================
-This release contains significant performance improvements to ML-DSA operations,
-on aarch64 platforms and on platforms that support AVX-512 instructions.
+security-libs/java.security:
 
-JDK-8341527: SHA3 Performance Improved
-======================================
-The HotSpot performance on the SHA3-512, SHA3-384, SHA3-256, and SHA3-224
-`MessageDigest` algorithms has been somewhat improved on some platforms, and
-significantly improved on platforms that support AVX-512 instructions.
+JDK-8298387: Implement JEP 497: Quantum-Resistant Module-Lattice-Based Digital Signature Algorithm
+==================================================================================================
+This release enhances the security of Java applications by providing
+an implementation of the quantum-resistant Module-Lattice-Based
+Digital Signature Algorithm (ML-DSA). Digital signatures are used to
+detect unauthorized modifications to data and to authenticate the
+identity of signatories. ML-DSA is designed to be secure against
+future quantum computing attacks. It has been standardized by the
+United States National Institute of Standards and Technology (NIST) in
+FIPS 204 [0].
+
+[0] https://csrc.nist.gov/pubs/fips/204/final
+
+JDK-8333867: SHA3 performance can be improved
+=============================================
+The performance of the SHA3 family of `MessageDigest` implementations
+(SHA3-224, SHA3-256, SHA3-384, SHA3-512) in this release has been
+improved by 6-27%, depending on the length of the digested message and
+the platform being used.
+
+JDK-8354305: SHAKE128 and SHAKE256 MessageDigest algorithms
+===========================================================
+This release introduces two new `MessageDigest` implementations in the
+`SUN` provider, `SHAKE128-256` and `SHAKE256-512`.  These
+implementations use fixed-length versions of the SHAKE128 and SHAKE256
+eXtendable-Output Functions (XOFs) defined by the United States
+National Institute of Standards and Technology (NIST) in FIPS 202 [0].
+
+[0] https://csrc.nist.gov/pubs/fips/202/final
+
+JDK-8387123: Remove LuxTrust Global Root CA
+===========================================
+The following root certificate from LuxTrust has been removed from the
+`cacerts` keystore:
+
+Alias Name: luxtrustglobalrootca [jdk]
+Distinguished Name: CN=LuxTrust Global Root, O=LuxTrust s.a., C=LU
+SHA256: A1:B2:DB:EB:64:E7:06:C6:16:9E:3C:41:18:B2:3B:AA:09:01:8A:84:27:66:6D:8B:F0:E2:88:91:EC:05:19:50
 
 security-libs/javax.crypto:
 
+JDK-8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism
+==================================================================================================
+This release enhances the security of Java applications by providing
+an implementation of the quantum-resistant Module-Lattice-Based
+Key-Encapsulation Mechanism (ML-KEM). Key encapsulation mechanisms
+(KEMs) are used to secure symmetric keys over insecure communication
+channels using public key cryptography. ML-KEM is designed to be
+secure against future quantum computing attacks. It has been
+standardized by the United States National Institute of Standards and
+Technology (NIST) in FIPS 203 [0].
+
+[0] https://csrc.nist.gov/pubs/fips/203/final
+
 JDK-8347938: Add Support for the Latest ML-KEM and ML-DSA Private Key Encodings
 ===============================================================================
 This release of OpenJDK adds support for encoding ML-KEM and ML-DSA
@@ -259,29 +458,33 @@ property.
 [0] https://www.rfc-editor.org/rfc/rfc9935.html#name-private-key-format
 [1] https://www.rfc-editor.org/rfc/rfc9881.html#name-private-key-format
 
-security-libs/java.security:
+tools/jshell:
 
-JDK-8354305: New MessageDigest Algorithms, SHAKE128-256 and SHAKE256-512
-========================================================================
-This release introduces SHAKE128-256 and SHAKE256-512 `MessageDigest` algorithms
-to the SUN provider.
+JDK-8384736: Enhance JShell
+===========================
+Changes in this update have led to a minor change to the jdk.jshell
+API.  The method `extensionCommand(String command, Object arg)` in the
+`jdk.jshell.execution.StreamingExecutionControl` class now always
+throws `NotImplementedException`, whereas it previously could throw
+one of `RunException`, `EngineTerminationException` or
+`InternalException`.
 
-JDK-8333867: SHA3 Performance Improved
-======================================
-The performance of the SHA3-512, SHA3-384, SHA3-256, and SHA3-224
-`MessageDigest` algorithms has been somewhat improved on some platforms, and
-significantly improved on platforms that support AVX-512 instructions.
+xml/jaxp:
 
-JDK-8387123: LuxTrust Global Root CA Removed
-============================================
-The following root certificates from LuxTrust has been removed from the
-`cacerts` keystore:
+JDK-8383699: Enhance XPath Expressions
+======================================
+The XSLT function `system-property()` can be used to access system
+properties of the JDK.  In this release, this access is now restricted
+to those properties defined by XSLT.  To access all system properties
+as before, the new System property `jdk.xml.allowNonXSLTSysProps` must
+be set to `true`.
 
-Alias name: luxtrustglobalrootca [jdk]
-CN=LuxTrust Global Root
-O=LuxTrust s.a.
-C=LU
-SHA256: A1:B2:DB:EB:64:E7:06:C6:16:9E:3C:41:18:B2:3B:AA:09:01:8A:84:27:66:6D:8B:F0:E2:88:91:EC:05:19:50
+JDK-8384654: Enhance Template Handling
+======================================
+In this release, the deserialization of instances of the
+`TemplatesImpl` class is now disabled by default.  To re-enable
+deserialization, the System property
+`jdk.xml.enableTemplatesImplDeserialization` must be set to `true`
 
 New in release OpenJDK 21.0.12.1 (2026-08-18):
 ==============================================
@@ -5350,3 +5553,4 @@ JVM. These warnings aim to prepare users for a future release which
 disallows the dynamic loading of agents by default in order to improve
 integrity by default. Serviceability tools that load agents at startup
 will not cause warnings to be issued in any release.
+

diff --git a/fips-21u-133f17d2ac4.patch b/fips-21u-133f17d2ac4.patch
deleted file mode 100644
index 2881c37..0000000
--- a/fips-21u-133f17d2ac4.patch
+++ /dev/null
@@ -1,4305 +0,0 @@
-diff --git a/make/autoconf/build-aux/pkg.m4 b/make/autoconf/build-aux/pkg.m4
-index 5f4b22bb27f..1ca9f5b8ffe 100644
---- a/make/autoconf/build-aux/pkg.m4
-+++ b/make/autoconf/build-aux/pkg.m4
-@@ -179,3 +179,19 @@ else
- 	ifelse([$3], , :, [$3])
- fi[]dnl
- ])# PKG_CHECK_MODULES
-+
-+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------
-+dnl Since: 0.28
-+dnl
-+dnl Retrieves the value of the pkg-config variable for the given module.
-+AC_DEFUN([PKG_CHECK_VAR],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-+
-+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-+AS_VAR_COPY([$1], [pkg_cv_][$1])
-+
-+AS_VAR_IF([$1], [""], [$5], [$4])dnl
-+])dnl PKG_CHECK_VAR
-diff --git a/make/autoconf/lib-sysconf.m4 b/make/autoconf/lib-sysconf.m4
-new file mode 100644
-index 00000000000..f48fc7f7e80
---- /dev/null
-+++ b/make/autoconf/lib-sysconf.m4
-@@ -0,0 +1,87 @@
-+#
-+# 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([for NSS library directory])
-+  PKG_CHECK_VAR(NSS_LIBDIR, nss, libdir, [AC_MSG_RESULT([$NSS_LIBDIR])], [AC_MSG_RESULT([not found])])
-+
-+  AC_MSG_CHECKING([whether to link 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)
-+  AC_SUBST(NSS_LIBDIR)
-+])
-diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
-index 51d4f724c33..feb0bcf3e75 100644
---- a/make/autoconf/libraries.m4
-+++ b/make/autoconf/libraries.m4
-@@ -35,6 +35,7 @@ m4_include([lib-std.m4])
- m4_include([lib-x11.m4])
- 
- m4_include([lib-tests.m4])
-+m4_include([lib-sysconf.m4])
- 
- ################################################################################
- # Determine which libraries are needed for this configuration
-@@ -128,6 +129,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
-   LIB_SETUP_X11
- 
-   LIB_TESTS_SETUP_GTEST
-+  LIB_SETUP_SYSCONF_LIBS
- 
-   BASIC_JDKLIB_LIBS=""
-   BASIC_JDKLIB_LIBS_TARGET=""
-diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
-index 7f085676ca9..2476b9ae964 100644
---- a/make/autoconf/spec.gmk.in
-+++ b/make/autoconf/spec.gmk.in
-@@ -822,6 +822,11 @@ PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@
- # Libraries
- #
- 
-+USE_SYSCONF_NSS:=@USE_SYSCONF_NSS@
-+NSS_LIBS:=@NSS_LIBS@
-+NSS_CFLAGS:=@NSS_CFLAGS@
-+NSS_LIBDIR:=@NSS_LIBDIR@
-+
- USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
- LCMS_CFLAGS:=@LCMS_CFLAGS@
- LCMS_LIBS:=@LCMS_LIBS@
-diff --git a/make/modules/java.base/Gendata.gmk b/make/modules/java.base/Gendata.gmk
-index 9e5cfe2d0fc..434ade8e182 100644
---- a/make/modules/java.base/Gendata.gmk
-+++ b/make/modules/java.base/Gendata.gmk
-@@ -98,3 +98,17 @@ $(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS_JDK) $(GENDATA_JAVA_SECURITY_SRC) $(REST
- TARGETS += $(GENDATA_JAVA_SECURITY)
- 
- ################################################################################
-+
-+GENDATA_NSS_FIPS_CFG_SRC := $(TOPDIR)/src/java.base/share/conf/security/nss.fips.cfg.in
-+GENDATA_NSS_FIPS_CFG := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/nss.fips.cfg
-+
-+$(GENDATA_NSS_FIPS_CFG): $(GENDATA_NSS_FIPS_CFG_SRC)
-+	$(call LogInfo, Generating nss.fips.cfg)
-+	$(call MakeTargetDir)
-+	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_$(@F), \
-+	    ( $(SED) -e 's:@NSS_LIBDIR@:$(NSS_LIBDIR):g' $< ) > $@ \
-+	)
-+
-+TARGETS += $(GENDATA_NSS_FIPS_CFG)
-+
-+################################################################################
-diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
-index 1e0f66726d0..59fe923f2c5 100644
---- a/make/modules/java.base/Lib.gmk
-+++ b/make/modules/java.base/Lib.gmk
-@@ -163,6 +163,29 @@ 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
-+
-+$(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)
-+
- ################################################################################
- # Create the symbols file for static builds.
- 
-diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
-index 0a5cb1abc4d..81cc931a10c 100644
---- a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
-+++ b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
-@@ -31,6 +31,7 @@ import java.security.SecureRandom;
- import java.security.PrivilegedAction;
- import java.util.HashMap;
- import java.util.List;
-+import jdk.internal.access.SharedSecrets;
- import static sun.security.util.SecurityConstants.PROVIDER_VER;
- import static sun.security.util.SecurityProviderConstants.*;
- 
-@@ -84,6 +85,10 @@ import static sun.security.util.SecurityProviderConstants.*;
- 
- public final class SunJCE extends Provider {
- 
-+    private static final boolean systemFipsEnabled =
-+            SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
-+            .isSystemFipsEnabled();
-+
-     @java.io.Serial
-     private static final long serialVersionUID = 6812507587804302833L;
- 
-@@ -149,301 +154,302 @@ public final class SunJCE extends Provider {
-     void putEntries() {
-         // reuse attribute map and reset before each reuse
-         HashMap<String, String> attrs = new HashMap<>(3);
--        attrs.put("SupportedKeyClasses",
--                "java.security.interfaces.RSAPublicKey" +
--                "|java.security.interfaces.RSAPrivateKey");
--        ps("Signature", "NONEwithRSA",
--                "com.sun.crypto.provider.RSACipherAdaptor", null, attrs);
--        // continue adding cipher specific attributes
--        attrs.put("SupportedModes", "ECB");
--        attrs.put("SupportedPaddings", "NOPADDING|PKCS1PADDING|OAEPPADDING"
--                + "|OAEPWITHMD5ANDMGF1PADDING"
--                + "|OAEPWITHSHA1ANDMGF1PADDING"
--                + "|OAEPWITHSHA-1ANDMGF1PADDING"
--                + "|OAEPWITHSHA-224ANDMGF1PADDING"
--                + "|OAEPWITHSHA-256ANDMGF1PADDING"
--                + "|OAEPWITHSHA-384ANDMGF1PADDING"
--                + "|OAEPWITHSHA-512ANDMGF1PADDING"
--                + "|OAEPWITHSHA-512/224ANDMGF1PADDING"
--                + "|OAEPWITHSHA-512/256ANDMGF1PADDING");
--        ps("Cipher", "RSA",
--                "com.sun.crypto.provider.RSACipher", null, attrs);
--
--        // common block cipher modes, pads
--        final String BLOCK_MODES = "ECB|CBC|PCBC|CTR|CTS|CFB|OFB" +
--            "|CFB8|CFB16|CFB24|CFB32|CFB40|CFB48|CFB56|CFB64" +
--            "|OFB8|OFB16|OFB24|OFB32|OFB40|OFB48|OFB56|OFB64";
--        final String BLOCK_MODES128 = BLOCK_MODES +
--            "|CFB72|CFB80|CFB88|CFB96|CFB104|CFB112|CFB120|CFB128" +
--            "|OFB72|OFB80|OFB88|OFB96|OFB104|OFB112|OFB120|OFB128";
--        final String BLOCK_PADS = "NOPADDING|PKCS5PADDING|ISO10126PADDING";
--
--        attrs.clear();
--        attrs.put("SupportedModes", BLOCK_MODES);
--        attrs.put("SupportedPaddings", BLOCK_PADS);
--        attrs.put("SupportedKeyFormats", "RAW");
--        ps("Cipher", "DES",
--                "com.sun.crypto.provider.DESCipher", null, attrs);
--        psA("Cipher", "DESede", "com.sun.crypto.provider.DESedeCipher",
--                attrs);
--        ps("Cipher", "Blowfish",
--                "com.sun.crypto.provider.BlowfishCipher", null, attrs);
--
--        ps("Cipher", "RC2",
--                "com.sun.crypto.provider.RC2Cipher", null, attrs);
--
--        attrs.clear();
--        attrs.put("SupportedModes", BLOCK_MODES128);
--        attrs.put("SupportedPaddings", BLOCK_PADS);
--        attrs.put("SupportedKeyFormats", "RAW");
--        psA("Cipher", "AES",
--                "com.sun.crypto.provider.AESCipher$General", attrs);
--
--        attrs.clear();
--        attrs.put("SupportedKeyFormats", "RAW");
--        psA("Cipher", "AES/KW/NoPadding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES_KW_NoPadding",
--                attrs);
--        ps("Cipher", "AES/KW/PKCS5Padding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES_KW_PKCS5Padding",
--                null, attrs);
--        psA("Cipher", "AES/KWP/NoPadding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES_KWP_NoPadding",
--                attrs);
--
--        psA("Cipher", "AES_128/ECB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES128_ECB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_128/CBC/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES128_CBC_NoPadding",
--                attrs);
--        psA("Cipher", "AES_128/OFB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES128_OFB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_128/CFB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES128_CFB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_128/KW/NoPadding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_NoPadding",
--                attrs);
--        ps("Cipher", "AES_128/KW/PKCS5Padding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_PKCS5Padding",
--                null, attrs);
--        psA("Cipher", "AES_128/KWP/NoPadding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES128_KWP_NoPadding",
--                attrs);
--
--        psA("Cipher", "AES_192/ECB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES192_ECB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_192/CBC/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES192_CBC_NoPadding",
--                attrs);
--        psA("Cipher", "AES_192/OFB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES192_OFB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_192/CFB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES192_CFB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_192/KW/NoPadding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_NoPadding",
--                attrs);
--        ps("Cipher", "AES_192/KW/PKCS5Padding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_PKCS5Padding",
--                null, attrs);
--        psA("Cipher", "AES_192/KWP/NoPadding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES192_KWP_NoPadding",
--                attrs);
--
--        psA("Cipher", "AES_256/ECB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES256_ECB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_256/CBC/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES256_CBC_NoPadding",
--                attrs);
--        psA("Cipher", "AES_256/OFB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES256_OFB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_256/CFB/NoPadding",
--                "com.sun.crypto.provider.AESCipher$AES256_CFB_NoPadding",
--                attrs);
--        psA("Cipher", "AES_256/KW/NoPadding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_NoPadding",
--                attrs);
--        ps("Cipher", "AES_256/KW/PKCS5Padding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_PKCS5Padding",
--                null, attrs);
--        psA("Cipher", "AES_256/KWP/NoPadding",
--                "com.sun.crypto.provider.KeyWrapCipher$AES256_KWP_NoPadding",
--                attrs);
--
--        attrs.clear();
--        attrs.put("SupportedModes", "GCM");
--        attrs.put("SupportedKeyFormats", "RAW");
--
--        ps("Cipher", "AES/GCM/NoPadding",
--                "com.sun.crypto.provider.GaloisCounterMode$AESGCM", null,
--                attrs);
--        psA("Cipher", "AES_128/GCM/NoPadding",
--                "com.sun.crypto.provider.GaloisCounterMode$AES128",
--                attrs);
--        psA("Cipher", "AES_192/GCM/NoPadding",
--                "com.sun.crypto.provider.GaloisCounterMode$AES192",
--                attrs);
--        psA("Cipher", "AES_256/GCM/NoPadding",
--                "com.sun.crypto.provider.GaloisCounterMode$AES256",
--                attrs);
--
--        attrs.clear();
--        attrs.put("SupportedModes", "CBC");
--        attrs.put("SupportedPaddings", "NOPADDING");
--        attrs.put("SupportedKeyFormats", "RAW");
--        ps("Cipher", "DESedeWrap",
--                "com.sun.crypto.provider.DESedeWrapCipher", null, attrs);
--
--        attrs.clear();
--        attrs.put("SupportedModes", "ECB");
--        attrs.put("SupportedPaddings", "NOPADDING");
--        attrs.put("SupportedKeyFormats", "RAW");
--        psA("Cipher", "ARCFOUR",
--                "com.sun.crypto.provider.ARCFOURCipher", attrs);
--
--        attrs.clear();
--        attrs.put("SupportedKeyFormats", "RAW");
--        ps("Cipher",  "ChaCha20",
--                "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Only",
--                null, attrs);
--        psA("Cipher",  "ChaCha20-Poly1305",
--                "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305",
--                attrs);
--
--        // PBES1
--        psA("Cipher", "PBEWithMD5AndDES",
--                "com.sun.crypto.provider.PBEWithMD5AndDESCipher",
--                null);
--        ps("Cipher", "PBEWithMD5AndTripleDES",
--                "com.sun.crypto.provider.PBEWithMD5AndTripleDESCipher");
--        psA("Cipher", "PBEWithSHA1AndDESede",
--                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndDESede",
--                null);
--        psA("Cipher", "PBEWithSHA1AndRC2_40",
--                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_40",
--                null);
--        psA("Cipher", "PBEWithSHA1AndRC2_128",
--                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_128",
--                null);
--        psA("Cipher", "PBEWithSHA1AndRC4_40",
--                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_40",
--                null);
--
--        psA("Cipher", "PBEWithSHA1AndRC4_128",
--                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_128",
--                null);
--
--        // PBES2
--        ps("Cipher", "PBEWithHmacSHA1AndAES_128",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_128");
--
--        ps("Cipher", "PBEWithHmacSHA224AndAES_128",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_128");
--
--        ps("Cipher", "PBEWithHmacSHA256AndAES_128",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_128");
--
--        ps("Cipher", "PBEWithHmacSHA384AndAES_128",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_128");
--
--        ps("Cipher", "PBEWithHmacSHA512AndAES_128",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_128");
--
--        ps("Cipher", "PBEWithHmacSHA512/224AndAES_128",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA512_224AndAES_128");
--
--        ps("Cipher", "PBEWithHmacSHA512/256AndAES_128",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_128");
--
--
--        ps("Cipher", "PBEWithHmacSHA1AndAES_256",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_256");
--
--        ps("Cipher", "PBEWithHmacSHA224AndAES_256",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_256");
--
--        ps("Cipher", "PBEWithHmacSHA256AndAES_256",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_256");
--
--        ps("Cipher", "PBEWithHmacSHA384AndAES_256",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_256");
--
--        ps("Cipher", "PBEWithHmacSHA512AndAES_256",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_256");
--
--        ps("Cipher", "PBEWithHmacSHA512/224AndAES_256",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA512_224AndAES_256");
--
--        ps("Cipher", "PBEWithHmacSHA512/256AndAES_256",
--                "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_256");
--
--        /*
--         * Key(pair) Generator engines
--         */
--        ps("KeyGenerator", "DES",
--                "com.sun.crypto.provider.DESKeyGenerator");
--        psA("KeyGenerator", "DESede",
--                "com.sun.crypto.provider.DESedeKeyGenerator",
--                null);
--        ps("KeyGenerator", "Blowfish",
--                "com.sun.crypto.provider.BlowfishKeyGenerator");
--        psA("KeyGenerator", "AES",
--                "com.sun.crypto.provider.AESKeyGenerator",
--                null);
--        ps("KeyGenerator", "RC2",
--                "com.sun.crypto.provider.KeyGeneratorCore$RC2KeyGenerator");
--        psA("KeyGenerator", "ARCFOUR",
--                "com.sun.crypto.provider.KeyGeneratorCore$ARCFOURKeyGenerator",
--                null);
--        ps("KeyGenerator", "ChaCha20",
--                "com.sun.crypto.provider.KeyGeneratorCore$ChaCha20KeyGenerator");
--        ps("KeyGenerator", "HmacMD5",
--                "com.sun.crypto.provider.HmacMD5KeyGenerator");
--
--        psA("KeyGenerator", "HmacSHA1",
--                "com.sun.crypto.provider.HmacSHA1KeyGenerator", null);
--        psA("KeyGenerator", "HmacSHA224",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA224",
--                null);
--        psA("KeyGenerator", "HmacSHA256",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA256",
--                null);
--        psA("KeyGenerator", "HmacSHA384",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA384",
--                null);
--        psA("KeyGenerator", "HmacSHA512",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512",
--                null);
--        psA("KeyGenerator", "HmacSHA512/224",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_224",
--                null);
--        psA("KeyGenerator", "HmacSHA512/256",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_256",
--                null);
--
--        psA("KeyGenerator", "HmacSHA3-224",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_224",
--                null);
--        psA("KeyGenerator", "HmacSHA3-256",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_256",
--                null);
--        psA("KeyGenerator", "HmacSHA3-384",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_384",
--                null);
--        psA("KeyGenerator", "HmacSHA3-512",
--                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_512",
--                null);
--
--        psA("KeyPairGenerator", "DiffieHellman",
--                "com.sun.crypto.provider.DHKeyPairGenerator",
--                null);
-+        if (!systemFipsEnabled) {
-+            attrs.put("SupportedKeyClasses",
-+                    "java.security.interfaces.RSAPublicKey" +
-+                    "|java.security.interfaces.RSAPrivateKey");
-+            ps("Signature", "NONEwithRSA",
-+               "com.sun.crypto.provider.RSACipherAdaptor", null, attrs);
-+            // continue adding cipher specific attributes
-+            attrs.put("SupportedModes", "ECB");
-+            attrs.put("SupportedPaddings", "NOPADDING|PKCS1PADDING|OAEPPADDING"
-+                    + "|OAEPWITHMD5ANDMGF1PADDING"
-+                    + "|OAEPWITHSHA1ANDMGF1PADDING"
-+                    + "|OAEPWITHSHA-1ANDMGF1PADDING"
-+                    + "|OAEPWITHSHA-224ANDMGF1PADDING"
-+                    + "|OAEPWITHSHA-256ANDMGF1PADDING"
-+                    + "|OAEPWITHSHA-384ANDMGF1PADDING"
-+                    + "|OAEPWITHSHA-512ANDMGF1PADDING"
-+                    + "|OAEPWITHSHA-512/224ANDMGF1PADDING"
-+                    + "|OAEPWITHSHA-512/256ANDMGF1PADDING");
-+            ps("Cipher", "RSA",
-+                    "com.sun.crypto.provider.RSACipher", null, attrs);
-+
-+            // common block cipher modes, pads
-+            final String BLOCK_MODES = "ECB|CBC|PCBC|CTR|CTS|CFB|OFB" +
-+                "|CFB8|CFB16|CFB24|CFB32|CFB40|CFB48|CFB56|CFB64" +
-+                "|OFB8|OFB16|OFB24|OFB32|OFB40|OFB48|OFB56|OFB64";
-+            final String BLOCK_MODES128 = BLOCK_MODES +
-+                "|CFB72|CFB80|CFB88|CFB96|CFB104|CFB112|CFB120|CFB128" +
-+                "|OFB72|OFB80|OFB88|OFB96|OFB104|OFB112|OFB120|OFB128";
-+            final String BLOCK_PADS = "NOPADDING|PKCS5PADDING|ISO10126PADDING";
-+
-+            attrs.clear();
-+            attrs.put("SupportedModes", BLOCK_MODES);
-+            attrs.put("SupportedPaddings", BLOCK_PADS);
-+            attrs.put("SupportedKeyFormats", "RAW");
-+            ps("Cipher", "DES",
-+                    "com.sun.crypto.provider.DESCipher", null, attrs);
-+            psA("Cipher", "DESede", "com.sun.crypto.provider.DESedeCipher",
-+                    attrs);
-+            ps("Cipher", "Blowfish",
-+                    "com.sun.crypto.provider.BlowfishCipher", null, attrs);
-+
-+            ps("Cipher", "RC2",
-+                    "com.sun.crypto.provider.RC2Cipher", null, attrs);
-+
-+            attrs.clear();
-+            attrs.put("SupportedModes", BLOCK_MODES128);
-+            attrs.put("SupportedPaddings", BLOCK_PADS);
-+            attrs.put("SupportedKeyFormats", "RAW");
-+            psA("Cipher", "AES",
-+                    "com.sun.crypto.provider.AESCipher$General", attrs);
-+
-+            attrs.clear();
-+            attrs.put("SupportedKeyFormats", "RAW");
-+            psA("Cipher", "AES/KW/NoPadding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES_KW_NoPadding",
-+                    attrs);
-+            ps("Cipher", "AES/KW/PKCS5Padding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES_KW_PKCS5Padding",
-+                    null, attrs);
-+            psA("Cipher", "AES/KWP/NoPadding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES_KWP_NoPadding",
-+                    attrs);
-+
-+            psA("Cipher", "AES_128/ECB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES128_ECB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_128/CBC/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES128_CBC_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_128/OFB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES128_OFB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_128/CFB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES128_CFB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_128/KW/NoPadding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_NoPadding",
-+                    attrs);
-+            ps("Cipher", "AES_128/KW/PKCS5Padding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_PKCS5Padding",
-+                    null, attrs);
-+            psA("Cipher", "AES_128/KWP/NoPadding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES128_KWP_NoPadding",
-+                    attrs);
-+
-+            psA("Cipher", "AES_192/ECB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES192_ECB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_192/CBC/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES192_CBC_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_192/OFB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES192_OFB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_192/CFB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES192_CFB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_192/KW/NoPadding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_NoPadding",
-+                    attrs);
-+            ps("Cipher", "AES_192/KW/PKCS5Padding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_PKCS5Padding",
-+                    null, attrs);
-+            psA("Cipher", "AES_192/KWP/NoPadding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES192_KWP_NoPadding",
-+                    attrs);
-+
-+            psA("Cipher", "AES_256/ECB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES256_ECB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_256/CBC/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES256_CBC_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_256/OFB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES256_OFB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_256/CFB/NoPadding",
-+                    "com.sun.crypto.provider.AESCipher$AES256_CFB_NoPadding",
-+                    attrs);
-+            psA("Cipher", "AES_256/KW/NoPadding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_NoPadding",
-+                    attrs);
-+            ps("Cipher", "AES_256/KW/PKCS5Padding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_PKCS5Padding",
-+                    null, attrs);
-+            psA("Cipher", "AES_256/KWP/NoPadding",
-+                    "com.sun.crypto.provider.KeyWrapCipher$AES256_KWP_NoPadding",
-+                    attrs);
-+
-+            attrs.clear();
-+            attrs.put("SupportedModes", "GCM");
-+            attrs.put("SupportedKeyFormats", "RAW");
-+
-+            ps("Cipher", "AES/GCM/NoPadding",
-+                    "com.sun.crypto.provider.GaloisCounterMode$AESGCM", null,
-+                    attrs);
-+            psA("Cipher", "AES_128/GCM/NoPadding",
-+                    "com.sun.crypto.provider.GaloisCounterMode$AES128",
-+                    attrs);
-+            psA("Cipher", "AES_192/GCM/NoPadding",
-+                    "com.sun.crypto.provider.GaloisCounterMode$AES192",
-+                    attrs);
-+            psA("Cipher", "AES_256/GCM/NoPadding",
-+                    "com.sun.crypto.provider.GaloisCounterMode$AES256",
-+                    attrs);
-+
-+            attrs.clear();
-+            attrs.put("SupportedModes", "CBC");
-+            attrs.put("SupportedPaddings", "NOPADDING");
-+            attrs.put("SupportedKeyFormats", "RAW");
-+            ps("Cipher", "DESedeWrap",
-+                    "com.sun.crypto.provider.DESedeWrapCipher", null, attrs);
-+
-+            attrs.clear();
-+            attrs.put("SupportedModes", "ECB");
-+            attrs.put("SupportedPaddings", "NOPADDING");
-+            attrs.put("SupportedKeyFormats", "RAW");
-+            psA("Cipher", "ARCFOUR",
-+                    "com.sun.crypto.provider.ARCFOURCipher", attrs);
-+
-+            attrs.clear();
-+            attrs.put("SupportedKeyFormats", "RAW");
-+            ps("Cipher",  "ChaCha20",
-+                    "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Only",
-+                    null, attrs);
-+            psA("Cipher",  "ChaCha20-Poly1305",
-+                    "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305",
-+                    attrs);
-+
-+            // PBES1
-+            psA("Cipher", "PBEWithMD5AndDES",
-+                    "com.sun.crypto.provider.PBEWithMD5AndDESCipher",
-+                    null);
-+            ps("Cipher", "PBEWithMD5AndTripleDES",
-+                    "com.sun.crypto.provider.PBEWithMD5AndTripleDESCipher");
-+            psA("Cipher", "PBEWithSHA1AndDESede",
-+                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndDESede",
-+                    null);
-+            psA("Cipher", "PBEWithSHA1AndRC2_40",
-+                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_40",
-+                    null);
-+            psA("Cipher", "PBEWithSHA1AndRC2_128",
-+                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_128",
-+                    null);
-+            psA("Cipher", "PBEWithSHA1AndRC4_40",
-+                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_40",
-+                    null);
-+
-+            psA("Cipher", "PBEWithSHA1AndRC4_128",
-+                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_128",
-+                    null);
-+
-+            // PBES2
-+            ps("Cipher", "PBEWithHmacSHA1AndAES_128",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_128");
-+
-+            ps("Cipher", "PBEWithHmacSHA224AndAES_128",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_128");
-+
-+            ps("Cipher", "PBEWithHmacSHA256AndAES_128",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_128");
-+
-+            ps("Cipher", "PBEWithHmacSHA384AndAES_128",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_128");
-+
-+            ps("Cipher", "PBEWithHmacSHA512AndAES_128",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_128");
-+
-+            ps("Cipher", "PBEWithHmacSHA512/224AndAES_128",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA512_224AndAES_128");
-+
-+            ps("Cipher", "PBEWithHmacSHA512/256AndAES_128",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_128");
-+
-+            ps("Cipher", "PBEWithHmacSHA1AndAES_256",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_256");
-+
-+            ps("Cipher", "PBEWithHmacSHA224AndAES_256",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_256");
-+
-+            ps("Cipher", "PBEWithHmacSHA256AndAES_256",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_256");
-+
-+            ps("Cipher", "PBEWithHmacSHA384AndAES_256",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_256");
-+
-+            ps("Cipher", "PBEWithHmacSHA512AndAES_256",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_256");
-+
-+            ps("Cipher", "PBEWithHmacSHA512/224AndAES_256",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA512_224AndAES_256");
-+
-+            ps("Cipher", "PBEWithHmacSHA512/256AndAES_256",
-+                    "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_256");
-+
-+            /*
-+             * Key(pair) Generator engines
-+             */
-+            ps("KeyGenerator", "DES",
-+                    "com.sun.crypto.provider.DESKeyGenerator");
-+            psA("KeyGenerator", "DESede",
-+                    "com.sun.crypto.provider.DESedeKeyGenerator",
-+                    null);
-+            ps("KeyGenerator", "Blowfish",
-+                    "com.sun.crypto.provider.BlowfishKeyGenerator");
-+            psA("KeyGenerator", "AES",
-+                    "com.sun.crypto.provider.AESKeyGenerator",
-+                    null);
-+            ps("KeyGenerator", "RC2",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$RC2KeyGenerator");
-+            psA("KeyGenerator", "ARCFOUR",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$ARCFOURKeyGenerator",
-+                    null);
-+            ps("KeyGenerator", "ChaCha20",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$ChaCha20KeyGenerator");
-+            ps("KeyGenerator", "HmacMD5",
-+                    "com.sun.crypto.provider.HmacMD5KeyGenerator");
-+
-+            psA("KeyGenerator", "HmacSHA1",
-+                    "com.sun.crypto.provider.HmacSHA1KeyGenerator", null);
-+            psA("KeyGenerator", "HmacSHA224",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA224",
-+                    null);
-+            psA("KeyGenerator", "HmacSHA256",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA256",
-+                    null);
-+            psA("KeyGenerator", "HmacSHA384",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA384",
-+                    null);
-+            psA("KeyGenerator", "HmacSHA512",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512",
-+                    null);
-+            psA("KeyGenerator", "HmacSHA512/224",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_224",
-+                    null);
-+            psA("KeyGenerator", "HmacSHA512/256",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_256",
-+                    null);
-+
-+            psA("KeyGenerator", "HmacSHA3-224",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_224",
-+                    null);
-+            psA("KeyGenerator", "HmacSHA3-256",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_256",
-+                    null);
-+            psA("KeyGenerator", "HmacSHA3-384",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_384",
-+                    null);
-+            psA("KeyGenerator", "HmacSHA3-512",
-+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_512",
-+                    null);
-+
-+            psA("KeyPairGenerator", "DiffieHellman",
-+                    "com.sun.crypto.provider.DHKeyPairGenerator",
-+                    null);
-+        }
- 
-         /*
-          * Algorithm parameter generation engines
-@@ -452,15 +458,17 @@ public final class SunJCE extends Provider {
-                 "DiffieHellman", "com.sun.crypto.provider.DHParameterGenerator",
-                 null);
- 
--        /*
--         * Key Agreement engines
--         */
--        attrs.clear();
--        attrs.put("SupportedKeyClasses", "javax.crypto.interfaces.DHPublicKey" +
--                        "|javax.crypto.interfaces.DHPrivateKey");
--        psA("KeyAgreement", "DiffieHellman",
--                "com.sun.crypto.provider.DHKeyAgreement",
--                attrs);
-+        if (!systemFipsEnabled) {
-+            /*
-+             * Key Agreement engines
-+             */
-+            attrs.clear();
-+            attrs.put("SupportedKeyClasses", "javax.crypto.interfaces.DHPublicKey" +
-+                            "|javax.crypto.interfaces.DHPrivateKey");
-+            psA("KeyAgreement", "DiffieHellman",
-+                    "com.sun.crypto.provider.DHKeyAgreement",
-+                    attrs);
-+        }
- 
-         /*
-          * Algorithm Parameter engines
-@@ -630,10 +638,10 @@ public final class SunJCE extends Provider {
-                 "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512AndAES_128");
- 
-         ps("SecretKeyFactory", "PBEWithHmacSHA512/224AndAES_128",
--                "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_224AndAES_128");
-+               "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_224AndAES_128");
- 
-         ps("SecretKeyFactory", "PBEWithHmacSHA512/256AndAES_128",
--                "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_256AndAES_128");
-+               "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_256AndAES_128");
- 
-         ps("SecretKeyFactory", "PBEWithHmacSHA1AndAES_256",
-                 "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA1AndAES_256");
-@@ -656,153 +664,154 @@ public final class SunJCE extends Provider {
-         ps("SecretKeyFactory", "PBEWithHmacSHA512/256AndAES_256",
-                 "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_256AndAES_256");
- 
--        // PBKDF2
--        psA("SecretKeyFactory", "PBKDF2WithHmacSHA1",
--                "com.sun.crypto.provider.PBKDF2Core$HmacSHA1",
--                null);
--        ps("SecretKeyFactory", "PBKDF2WithHmacSHA224",
--                "com.sun.crypto.provider.PBKDF2Core$HmacSHA224");
--        ps("SecretKeyFactory", "PBKDF2WithHmacSHA256",
--                "com.sun.crypto.provider.PBKDF2Core$HmacSHA256");
--        ps("SecretKeyFactory", "PBKDF2WithHmacSHA384",
--                "com.sun.crypto.provider.PBKDF2Core$HmacSHA384");
--        ps("SecretKeyFactory", "PBKDF2WithHmacSHA512",
--                "com.sun.crypto.provider.PBKDF2Core$HmacSHA512");
--        ps("SecretKeyFactory", "PBKDF2WithHmacSHA512/224",
--                "com.sun.crypto.provider.PBKDF2Core$HmacSHA512_224");
--        ps("SecretKeyFactory", "PBKDF2WithHmacSHA512/256",
--                "com.sun.crypto.provider.PBKDF2Core$HmacSHA512_256");
--
--        /*
--         * MAC
--         */
--        attrs.clear();
--        attrs.put("SupportedKeyFormats", "RAW");
--        ps("Mac", "HmacMD5", "com.sun.crypto.provider.HmacMD5", null, attrs);
--        psA("Mac", "HmacSHA1", "com.sun.crypto.provider.HmacSHA1",
--                attrs);
--        psA("Mac", "HmacSHA224",
--                "com.sun.crypto.provider.HmacCore$HmacSHA224", attrs);
--        psA("Mac", "HmacSHA256",
--                "com.sun.crypto.provider.HmacCore$HmacSHA256", attrs);
--        psA("Mac", "HmacSHA384",
--                "com.sun.crypto.provider.HmacCore$HmacSHA384", attrs);
--        psA("Mac", "HmacSHA512",
--                "com.sun.crypto.provider.HmacCore$HmacSHA512", attrs);
--        psA("Mac", "HmacSHA512/224",
--                "com.sun.crypto.provider.HmacCore$HmacSHA512_224", attrs);
--        psA("Mac", "HmacSHA512/256",
--                "com.sun.crypto.provider.HmacCore$HmacSHA512_256", attrs);
--        psA("Mac", "HmacSHA3-224",
--                "com.sun.crypto.provider.HmacCore$HmacSHA3_224", attrs);
--        psA("Mac", "HmacSHA3-256",
--                "com.sun.crypto.provider.HmacCore$HmacSHA3_256", attrs);
--        psA("Mac", "HmacSHA3-384",
--                "com.sun.crypto.provider.HmacCore$HmacSHA3_384", attrs);
--        psA("Mac", "HmacSHA3-512",
--                "com.sun.crypto.provider.HmacCore$HmacSHA3_512", attrs);
--
--        ps("Mac", "HmacPBESHA1",
--                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1",
--                null, attrs);
--        ps("Mac", "HmacPBESHA224",
--                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224",
--                null, attrs);
--        ps("Mac", "HmacPBESHA256",
--                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256",
--                null, attrs);
--        ps("Mac", "HmacPBESHA384",
--                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384",
--                null, attrs);
--        ps("Mac", "HmacPBESHA512",
--                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512",
--                null, attrs);
--        ps("Mac", "HmacPBESHA512/224",
--                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224",
--                null, attrs);
--        ps("Mac", "HmacPBESHA512/256",
--                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256",
--                null, attrs);
--
--
--        // PBMAC1
--        ps("Mac", "PBEWithHmacSHA1",
--                "com.sun.crypto.provider.PBMAC1Core$HmacSHA1", null, attrs);
--        ps("Mac", "PBEWithHmacSHA224",
--                "com.sun.crypto.provider.PBMAC1Core$HmacSHA224", null, attrs);
--        ps("Mac", "PBEWithHmacSHA256",
--                "com.sun.crypto.provider.PBMAC1Core$HmacSHA256", null, attrs);
--        ps("Mac", "PBEWithHmacSHA384",
--                "com.sun.crypto.provider.PBMAC1Core$HmacSHA384", null, attrs);
--        ps("Mac", "PBEWithHmacSHA512",
--                "com.sun.crypto.provider.PBMAC1Core$HmacSHA512", null, attrs);
--        ps("Mac", "PBEWithHmacSHA512/224",
--                "com.sun.crypto.provider.PBMAC1Core$HmacSHA512_224", null, attrs);
--        ps("Mac", "PBEWithHmacSHA512/256",
--                "com.sun.crypto.provider.PBMAC1Core$HmacSHA512_256", null, attrs);
--
--        ps("Mac", "SslMacMD5",
--                "com.sun.crypto.provider.SslMacCore$SslMacMD5", null, attrs);
--        ps("Mac", "SslMacSHA1",
--                "com.sun.crypto.provider.SslMacCore$SslMacSHA1", null, attrs);
--
--        /*
--         * KeyStore
--         */
--        ps("KeyStore", "JCEKS",
--                "com.sun.crypto.provider.JceKeyStore");
--
--        /*
--         * KEMs
--         */
--        attrs.clear();
--        attrs.put("ImplementedIn", "Software");
--        attrs.put("SupportedKeyClasses", "java.security.interfaces.ECKey" +
--                "|java.security.interfaces.XECKey");
--        ps("KEM", "DHKEM", "com.sun.crypto.provider.DHKEM", null, attrs);
--
--        attrs.clear();
--        attrs.put("ImplementedIn", "Software");
--        ps("KEM", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$K", null, attrs);
--        psA("KEM", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$K2", attrs);
--        psA("KEM", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$K3", attrs);
--        psA("KEM", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$K5",attrs);
--
--        ps("KeyPairGenerator", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$KPG", null, attrs);
--        psA("KeyPairGenerator", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$KPG2", attrs);
--        psA("KeyPairGenerator", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$KPG3", attrs);
--        psA("KeyPairGenerator", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$KPG5", attrs);
--
--        ps("KeyFactory", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$KF", null, attrs);
--        psA("KeyFactory", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$KF2", attrs);
--        psA("KeyFactory", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$KF3", attrs);
--        psA("KeyFactory", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$KF5", attrs);
--
--        /*
--         * SSL/TLS mechanisms
--         *
--         * These are strictly internal implementations and may
--         * be changed at any time.  These names were chosen
--         * because PKCS11/SunPKCS11 does not yet have TLS1.2
--         * mechanisms, and it will cause calls to come here.
--         */
--        ps("KeyGenerator", "SunTlsPrf",
--                "com.sun.crypto.provider.TlsPrfGenerator$V10");
--        ps("KeyGenerator", "SunTls12Prf",
--                "com.sun.crypto.provider.TlsPrfGenerator$V12");
--
--        ps("KeyGenerator", "SunTlsMasterSecret",
--                "com.sun.crypto.provider.TlsMasterSecretGenerator",
--                List.of("SunTls12MasterSecret", "SunTlsExtendedMasterSecret"),
--                null);
--
--        ps("KeyGenerator", "SunTlsKeyMaterial",
--                "com.sun.crypto.provider.TlsKeyMaterialGenerator",
--                List.of("SunTls12KeyMaterial"), null);
--
--        ps("KeyGenerator", "SunTlsRsaPremasterSecret",
--                "com.sun.crypto.provider.TlsRsaPremasterSecretGenerator",
--                List.of("SunTls12RsaPremasterSecret"), null);
-+        if (!systemFipsEnabled) {
-+            // PBKDF2
-+            psA("SecretKeyFactory", "PBKDF2WithHmacSHA1",
-+                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA1",
-+                    null);
-+            ps("SecretKeyFactory", "PBKDF2WithHmacSHA224",
-+                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA224");
-+            ps("SecretKeyFactory", "PBKDF2WithHmacSHA256",
-+                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA256");
-+            ps("SecretKeyFactory", "PBKDF2WithHmacSHA384",
-+                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA384");
-+            ps("SecretKeyFactory", "PBKDF2WithHmacSHA512",
-+                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA512");
-+            ps("SecretKeyFactory", "PBKDF2WithHmacSHA512/224",
-+                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA512_224");
-+            ps("SecretKeyFactory", "PBKDF2WithHmacSHA512/256",
-+                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA512_256");
-+
-+            /*
-+             * MAC
-+             */
-+            attrs.clear();
-+            attrs.put("SupportedKeyFormats", "RAW");
-+            ps("Mac", "HmacMD5", "com.sun.crypto.provider.HmacMD5", null, attrs);
-+            psA("Mac", "HmacSHA1", "com.sun.crypto.provider.HmacSHA1",
-+                    attrs);
-+            psA("Mac", "HmacSHA224",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA224", attrs);
-+            psA("Mac", "HmacSHA256",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA256", attrs);
-+            psA("Mac", "HmacSHA384",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA384", attrs);
-+            psA("Mac", "HmacSHA512",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA512", attrs);
-+            psA("Mac", "HmacSHA512/224",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA512_224", attrs);
-+            psA("Mac", "HmacSHA512/256",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA512_256", attrs);
-+            psA("Mac", "HmacSHA3-224",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA3_224", attrs);
-+            psA("Mac", "HmacSHA3-256",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA3_256", attrs);
-+            psA("Mac", "HmacSHA3-384",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA3_384", attrs);
-+            psA("Mac", "HmacSHA3-512",
-+                    "com.sun.crypto.provider.HmacCore$HmacSHA3_512", attrs);
-+
-+            ps("Mac", "HmacPBESHA1",
-+                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1",
-+                    null, attrs);
-+            ps("Mac", "HmacPBESHA224",
-+                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224",
-+                    null, attrs);
-+            ps("Mac", "HmacPBESHA256",
-+                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256",
-+                    null, attrs);
-+            ps("Mac", "HmacPBESHA384",
-+                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384",
-+                    null, attrs);
-+            ps("Mac", "HmacPBESHA512",
-+                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512",
-+                    null, attrs);
-+            ps("Mac", "HmacPBESHA512/224",
-+                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224",
-+                    null, attrs);
-+            ps("Mac", "HmacPBESHA512/256",
-+                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256",
-+                    null, attrs);
-+
-+            // PBMAC1
-+            ps("Mac", "PBEWithHmacSHA1",
-+                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA1", null, attrs);
-+            ps("Mac", "PBEWithHmacSHA224",
-+                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA224", null, attrs);
-+            ps("Mac", "PBEWithHmacSHA256",
-+                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA256", null, attrs);
-+            ps("Mac", "PBEWithHmacSHA384",
-+                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA384", null, attrs);
-+            ps("Mac", "PBEWithHmacSHA512",
-+                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA512", null, attrs);
-+            ps("Mac", "PBEWithHmacSHA512/224",
-+                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA512_224", null, attrs);
-+            ps("Mac", "PBEWithHmacSHA512/256",
-+                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA512_256", null, attrs);
-+
-+            ps("Mac", "SslMacMD5",
-+                    "com.sun.crypto.provider.SslMacCore$SslMacMD5", null, attrs);
-+            ps("Mac", "SslMacSHA1",
-+                    "com.sun.crypto.provider.SslMacCore$SslMacSHA1", null, attrs);
-+
-+            /*
-+             * KeyStore
-+             */
-+            ps("KeyStore", "JCEKS",
-+                    "com.sun.crypto.provider.JceKeyStore");
-+
-+            /*
-+             * KEMs
-+             */
-+            attrs.clear();
-+            attrs.put("ImplementedIn", "Software");
-+            attrs.put("SupportedKeyClasses", "java.security.interfaces.ECKey" +
-+                      "|java.security.interfaces.XECKey");
-+            ps("KEM", "DHKEM", "com.sun.crypto.provider.DHKEM", null, attrs);
-+
-+            attrs.clear();
-+            attrs.put("ImplementedIn", "Software");
-+            ps("KEM", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$K", null, attrs);
-+            psA("KEM", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$K2", attrs);
-+            psA("KEM", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$K3", attrs);
-+            psA("KEM", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$K5",attrs);
-+
-+            ps("KeyPairGenerator", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$KPG", null, attrs);
-+            psA("KeyPairGenerator", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$KPG2", attrs);
-+            psA("KeyPairGenerator", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$KPG3", attrs);
-+            psA("KeyPairGenerator", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$KPG5", attrs);
-+
-+            ps("KeyFactory", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$KF", null, attrs);
-+            psA("KeyFactory", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$KF2", attrs);
-+            psA("KeyFactory", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$KF3", attrs);
-+            psA("KeyFactory", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$KF5", attrs);
-+
-+            /*
-+             * SSL/TLS mechanisms
-+             *
-+             * These are strictly internal implementations and may
-+             * be changed at any time.  These names were chosen
-+             * because PKCS11/SunPKCS11 does not yet have TLS1.2
-+             * mechanisms, and it will cause calls to come here.
-+             */
-+            ps("KeyGenerator", "SunTlsPrf",
-+                    "com.sun.crypto.provider.TlsPrfGenerator$V10");
-+            ps("KeyGenerator", "SunTls12Prf",
-+                    "com.sun.crypto.provider.TlsPrfGenerator$V12");
-+
-+            ps("KeyGenerator", "SunTlsMasterSecret",
-+                    "com.sun.crypto.provider.TlsMasterSecretGenerator",
-+                    List.of("SunTls12MasterSecret", "SunTlsExtendedMasterSecret"),
-+                    null);
-+
-+            ps("KeyGenerator", "SunTlsKeyMaterial",
-+                    "com.sun.crypto.provider.TlsKeyMaterialGenerator",
-+                    List.of("SunTls12KeyMaterial"), null);
-+
-+            ps("KeyGenerator", "SunTlsRsaPremasterSecret",
-+                    "com.sun.crypto.provider.TlsRsaPremasterSecretGenerator",
-+                    List.of("SunTls12RsaPremasterSecret"), null);
-+        }
-     }
- 
-     // Return the instance of this class or create one if needed.
-diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
-index 671529f71a1..af632936921 100644
---- a/src/java.base/share/classes/java/security/Security.java
-+++ b/src/java.base/share/classes/java/security/Security.java
-@@ -34,6 +34,7 @@ import java.net.URL;
- import jdk.internal.access.JavaSecurityPropertiesAccess;
- 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;
-@@ -58,6 +59,11 @@ import sun.security.jca.*;
- 
- public final class Security {
- 
-+    private static final String SYS_PROP_SWITCH =
-+        "java.security.disableSystemPropertiesFile";
-+    private static final String SEC_PROP_SWITCH =
-+        "security.useSystemPropertiesFile";
-+
-     /* Are we debugging? -- for developers */
-     private static final Debug sdebug =
-                         Debug.getInstance("properties");
-@@ -75,6 +81,19 @@ public final class Security {
-     }
- 
-     static {
-+        // Initialise here as used by code with system properties disabled
-+        SharedSecrets.setJavaSecuritySystemConfiguratorAccess(
-+            new JavaSecuritySystemConfiguratorAccess() {
-+                @Override
-+                public boolean isSystemFipsEnabled() {
-+                    return SystemConfigurator.isSystemFipsEnabled();
-+                }
-+                @Override
-+                public boolean isPlainKeySupportEnabled() {
-+                    return SystemConfigurator.isPlainKeySupportEnabled();
-+                }
-+            });
-+
-         // doPrivileged here because there are multiple
-         // things in initialize that might require privs.
-         // (the FileInputStream call and the File.exists call,
-@@ -96,6 +115,7 @@ public final class Security {
-     private static void initialize() {
-         props = new Properties();
-         boolean overrideAll = false;
-+        boolean systemSecPropsEnabled = false;
- 
-         // first load the system properties file
-         // to determine the value of security.overridePropertiesFile
-@@ -116,6 +136,61 @@ public final class Security {
-             }
-             loadProps(null, extraPropFile, overrideAll);
-         }
-+
-+        boolean sysUseProps = Boolean.valueOf(System.getProperty(SYS_PROP_SWITCH, "false"));
-+        boolean secUseProps = Boolean.valueOf(props.getProperty(SEC_PROP_SWITCH));
-+        if (sdebug != null) {
-+            sdebug.println(SYS_PROP_SWITCH + "=" + sysUseProps);
-+            sdebug.println(SEC_PROP_SWITCH + "=" + secUseProps);
-+        }
-+        if (!sysUseProps && secUseProps) {
-+            systemSecPropsEnabled = SystemConfigurator.configureSysProps(props);
-+            if (!systemSecPropsEnabled) {
-+                if (sdebug != null) {
-+                    sdebug.println("WARNING: System security properties could not be loaded.");
-+                }
-+            }
-+        } else {
-+            if (sdebug != null) {
-+                sdebug.println("System security property support disabled by user.");
-+            }
-+        }
-+
-+        if (systemSecPropsEnabled) {
-+            boolean shouldEnable;
-+            String sysProp = System.getProperty("com.redhat.fips");
-+            if (sysProp == null) {
-+                shouldEnable = true;
-+                if (sdebug != null) {
-+                    sdebug.println("com.redhat.fips unset, using default value of true");
-+                }
-+            } else {
-+                shouldEnable = Boolean.valueOf(sysProp);
-+                if (sdebug != null) {
-+                    sdebug.println("com.redhat.fips set, using its value " + shouldEnable);
-+                }
-+            }
-+            if (shouldEnable) {
-+                boolean fipsEnabled = SystemConfigurator.configureFIPS(props);
-+                if (sdebug != null) {
-+                    if (fipsEnabled) {
-+                        sdebug.println("FIPS mode support configured and enabled.");
-+                    } else {
-+                        sdebug.println("FIPS mode support disabled.");
-+                    }
-+                }
-+            } else {
-+                if (sdebug != null ) {
-+                    sdebug.println("FIPS mode support disabled by user.");
-+                }
-+            }
-+        } else {
-+            if (sdebug != null) {
-+                sdebug.println("WARNING: FIPS mode support can not be enabled without " +
-+                               "system security properties being enabled.");
-+            }
-+        }
-+
-         initialSecurityProperties = (Properties) props.clone();
-         if (sdebug != null) {
-             for (String key : props.stringPropertyNames()) {
-@@ -126,7 +201,7 @@ public final class Security {
- 
-     }
- 
--    private static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
-+    static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
-         InputStream is = null;
-         try {
-             if (masterFile != null && masterFile.exists()) {
-diff --git a/src/java.base/share/classes/java/security/SystemConfigurator.java b/src/java.base/share/classes/java/security/SystemConfigurator.java
-new file mode 100644
-index 00000000000..9d26a54f5d4
---- /dev/null
-+++ b/src/java.base/share/classes/java/security/SystemConfigurator.java
-@@ -0,0 +1,232 @@
-+/*
-+ * Copyright (c) 2019, 2021, Red Hat, Inc.
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.  Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package java.security;
-+
-+import java.io.BufferedInputStream;
-+import java.io.FileInputStream;
-+import java.io.IOException;
-+
-+import java.util.Iterator;
-+import java.util.Map.Entry;
-+import java.util.Properties;
-+
-+import sun.security.util.Debug;
-+
-+/**
-+ * Internal class to align OpenJDK with global crypto-policies.
-+ * Called from java.security.Security class initialization,
-+ * during startup.
-+ *
-+ */
-+
-+final class SystemConfigurator {
-+
-+    private static final Debug sdebug =
-+            Debug.getInstance("properties");
-+
-+    private static final String CRYPTO_POLICIES_BASE_DIR =
-+            "/etc/crypto-policies";
-+
-+    private static final String CRYPTO_POLICIES_JAVA_CONFIG =
-+            CRYPTO_POLICIES_BASE_DIR + "/back-ends/java.config";
-+
-+    private static boolean systemFipsEnabled = false;
-+    private static boolean plainKeySupportEnabled = false;
-+
-+    private static final String SYSTEMCONF_NATIVE_LIB = "systemconf";
-+
-+    private static native boolean getSystemFIPSEnabled()
-+            throws IOException;
-+
-+    static {
-+        @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
-+     * security.useSystemPropertiesFile is true.
-+     */
-+    static boolean configureSysProps(Properties props) {
-+        // now load the system file, if it exists, so its values
-+        // will win if they conflict with the earlier values
-+        return Security.loadProps(null, CRYPTO_POLICIES_JAVA_CONFIG, false);
-+    }
-+
-+    /*
-+     * Invoked at the end of java.security.Security initialisation
-+     * if java.security properties have been loaded
-+     */
-+    static boolean configureFIPS(Properties props) {
-+        boolean loadedProps = false;
-+
-+        try {
-+            if (enableFips()) {
-+                if (sdebug != null) { sdebug.println("FIPS mode detected"); }
-+                // Remove all security providers
-+                Iterator<Entry<Object, Object>> i = props.entrySet().iterator();
-+                while (i.hasNext()) {
-+                    Entry<Object, Object> e = i.next();
-+                    if (((String) e.getKey()).startsWith("security.provider")) {
-+                        if (sdebug != null) { sdebug.println("Removing provider: " + e); }
-+                        i.remove();
-+                    }
-+                }
-+                // Add FIPS security providers
-+                String fipsProviderValue = null;
-+                for (int n = 1;
-+                     (fipsProviderValue = (String) props.get("fips.provider." + n)) != null; n++) {
-+                    String fipsProviderKey = "security.provider." + n;
-+                    if (sdebug != null) {
-+                        sdebug.println("Adding provider " + n + ": " +
-+                                fipsProviderKey + "=" + fipsProviderValue);
-+                    }
-+                    props.put(fipsProviderKey, fipsProviderValue);
-+                }
-+                // Add other security properties
-+                String keystoreTypeValue = (String) props.get("fips.keystore.type");
-+                if (keystoreTypeValue != null) {
-+                    String nonFipsKeystoreType = props.getProperty("keystore.type");
-+                    props.put("keystore.type", keystoreTypeValue);
-+                    if (keystoreTypeValue.equals("PKCS11")) {
-+                        // If keystore.type is PKCS11, javax.net.ssl.keyStore
-+                        // must be "NONE". See JDK-8238264.
-+                        System.setProperty("javax.net.ssl.keyStore", "NONE");
-+                    }
-+                    if (System.getProperty("javax.net.ssl.trustStoreType") == null) {
-+                        // If no trustStoreType has been set, use the
-+                        // previous keystore.type under FIPS mode. In
-+                        // a default configuration, the Trust Store will
-+                        // be 'cacerts' (JKS type).
-+                        System.setProperty("javax.net.ssl.trustStoreType",
-+                                nonFipsKeystoreType);
-+                    }
-+                    if (sdebug != null) {
-+                        sdebug.println("FIPS mode default keystore.type = " +
-+                                keystoreTypeValue);
-+                        sdebug.println("FIPS mode javax.net.ssl.keyStore = " +
-+                                        System.getProperty("javax.net.ssl.keyStore", ""));
-+                        sdebug.println("FIPS mode javax.net.ssl.trustStoreType = " +
-+                                System.getProperty("javax.net.ssl.trustStoreType", ""));
-+                    }
-+                }
-+                loadedProps = true;
-+                systemFipsEnabled = true;
-+                String plainKeySupport = System.getProperty("com.redhat.fips.plainKeySupport",
-+                                                            "true");
-+                plainKeySupportEnabled = !"false".equals(plainKeySupport);
-+                if (sdebug != null) {
-+                    if (plainKeySupportEnabled) {
-+                        sdebug.println("FIPS support enabled with plain key support");
-+                    } else {
-+                        sdebug.println("FIPS support enabled without plain key support");
-+                    }
-+                }
-+            } else {
-+                if (sdebug != null) { sdebug.println("FIPS mode not detected"); }
-+            }
-+        } catch (Exception e) {
-+            if (sdebug != null) {
-+                sdebug.println("unable to load FIPS configuration");
-+                e.printStackTrace();
-+            }
-+        }
-+        return loadedProps;
-+    }
-+
-+    /**
-+     * 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;
-+    }
-+
-+    /**
-+     * 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;
-+    }
-+
-+    /**
-+     * Determines whether FIPS mode should be enabled.
-+     *
-+     * OpenJDK FIPS mode will be enabled only if the system is in
-+     * FIPS mode.
-+     *
-+     * Calls to this method only occur if the system property
-+     * com.redhat.fips is not set to false.
-+     *
-+     * 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.
-+     *
-+     * @return true if the system is in FIPS mode
-+     */
-+    private static boolean enableFips() throws Exception {
-+        if (sdebug != null) {
-+            sdebug.println("Calling getSystemFIPSEnabled (libsystemconf)...");
-+        }
-+        try {
-+            boolean fipsEnabled = getSystemFIPSEnabled();
-+            if (sdebug != null) {
-+                sdebug.println("Call to getSystemFIPSEnabled (libsystemconf) returned: "
-+                               + fipsEnabled);
-+            }
-+            return fipsEnabled;
-+        } catch (IOException e) {
-+            if (sdebug != null) {
-+                sdebug.println("Call to getSystemFIPSEnabled (libsystemconf) failed:");
-+                sdebug.println(e.getMessage());
-+            }
-+            throw e;
-+        }
-+    }
-+}
-diff --git a/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
-new file mode 100644
-index 00000000000..3f3caac64dc
---- /dev/null
-+++ b/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
-@@ -0,0 +1,31 @@
-+/*
-+ * 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();
-+    boolean isPlainKeySupportEnabled();
-+}
-diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
-index 919d758a6e3..b1e5fbaf84a 100644
---- a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
-+++ b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
-@@ -43,6 +43,7 @@ import java.io.PrintStream;
- import java.io.PrintWriter;
- import java.io.RandomAccessFile;
- import java.security.ProtectionDomain;
-+import java.security.Security;
- import java.security.Signature;
- 
- /** A repository of "shared secrets", which are a mechanism for
-@@ -90,6 +91,7 @@ public class SharedSecrets {
-     private static JavaxCryptoSealedObjectAccess javaxCryptoSealedObjectAccess;
-     private static JavaxCryptoSpecAccess javaxCryptoSpecAccess;
-     private static JavaTemplateAccess javaTemplateAccess;
-+    private static JavaSecuritySystemConfiguratorAccess javaSecuritySystemConfiguratorAccess;
- 
-     public static void setJavaUtilCollectionAccess(JavaUtilCollectionAccess juca) {
-         javaUtilCollectionAccess = juca;
-@@ -537,4 +539,15 @@ public class SharedSecrets {
-             MethodHandles.lookup().ensureInitialized(c);
-         } catch (IllegalAccessException e) {}
-     }
-+
-+    public static void setJavaSecuritySystemConfiguratorAccess(JavaSecuritySystemConfiguratorAccess jssca) {
-+        javaSecuritySystemConfiguratorAccess = jssca;
-+    }
-+
-+    public static JavaSecuritySystemConfiguratorAccess getJavaSecuritySystemConfiguratorAccess() {
-+        if (javaSecuritySystemConfiguratorAccess == null) {
-+            ensureClassInitialized(Security.class);
-+        }
-+        return javaSecuritySystemConfiguratorAccess;
-+    }
- }
-diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
-index 3af9d4e542f..37a15919095 100644
---- a/src/java.base/share/classes/module-info.java
-+++ b/src/java.base/share/classes/module-info.java
-@@ -158,6 +158,7 @@ module java.base {
-         java.naming,
-         java.rmi,
-         jdk.charsets,
-+        jdk.crypto.ec,
-         jdk.jartool,
-         jdk.jlink,
-         jdk.jfr,
-diff --git a/src/java.base/share/classes/sun/security/provider/SunEntries.java b/src/java.base/share/classes/sun/security/provider/SunEntries.java
-index 769e5bfc651..422f3940d09 100644
---- a/src/java.base/share/classes/sun/security/provider/SunEntries.java
-+++ b/src/java.base/share/classes/sun/security/provider/SunEntries.java
-@@ -38,6 +38,7 @@ import java.util.HashMap;
- import java.util.Iterator;
- import java.util.LinkedHashSet;
- 
-+import jdk.internal.access.SharedSecrets;
- import jdk.internal.util.StaticProperty;
- import sun.security.action.GetBooleanAction;
- 
-@@ -91,6 +92,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;
- 
-@@ -102,89 +107,92 @@ 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);
--        }
--        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);
-+        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);
- 
--        attrs.remove("KeySize");
-+            /*
-+             * 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");
- 
--        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");
-+        }
- 
-         attrs.clear();
-         attrs.put("ImplementedIn", "Software");
-@@ -201,16 +209,18 @@ public final class SunEntries {
-         attrs.clear();
-         attrs.put("ImplementedIn", "Software");
- 
--        String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
--        dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
--        attrs.put("KeySize", "2048");
--        addWithAlias(p, "KeyPairGenerator", "DSA", dsaKPGImplClass, attrs);
--        attrs.remove("KeySize");
--
--        add(p, "KeyPairGenerator", "ML-DSA", "sun.security.provider.ML_DSA_Impls$KPG", attrs);
--        addWithAlias(p, "KeyPairGenerator", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$KPG2", attrs);
--        addWithAlias(p, "KeyPairGenerator", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$KPG3", attrs);
--        addWithAlias(p, "KeyPairGenerator", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$KPG5", attrs);
-+        if (!systemFipsEnabled) {
-+            String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
-+            dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
-+            attrs.put("KeySize", "2048");
-+            addWithAlias(p, "KeyPairGenerator", "DSA", dsaKPGImplClass, attrs);
-+            attrs.remove("KeySize");
-+
-+            add(p, "KeyPairGenerator", "ML-DSA", "sun.security.provider.ML_DSA_Impls$KPG", attrs);
-+            addWithAlias(p, "KeyPairGenerator", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$KPG2", attrs);
-+            addWithAlias(p, "KeyPairGenerator", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$KPG3", attrs);
-+            addWithAlias(p, "KeyPairGenerator", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$KPG5", attrs);
-+        }
- 
-         /*
-          * Algorithm Parameter Generator engines
-@@ -226,53 +236,55 @@ public final class SunEntries {
-         addWithAlias(p, "AlgorithmParameters", "DSA",
-                 "sun.security.provider.DSAParameters", attrs);
- 
--        /*
--         * Key factories
--         */
--        addWithAlias(p, "KeyFactory", "DSA",
--                "sun.security.provider.DSAKeyFactory", attrs);
--        addWithAlias(p, "KeyFactory", "HSS/LMS",
--                "sun.security.provider.HSS$KeyFactoryImpl", attrs);
-+        if (!systemFipsEnabled) {
-+            /*
-+             * Key factories
-+             */
-+            addWithAlias(p, "KeyFactory", "DSA",
-+                    "sun.security.provider.DSAKeyFactory", attrs);
-+            addWithAlias(p, "KeyFactory", "HSS/LMS",
-+                    "sun.security.provider.HSS$KeyFactoryImpl", attrs);
- 
--        add(p, "KeyFactory", "ML-DSA", "sun.security.provider.ML_DSA_Impls$KF", attrs);
--        addWithAlias(p, "KeyFactory", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$KF2", attrs);
--        addWithAlias(p, "KeyFactory", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$KF3", attrs);
--        addWithAlias(p, "KeyFactory", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$KF5", attrs);
-+            add(p, "KeyFactory", "ML-DSA", "sun.security.provider.ML_DSA_Impls$KF", attrs);
-+            addWithAlias(p, "KeyFactory", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$KF2", attrs);
-+            addWithAlias(p, "KeyFactory", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$KF3", attrs);
-+            addWithAlias(p, "KeyFactory", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$KF5", attrs);
- 
--        /*
--         * Digest engines
--         */
--        addWithAlias(p, "MessageDigest", "MD2", "sun.security.provider.MD2",
--                attrs);
--        addWithAlias(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);
--        addWithAlias(p, "MessageDigest", "SHAKE128-256",
--                "sun.security.provider.SHA3$SHAKE128Hash", attrs);
--        addWithAlias(p, "MessageDigest", "SHAKE256-512",
--                "sun.security.provider.SHA3$SHAKE256Hash", attrs);
-+            /*
-+             * Digest engines
-+             */
-+            addWithAlias(p, "MessageDigest", "MD2", "sun.security.provider.MD2",
-+                         attrs);
-+            addWithAlias(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);
-+            addWithAlias(p, "MessageDigest", "SHAKE128-256",
-+                    "sun.security.provider.SHA3$SHAKE128Hash", attrs);
-+            addWithAlias(p, "MessageDigest", "SHAKE256-512",
-+                    "sun.security.provider.SHA3$SHAKE256Hash", attrs);
-+        }
- 
-         /*
-          * Certificates
-diff --git a/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java b/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
-index 539ef1e8ee8..435f57e3ff2 100644
---- a/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
-+++ b/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
-@@ -27,6 +27,7 @@ package sun.security.rsa;
- 
- import java.util.*;
- import java.security.Provider;
-+import jdk.internal.access.SharedSecrets;
- import static sun.security.util.SecurityProviderConstants.getAliases;
- 
- /**
-@@ -36,6 +37,10 @@ import static sun.security.util.SecurityProviderConstants.getAliases;
-  */
- public final class SunRsaSignEntries {
- 
-+    private static final boolean systemFipsEnabled =
-+            SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
-+            .isSystemFipsEnabled();
-+
-     private void add(Provider p, String type, String algo, String cn,
-              List<String> aliases, HashMap<String, String> attrs) {
-          services.add(new Provider.Service(p, type, algo, cn,
-@@ -63,42 +68,49 @@ public final class SunRsaSignEntries {
-         add(p, "KeyFactory", "RSA",
-                 "sun.security.rsa.RSAKeyFactory$Legacy",
-                 getAliases("PKCS1"), null);
--        add(p, "KeyPairGenerator", "RSA",
--                "sun.security.rsa.RSAKeyPairGenerator$Legacy",
--                getAliases("PKCS1"), null);
--        addA(p, "Signature", "MD2withRSA",
--                "sun.security.rsa.RSASignature$MD2withRSA", attrs);
--        addA(p, "Signature", "MD5withRSA",
--                "sun.security.rsa.RSASignature$MD5withRSA", attrs);
--        addA(p, "Signature", "SHA1withRSA",
--                "sun.security.rsa.RSASignature$SHA1withRSA", attrs);
--        addA(p, "Signature", "SHA224withRSA",
--                "sun.security.rsa.RSASignature$SHA224withRSA", attrs);
--        addA(p, "Signature", "SHA256withRSA",
--                "sun.security.rsa.RSASignature$SHA256withRSA", attrs);
--        addA(p, "Signature", "SHA384withRSA",
--                "sun.security.rsa.RSASignature$SHA384withRSA", attrs);
--        addA(p, "Signature", "SHA512withRSA",
--                "sun.security.rsa.RSASignature$SHA512withRSA", attrs);
--        addA(p, "Signature", "SHA512/224withRSA",
--                "sun.security.rsa.RSASignature$SHA512_224withRSA", attrs);
--        addA(p, "Signature", "SHA512/256withRSA",
--                "sun.security.rsa.RSASignature$SHA512_256withRSA", attrs);
--        addA(p, "Signature", "SHA3-224withRSA",
--                "sun.security.rsa.RSASignature$SHA3_224withRSA", attrs);
--        addA(p, "Signature", "SHA3-256withRSA",
--                "sun.security.rsa.RSASignature$SHA3_256withRSA", attrs);
--        addA(p, "Signature", "SHA3-384withRSA",
--               "sun.security.rsa.RSASignature$SHA3_384withRSA", attrs);
--        addA(p, "Signature", "SHA3-512withRSA",
--                "sun.security.rsa.RSASignature$SHA3_512withRSA", attrs);
-+
-+        if (!systemFipsEnabled) {
-+            add(p, "KeyPairGenerator", "RSA",
-+                    "sun.security.rsa.RSAKeyPairGenerator$Legacy",
-+                    getAliases("PKCS1"), null);
-+            addA(p, "Signature", "MD2withRSA",
-+                    "sun.security.rsa.RSASignature$MD2withRSA", attrs);
-+            addA(p, "Signature", "MD5withRSA",
-+                    "sun.security.rsa.RSASignature$MD5withRSA", attrs);
-+            addA(p, "Signature", "SHA1withRSA",
-+                    "sun.security.rsa.RSASignature$SHA1withRSA", attrs);
-+            addA(p, "Signature", "SHA224withRSA",
-+                    "sun.security.rsa.RSASignature$SHA224withRSA", attrs);
-+            addA(p, "Signature", "SHA256withRSA",
-+                    "sun.security.rsa.RSASignature$SHA256withRSA", attrs);
-+            addA(p, "Signature", "SHA384withRSA",
-+                    "sun.security.rsa.RSASignature$SHA384withRSA", attrs);
-+            addA(p, "Signature", "SHA512withRSA",
-+                    "sun.security.rsa.RSASignature$SHA512withRSA", attrs);
-+            addA(p, "Signature", "SHA512/224withRSA",
-+                    "sun.security.rsa.RSASignature$SHA512_224withRSA", attrs);
-+            addA(p, "Signature", "SHA512/256withRSA",
-+                    "sun.security.rsa.RSASignature$SHA512_256withRSA", attrs);
-+            addA(p, "Signature", "SHA3-224withRSA",
-+                    "sun.security.rsa.RSASignature$SHA3_224withRSA", attrs);
-+            addA(p, "Signature", "SHA3-256withRSA",
-+                    "sun.security.rsa.RSASignature$SHA3_256withRSA", attrs);
-+            addA(p, "Signature", "SHA3-384withRSA",
-+                   "sun.security.rsa.RSASignature$SHA3_384withRSA", attrs);
-+            addA(p, "Signature", "SHA3-512withRSA",
-+                    "sun.security.rsa.RSASignature$SHA3_512withRSA", attrs);
-+        }
- 
-         addA(p, "KeyFactory", "RSASSA-PSS",
-                 "sun.security.rsa.RSAKeyFactory$PSS", attrs);
--        addA(p, "KeyPairGenerator", "RSASSA-PSS",
--                "sun.security.rsa.RSAKeyPairGenerator$PSS", attrs);
--        addA(p, "Signature", "RSASSA-PSS",
--                "sun.security.rsa.RSAPSSSignature", attrs);
-+
-+        if (!systemFipsEnabled) {
-+            addA(p, "KeyPairGenerator", "RSASSA-PSS",
-+                    "sun.security.rsa.RSAKeyPairGenerator$PSS", attrs);
-+            addA(p, "Signature", "RSASSA-PSS",
-+                    "sun.security.rsa.RSAPSSSignature", attrs);
-+        }
-+
-         addA(p, "AlgorithmParameters", "RSASSA-PSS",
-                 "sun.security.rsa.PSSParameters", null);
-     }
-diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
-index cdd951a770a..16f96b33f10 100644
---- a/src/java.base/share/conf/security/java.security
-+++ b/src/java.base/share/conf/security/java.security
-@@ -85,6 +85,17 @@ security.provider.tbd=Apple
- #endif
- security.provider.tbd=SunPKCS11
- 
-+#
-+# Security providers used when FIPS mode support is active
-+#
-+fips.provider.1=SunPKCS11 ${java.home}/conf/security/nss.fips.cfg
-+fips.provider.2=SUN
-+fips.provider.3=SunEC
-+fips.provider.4=SunJSSE
-+fips.provider.5=SunJCE
-+fips.provider.6=SunRsaSign
-+fips.provider.7=XMLDSig
-+
- #
- # A list of preferred providers for specific algorithms. These providers will
- # be searched for matching algorithms before the list of registered providers.
-@@ -295,6 +306,47 @@ policy.ignoreIdentityScope=false
- #
- keystore.type=pkcs12
- 
-+#
-+# Default keystore type used when global crypto-policies are set to FIPS.
-+#
-+fips.keystore.type=pkcs12
-+
-+#
-+# Location of the NSS DB keystore (PKCS11) in FIPS mode.
-+#
-+# The syntax for this property is identical to the 'nssSecmodDirectory'
-+# attribute available in the SunPKCS11 NSS configuration file. Use the
-+# 'sql:' prefix to refer to an SQLite DB.
-+#
-+# If the system property fips.nssdb.path is also specified, it supersedes
-+# the security property value defined here.
-+#
-+# Note: the default value for this property points to an NSS DB that might be
-+# readable by multiple operating system users and unsuitable to store keys.
-+#
-+fips.nssdb.path=sql:/etc/pki/nssdb
-+
-+#
-+# PIN for the NSS DB keystore (PKCS11) in FIPS mode.
-+#
-+# Values must take any of the following forms:
-+#   1) pin:<value>
-+#        Value: clear text PIN value.
-+#   2) env:<value>
-+#        Value: environment variable containing the PIN value.
-+#   3) file:<value>
-+#        Value: path to a file containing the PIN value in its first
-+#        line.
-+#
-+# If the system property fips.nssdb.pin is also specified, it supersedes
-+# the security property value defined here.
-+#
-+# When used as a system property, UTF-8 encoded values are valid. When
-+# used as a security property (such as in this file), encode non-Basic
-+# Latin Unicode characters with \uXXXX.
-+#
-+fips.nssdb.pin=pin:
-+
- #
- # Controls compatibility mode for JKS and PKCS12 keystore types.
- #
-@@ -332,6 +384,13 @@ package.definition=sun.misc.,\
- #
- 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=false
-+
- #
- # Determines the default key and trust manager factory algorithms for
- # the javax.net.ssl package.
-diff --git a/src/java.base/share/conf/security/nss.fips.cfg.in b/src/java.base/share/conf/security/nss.fips.cfg.in
-new file mode 100644
-index 00000000000..6de716e6b42
---- /dev/null
-+++ b/src/java.base/share/conf/security/nss.fips.cfg.in
-@@ -0,0 +1,8 @@
-+name = NSS-FIPS
-+nssLibraryDirectory = @NSS_LIBDIR@
-+nssSecmodDirectory = ${fips.nssdb.path}
-+nssDbMode = readWrite
-+nssModule = fips
-+
-+attributes(*,CKO_SECRET_KEY,*)={ CKA_SIGN=true CKA_ENCRYPT=true }
-+
-diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy
-index 01299b0520d..1c7fd074524 100644
---- a/src/java.base/share/lib/security/default.policy
-+++ b/src/java.base/share/lib/security/default.policy
-@@ -131,6 +131,7 @@ grant codeBase "jrt:/jdk.charsets" {
- grant codeBase "jrt:/jdk.crypto.ec" {
-     permission java.lang.RuntimePermission
-                    "accessClassInPackage.sun.security.*";
-+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.access";
-     permission java.lang.RuntimePermission "loadLibrary.sunec";
-     permission java.security.SecurityPermission "putProviderProperty.SunEC";
-     permission java.security.SecurityPermission "clearProviderProperties.SunEC";
-@@ -151,6 +152,8 @@ grant codeBase "jrt:/jdk.crypto.cryptoki" {
-     permission java.util.PropertyPermission "os.name", "read";
-     permission java.util.PropertyPermission "os.arch", "read";
-     permission java.util.PropertyPermission "jdk.crypto.KeyAgreement.legacyKDF", "read";
-+    permission java.util.PropertyPermission "fips.nssdb.path", "read,write";
-+    permission java.util.PropertyPermission "fips.nssdb.pin", "read";
-     permission java.security.SecurityPermission "putProviderProperty.*";
-     permission java.security.SecurityPermission "clearProviderProperties.*";
-     permission java.security.SecurityPermission "removeProviderProperty.*";
-diff --git a/src/java.base/share/native/libsystemconf/systemconf.c b/src/java.base/share/native/libsystemconf/systemconf.c
-new file mode 100644
-index 00000000000..ddf9befe5bc
---- /dev/null
-+++ b/src/java.base/share/native/libsystemconf/systemconf.c
-@@ -0,0 +1,236 @@
-+/*
-+ * Copyright (c) 2021, Red Hat, Inc.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.  Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+#include <jni.h>
-+#include <jni_util.h>
-+#include "jvm_md.h"
-+#include <stdio.h>
-+
-+#ifdef LINUX
-+
-+#ifdef SYSCONF_NSS
-+#include <nss3/pk11pub.h>
-+#else
-+#include <dlfcn.h>
-+#endif //SYSCONF_NSS
-+
-+#include "java_security_SystemConfigurator.h"
-+
-+#define MSG_MAX_SIZE 256
-+#define FIPS_ENABLED_PATH "/proc/sys/crypto/fips_enabled"
-+
-+typedef int (SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE)(void);
-+
-+static SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE *getSystemFIPSEnabled;
-+static jmethodID debugPrintlnMethodID = NULL;
-+static jobject debugObj = NULL;
-+
-+static void dbgPrint(JNIEnv *env, const char* msg)
-+{
-+    jstring jMsg;
-+    if (debugObj != NULL) {
-+        jMsg = (*env)->NewStringUTF(env, msg);
-+        CHECK_NULL(jMsg);
-+        (*env)->CallVoidMethod(env, debugObj, debugPrintlnMethodID, jMsg);
-+    }
-+}
-+
-+static void throwIOException(JNIEnv *env, const char *msg)
-+{
-+    jclass cls = (*env)->FindClass(env, "java/io/IOException");
-+    if (cls != 0)
-+        (*env)->ThrowNew(env, cls, msg);
-+}
-+
-+static void handle_msg(JNIEnv *env, const char* msg, int msg_bytes)
-+{
-+  if (msg_bytes > 0 && msg_bytes < MSG_MAX_SIZE) {
-+    dbgPrint(env, msg);
-+  } else {
-+    dbgPrint(env, "systemconf: cannot render message");
-+  }
-+}
-+
-+// Only used when NSS is not linked at build time
-+#ifndef SYSCONF_NSS
-+
-+static void *nss_handle;
-+
-+static jboolean loadNSS(JNIEnv *env)
-+{
-+  char msg[MSG_MAX_SIZE];
-+  int msg_bytes;
-+  const char* errmsg;
-+
-+  nss_handle = dlopen(JNI_LIB_NAME("nss3"), RTLD_LAZY);
-+  if (nss_handle == NULL) {
-+    errmsg = dlerror();
-+    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "loadNSS: dlopen: %s\n",
-+                         errmsg);
-+    handle_msg(env, msg, msg_bytes);
-+    return JNI_FALSE;
-+  }
-+  dlerror(); /* Clear errors */
-+  getSystemFIPSEnabled = (SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE*)dlsym(nss_handle, "SECMOD_GetSystemFIPSEnabled");
-+  if ((errmsg = dlerror()) != NULL) {
-+    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "loadNSS: dlsym: %s\n",
-+                         errmsg);
-+    handle_msg(env, msg, msg_bytes);
-+    return JNI_FALSE;
-+  }
-+  return JNI_TRUE;
-+}
-+
-+static void closeNSS(JNIEnv *env)
-+{
-+  char msg[MSG_MAX_SIZE];
-+  int msg_bytes;
-+  const char* errmsg;
-+
-+  if (dlclose(nss_handle) != 0) {
-+    errmsg = dlerror();
-+    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "closeNSS: dlclose: %s\n",
-+                         errmsg);
-+    handle_msg(env, msg, msg_bytes);
-+  }
-+}
-+
-+#endif
-+
-+/*
-+ * Class:     java_security_SystemConfigurator
-+ * Method:    JNI_OnLoad
-+ */
-+JNIEXPORT jint JNICALL DEF_JNI_OnLoad(JavaVM *vm, void *reserved)
-+{
-+    JNIEnv *env;
-+    jclass sysConfCls, debugCls;
-+    jfieldID sdebugFld;
-+
-+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {
-+        return JNI_EVERSION; /* JNI version not supported */
-+    }
-+
-+    sysConfCls = (*env)->FindClass(env,"java/security/SystemConfigurator");
-+    if (sysConfCls == NULL) {
-+        printf("libsystemconf: SystemConfigurator class not found\n");
-+        return JNI_ERR;
-+    }
-+    sdebugFld = (*env)->GetStaticFieldID(env, sysConfCls,
-+            "sdebug", "Lsun/security/util/Debug;");
-+    if (sdebugFld == NULL) {
-+        printf("libsystemconf: SystemConfigurator::sdebug field not found\n");
-+        return JNI_ERR;
-+    }
-+    debugObj = (*env)->GetStaticObjectField(env, sysConfCls, sdebugFld);
-+    if (debugObj != NULL) {
-+        debugCls = (*env)->FindClass(env,"sun/security/util/Debug");
-+        if (debugCls == NULL) {
-+            printf("libsystemconf: Debug class not found\n");
-+            return JNI_ERR;
-+        }
-+        debugPrintlnMethodID = (*env)->GetMethodID(env, debugCls,
-+                "println", "(Ljava/lang/String;)V");
-+        if (debugPrintlnMethodID == NULL) {
-+            printf("libsystemconf: Debug::println(String) method not found\n");
-+            return JNI_ERR;
-+        }
-+        debugObj = (*env)->NewGlobalRef(env, debugObj);
-+    }
-+
-+#ifdef SYSCONF_NSS
-+    getSystemFIPSEnabled = *SECMOD_GetSystemFIPSEnabled;
-+#else
-+    if (loadNSS(env) == JNI_FALSE) {
-+      dbgPrint(env, "libsystemconf: Failed to load NSS library.");
-+    }
-+#endif
-+
-+    return (*env)->GetVersion(env);
-+}
-+
-+/*
-+ * Class:     java_security_SystemConfigurator
-+ * Method:    JNI_OnUnload
-+ */
-+JNIEXPORT void JNICALL DEF_JNI_OnUnload(JavaVM *vm, void *reserved)
-+{
-+    JNIEnv *env;
-+
-+    if (debugObj != NULL) {
-+        if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {
-+            return; /* Should not happen */
-+        }
-+#ifndef SYSCONF_NSS
-+        closeNSS(env);
-+#endif
-+        (*env)->DeleteGlobalRef(env, debugObj);
-+    }
-+}
-+
-+JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEnabled
-+  (JNIEnv *env, jclass cls)
-+{
-+    int fips_enabled;
-+    char msg[MSG_MAX_SIZE];
-+    int msg_bytes;
-+
-+    if (getSystemFIPSEnabled != NULL) {
-+      dbgPrint(env, "getSystemFIPSEnabled: calling SECMOD_GetSystemFIPSEnabled");
-+      fips_enabled = (*getSystemFIPSEnabled)();
-+      msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:"   \
-+                           " SECMOD_GetSystemFIPSEnabled returned 0x%x", fips_enabled);
-+      handle_msg(env, msg, msg_bytes);
-+      return (fips_enabled == 1 ? JNI_TRUE : JNI_FALSE);
-+    } else {
-+      FILE *fe;
-+
-+      dbgPrint(env, "getSystemFIPSEnabled: reading " FIPS_ENABLED_PATH);
-+      if ((fe = fopen(FIPS_ENABLED_PATH, "r")) == NULL) {
-+        throwIOException(env, "Cannot open " FIPS_ENABLED_PATH);
-+        return JNI_FALSE;
-+      }
-+      fips_enabled = fgetc(fe);
-+      fclose(fe);
-+      if (fips_enabled == EOF) {
-+        throwIOException(env, "Cannot read " FIPS_ENABLED_PATH);
-+        return JNI_FALSE;
-+      }
-+      msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:"   \
-+                           " read character is '%c'", fips_enabled);
-+      handle_msg(env, msg, msg_bytes);
-+      return (fips_enabled == '1' ? JNI_TRUE : JNI_FALSE);
-+    }
-+}
-+
-+#else // !LINUX
-+
-+JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEnabled
-+  (JNIEnv *env, jclass cls)
-+{
-+    return JNI_FALSE;
-+}
-+
-+#endif
-diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
-new file mode 100644
-index 00000000000..48d6d656a28
---- /dev/null
-+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
-@@ -0,0 +1,457 @@
-+/*
-+ * 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.security.interfaces.RSAPrivateCrtKey;
-+import java.security.interfaces.RSAPrivateKey;
-+import java.util.HashMap;
-+import java.util.Map;
-+import java.util.concurrent.locks.ReentrantLock;
-+
-+import javax.crypto.Cipher;
-+import javax.crypto.SecretKeyFactory;
-+import javax.crypto.spec.SecretKeySpec;
-+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.RV.*;
-+import sun.security.pkcs11.wrapper.PKCS11Exception;
-+import sun.security.rsa.RSAPrivateCrtKeyImpl;
-+import sun.security.rsa.RSAUtil;
-+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 volatile P11Key importerKey = null;
-+    private static SecretKeySpec exporterKey = null;
-+    private static volatile P11Key exporterKeyP11 = null;
-+    private static final ReentrantLock importerKeyLock = new ReentrantLock();
-+    // Do not take the exporterKeyLock with the importerKeyLock held.
-+    private static final ReentrantLock exporterKeyLock = new ReentrantLock();
-+    private static volatile CK_MECHANISM importerKeyMechanism = null;
-+    private static volatile CK_MECHANISM exporterKeyMechanism = null;
-+    private static Cipher importerCipher = null;
-+    private static Cipher exporterCipher = null;
-+
-+    private static volatile Provider sunECProvider = null;
-+    private static final ReentrantLock sunECProviderLock = 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,
-+                                " fips key importer");
-+                    }
-+                    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 (debug != null) {
-+                        debug.println("Unrecognized private key type.");
-+                    }
-+                    throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                            " fips key importer");
-+                }
-+            } 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,
-+                        " fips key importer");
-+            }
-+            attributes = new CK_ATTRIBUTE[attrsMap.size()];
-+            attrsMap.values().toArray(attributes);
-+            importerKeyLock.lock();
-+            try {
-+                // No need to reset the cipher object because no multi-part
-+                // operations are performed.
-+                encKeyBytes = importerCipher.doFinal(keyBytes);
-+            } finally {
-+                importerKeyLock.unlock();
-+            }
-+            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) {
-+            if (t instanceof PKCS11Exception) {
-+                throw (PKCS11Exception)t;
-+            }
-+            throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                    t.getMessage());
-+        } finally {
-+            importerKey.releaseKeyID();
-+        }
-+        return Long.valueOf(keyID);
-+    }
-+
-+    static void exportKey(SunPKCS11 sunPKCS11, long hSession, long hObject,
-+            long keyClass, long keyType, Map<Long, CK_ATTRIBUTE> sensitiveAttrs)
-+            throws PKCS11Exception {
-+        Token token = sunPKCS11.getToken();
-+        if (debug != null) {
-+            debug.println("Private or Secret key will be exported in" +
-+                    " system FIPS mode.");
-+        }
-+        if (exporterKeyP11 == null) {
-+            try {
-+                exporterKeyLock.lock();
-+                if (exporterKeyP11 == null) {
-+                    if (exporterKeyMechanism == null) {
-+                        // Exporter Key creation has not been tried yet. Try it.
-+                        createExporterKey(token);
-+                    }
-+                    if (exporterKeyP11 == null || exporterCipher == null) {
-+                        if (debug != null) {
-+                            debug.println("Exporter Key could not be" +
-+                                    " generated.");
-+                        }
-+                        throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                                " fips key exporter");
-+                    }
-+                    if (debug != null) {
-+                        debug.println("Exporter Key successfully" +
-+                                " generated.");
-+                    }
-+                }
-+            } finally {
-+                exporterKeyLock.unlock();
-+            }
-+        }
-+        long exporterKeyID = exporterKeyP11.getKeyID();
-+        try {
-+            byte[] wrappedKeyBytes = token.p11.C_WrapKey(hSession,
-+                    exporterKeyMechanism, exporterKeyID, hObject);
-+            byte[] plainExportedKey = null;
-+            exporterKeyLock.lock();
-+            try {
-+                // No need to reset the cipher object because no multi-part
-+                // operations are performed.
-+                plainExportedKey = exporterCipher.doFinal(wrappedKeyBytes);
-+            } finally {
-+                exporterKeyLock.unlock();
-+            }
-+            if (keyClass == CKO_PRIVATE_KEY) {
-+                exportPrivateKey(sensitiveAttrs, keyType, plainExportedKey);
-+            } else if (keyClass == CKO_SECRET_KEY) {
-+                checkAttrs(sensitiveAttrs, "CKO_SECRET_KEY", CKA_VALUE);
-+                // CKA_VALUE is guaranteed to be present, since sensitiveAttrs'
-+                // size is greater than 0 and no invalid attributes exist
-+                sensitiveAttrs.get(CKA_VALUE).pValue = plainExportedKey;
-+            } else {
-+                throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                        " fips key exporter");
-+            }
-+        } catch (Throwable t) {
-+            if (t instanceof PKCS11Exception) {
-+                throw (PKCS11Exception)t;
-+            }
-+            throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                    t.getMessage());
-+        } finally {
-+            exporterKeyP11.releaseKeyID();
-+        }
-+    }
-+
-+    private static void exportPrivateKey(
-+            Map<Long, CK_ATTRIBUTE> sensitiveAttrs, long keyType,
-+            byte[] plainExportedKey) throws Throwable {
-+        if (keyType == CKK_RSA) {
-+            checkAttrs(sensitiveAttrs, "CKO_PRIVATE_KEY CKK_RSA",
-+                    CKA_PRIVATE_EXPONENT, CKA_PRIME_1, CKA_PRIME_2,
-+                    CKA_EXPONENT_1, CKA_EXPONENT_2, CKA_COEFFICIENT);
-+            RSAPrivateKey rsaPKey = RSAPrivateCrtKeyImpl.newKey(
-+                    RSAUtil.KeyType.RSA, "PKCS#8", plainExportedKey);
-+            CK_ATTRIBUTE attr;
-+            if ((attr = sensitiveAttrs.get(CKA_PRIVATE_EXPONENT)) != null) {
-+                attr.pValue = rsaPKey.getPrivateExponent().toByteArray();
-+            }
-+            if (rsaPKey instanceof RSAPrivateCrtKey) {
-+                RSAPrivateCrtKey rsaPCrtKey = (RSAPrivateCrtKey) rsaPKey;
-+                if ((attr = sensitiveAttrs.get(CKA_PRIME_1)) != null) {
-+                    attr.pValue = rsaPCrtKey.getPrimeP().toByteArray();
-+                }
-+                if ((attr = sensitiveAttrs.get(CKA_PRIME_2)) != null) {
-+                    attr.pValue = rsaPCrtKey.getPrimeQ().toByteArray();
-+                }
-+                if ((attr = sensitiveAttrs.get(CKA_EXPONENT_1)) != null) {
-+                    attr.pValue = rsaPCrtKey.getPrimeExponentP().toByteArray();
-+                }
-+                if ((attr = sensitiveAttrs.get(CKA_EXPONENT_2)) != null) {
-+                    attr.pValue = rsaPCrtKey.getPrimeExponentQ().toByteArray();
-+                }
-+                if ((attr = sensitiveAttrs.get(CKA_COEFFICIENT)) != null) {
-+                    attr.pValue = rsaPCrtKey.getCrtCoefficient().toByteArray();
-+                }
-+            } else {
-+                checkAttrs(sensitiveAttrs, "CKO_PRIVATE_KEY CKK_RSA",
-+                        CKA_PRIVATE_EXPONENT);
-+            }
-+        } else if (keyType == CKK_DSA) {
-+            checkAttrs(sensitiveAttrs, "CKO_PRIVATE_KEY CKK_DSA", CKA_VALUE);
-+            // CKA_VALUE is guaranteed to be present, since sensitiveAttrs'
-+            // size is greater than 0 and no invalid attributes exist
-+            sensitiveAttrs.get(CKA_VALUE).pValue =
-+                    new sun.security.provider.DSAPrivateKey(plainExportedKey)
-+                            .getX().toByteArray();
-+        } else if (keyType == CKK_EC) {
-+            checkAttrs(sensitiveAttrs, "CKO_PRIVATE_KEY CKK_EC", CKA_VALUE);
-+            // CKA_VALUE is guaranteed to be present, since sensitiveAttrs'
-+            // size is greater than 0 and no invalid attributes exist
-+            sensitiveAttrs.get(CKA_VALUE).pValue =
-+                    ECUtil.decodePKCS8ECPrivateKey(plainExportedKey)
-+                            .getS().toByteArray();
-+        } else {
-+            throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                    " unsupported CKO_PRIVATE_KEY key type: " + keyType);
-+        }
-+    }
-+
-+    private static void checkAttrs(Map<Long, CK_ATTRIBUTE> sensitiveAttrs,
-+                                     String keyName, long... validAttrs)
-+            throws PKCS11Exception {
-+        int sensitiveAttrsCount = sensitiveAttrs.size();
-+        if (sensitiveAttrsCount <= validAttrs.length) {
-+            int validAttrsCount = 0;
-+            for (long validAttr : validAttrs) {
-+                if (sensitiveAttrs.containsKey(validAttr)) validAttrsCount++;
-+            }
-+            if (validAttrsCount == sensitiveAttrsCount) return;
-+        }
-+        throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                " invalid attribute types for a " + keyName + " key object");
-+    }
-+
-+    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");
-+                importerCipher.init(Cipher.ENCRYPT_MODE, importerKey,
-+                        new IvParameterSpec(
-+                                (byte[])importerKeyMechanism.pParameter), null);
-+            }
-+        } 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.
-+            if (debug != null) {
-+                debug.println("Error generating the Importer Key");
-+            }
-+        }
-+    }
-+
-+    private static void createExporterKey(Token token) {
-+        if (debug != null) {
-+            debug.println("Generating Exporter Key...");
-+        }
-+        byte[] iv = new byte[16];
-+        JCAUtil.getSecureRandom().nextBytes(iv);
-+        exporterKeyMechanism = new CK_MECHANISM(CKM_AES_CBC_PAD, iv);
-+        byte[] exporterKeyRaw = new byte[32];
-+        JCAUtil.getSecureRandom().nextBytes(exporterKeyRaw);
-+        exporterKey = new SecretKeySpec(exporterKeyRaw, "AES");
-+        try {
-+            SecretKeyFactory skf = SecretKeyFactory.getInstance("AES");
-+            exporterKeyP11 = (P11Key)(skf.translateKey(exporterKey));
-+            if (exporterKeyP11 != null) {
-+                exporterCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-+                exporterCipher.init(Cipher.DECRYPT_MODE, exporterKey,
-+                        new IvParameterSpec(
-+                                (byte[])exporterKeyMechanism.pParameter), null);
-+            }
-+        } catch (Throwable t) {
-+            // best effort
-+            exporterKey = null;
-+            exporterKeyP11 = null;
-+            exporterCipher = null;
-+            // exporterKeyMechanism value is kept initialized to indicate that
-+            // Exporter Key creation has been tried and failed.
-+            if (debug != null) {
-+                debug.println("Error generating the Exporter Key");
-+            }
-+        }
-+    }
-+}
-diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSTokenLoginHandler.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSTokenLoginHandler.java
-new file mode 100644
-index 00000000000..f8d505ca815
---- /dev/null
-+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSTokenLoginHandler.java
-@@ -0,0 +1,149 @@
-+/*
-+ * Copyright (c) 2022, 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.io.BufferedReader;
-+import java.io.ByteArrayInputStream;
-+import java.io.InputStream;
-+import java.io.InputStreamReader;
-+import java.io.IOException;
-+import java.nio.charset.StandardCharsets;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.nio.file.StandardOpenOption;
-+import java.security.ProviderException;
-+
-+import javax.security.auth.callback.Callback;
-+import javax.security.auth.callback.CallbackHandler;
-+import javax.security.auth.callback.PasswordCallback;
-+import javax.security.auth.callback.UnsupportedCallbackException;
-+
-+import sun.security.util.Debug;
-+import sun.security.util.SecurityProperties;
-+
-+final class FIPSTokenLoginHandler implements CallbackHandler {
-+
-+    private static final String FIPS_NSSDB_PIN_PROP = "fips.nssdb.pin";
-+
-+    private static final Debug debug = Debug.getInstance("sunpkcs11");
-+
-+    public void handle(Callback[] callbacks)
-+            throws IOException, UnsupportedCallbackException {
-+        if (!(callbacks[0] instanceof PasswordCallback)) {
-+            throw new UnsupportedCallbackException(callbacks[0]);
-+        }
-+        PasswordCallback pc = (PasswordCallback)callbacks[0];
-+        pc.setPassword(getFipsNssdbPin());
-+    }
-+
-+    private static char[] getFipsNssdbPin() throws ProviderException {
-+        if (debug != null) {
-+            debug.println("FIPS: Reading NSS DB PIN for token...");
-+        }
-+        String pinProp = SecurityProperties
-+                .privilegedGetOverridable(FIPS_NSSDB_PIN_PROP);
-+        if (pinProp != null && !pinProp.isEmpty()) {
-+            String[] pinPropParts = pinProp.split(":", 2);
-+            if (pinPropParts.length < 2) {
-+                throw new ProviderException("Invalid " + FIPS_NSSDB_PIN_PROP +
-+                        " property value.");
-+            }
-+            String prefix = pinPropParts[0].toLowerCase();
-+            String value = pinPropParts[1];
-+            String pin = null;
-+            if (prefix.equals("env")) {
-+                if (debug != null) {
-+                    debug.println("FIPS: PIN value from the '" + value +
-+                            "' environment variable.");
-+                }
-+                pin = System.getenv(value);
-+            } else if (prefix.equals("file")) {
-+                if (debug != null) {
-+                    debug.println("FIPS: PIN value from the '" + value +
-+                            "' file.");
-+                }
-+                pin = getPinFromFile(Paths.get(value));
-+            } else if (prefix.equals("pin")) {
-+                if (debug != null) {
-+                    debug.println("FIPS: PIN value from the " +
-+                            FIPS_NSSDB_PIN_PROP + " property.");
-+                }
-+                pin = value;
-+            } else {
-+                throw new ProviderException("Unsupported prefix for " +
-+                        FIPS_NSSDB_PIN_PROP + ".");
-+            }
-+            if (pin != null && !pin.isEmpty()) {
-+                if (debug != null) {
-+                    debug.println("FIPS: non-empty PIN.");
-+                }
-+                /*
-+                 * C_Login in libj2pkcs11 receives the PIN in a char[] and
-+                 * discards the upper byte of each char, before passing
-+                 * the value to the NSS Software Token. However, the
-+                 * NSS Software Token accepts any UTF-8 PIN value. Thus,
-+                 * expand the PIN here to account for later truncation.
-+                 */
-+                byte[] pinUtf8 = pin.getBytes(StandardCharsets.UTF_8);
-+                char[] pinChar = new char[pinUtf8.length];
-+                for (int i = 0; i < pinChar.length; i++) {
-+                    pinChar[i] = (char)(pinUtf8[i] & 0xFF);
-+                }
-+                return pinChar;
-+            }
-+        }
-+        if (debug != null) {
-+            debug.println("FIPS: empty PIN.");
-+        }
-+        return null;
-+    }
-+
-+    /*
-+     * This method extracts the token PIN from the first line of a password
-+     * file in the same way as NSS modutil. See for example the -newpwfile
-+     * argument used to change the password for an NSS DB.
-+     */
-+    private static String getPinFromFile(Path f) throws ProviderException {
-+        try (InputStream is =
-+                Files.newInputStream(f, StandardOpenOption.READ)) {
-+            /*
-+             * SECU_FilePasswd in NSS (nss/cmd/lib/secutil.c), used by modutil,
-+             * reads up to 4096 bytes. In addition, the NSS Software Token
-+             * does not accept PINs longer than 500 bytes (see SFTK_MAX_PIN
-+             * in nss/lib/softoken/pkcs11i.h).
-+             */
-+            BufferedReader in =
-+                    new BufferedReader(new InputStreamReader(
-+                            new ByteArrayInputStream(is.readNBytes(4096)),
-+                            StandardCharsets.UTF_8));
-+            return in.readLine();
-+        } catch (IOException ioe) {
-+            throw new ProviderException("Error reading " + FIPS_NSSDB_PIN_PROP +
-+                    " from the '" + f + "' file.", ioe);
-+        }
-+    }
-+}
-\ No newline at end of file
-diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
-index a76b37dd4c8..94673b51708 100644
---- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
-+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
-@@ -37,6 +37,8 @@ import javax.crypto.*;
- import javax.crypto.interfaces.*;
- import javax.crypto.spec.*;
- 
-+import jdk.internal.access.SharedSecrets;
-+
- import sun.security.rsa.RSAUtil.KeyType;
- import sun.security.rsa.RSAPublicKeyImpl;
- import sun.security.rsa.RSAPrivateCrtKeyImpl;
-@@ -72,6 +74,9 @@ abstract class P11Key implements Key, Length {
-     @Serial
-     private static final long serialVersionUID = -2575874101938349339L;
- 
-+    private static final boolean plainKeySupportEnabled = SharedSecrets
-+            .getJavaSecuritySystemConfiguratorAccess().isPlainKeySupportEnabled();
-+
-     private static final String PUBLIC = "public";
-     private static final String PRIVATE = "private";
-     private static final String SECRET = "secret";
-@@ -414,9 +419,10 @@ abstract class P11Key implements Key, Length {
-                     new CK_ATTRIBUTE(CKA_EXTRACTABLE),
-         });
- 
--        boolean keySensitive =
--                (attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
--                attrs[1].getBoolean() || !attrs[2].getBoolean();
-+        boolean exportable = plainKeySupportEnabled && !algorithm.equals("DH");
-+        boolean keySensitive = (!exportable &&
-+               ((attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
-+                attrs[1].getBoolean() || !attrs[2].getBoolean()));
- 
-         return switch (algorithm) {
-             case "RSA" -> P11RSAPrivateKeyInternal.of(session, keyID, algorithm,
-@@ -468,7 +474,8 @@ abstract class P11Key implements Key, Length {
- 
-         public String getFormat() {
-             token.ensureValid();
--            if (sensitive || !extractable || (isNSS && tokenObject)) {
-+            if (!plainKeySupportEnabled &&
-+                (sensitive || !extractable || (isNSS && tokenObject))) {
-                 return null;
-             } else {
-                 return "RAW";
-@@ -1664,4 +1671,3 @@ final class SessionKeyRef extends PhantomReference<P11Key> {
-         this.clear();
-     }
- }
--
-diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-index aaafc373f80..6466581f4ae 100644
---- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-+++ b/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.util.stream.Collectors;
- import java.security.*;
-@@ -42,10 +45,12 @@ 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;
- import static sun.security.util.SecurityConstants.PROVIDER_VER;
-+import sun.security.util.SecurityProperties;
- import static sun.security.util.SecurityProviderConstants.getAliases;
- 
- import sun.security.pkcs11.Secmod.*;
-@@ -65,6 +70,39 @@ public final class SunPKCS11 extends AuthProvider {
-     @Serial
-     private static final long serialVersionUID = -1354835039035306505L;
- 
-+    private static final boolean systemFipsEnabled = SharedSecrets
-+            .getJavaSecuritySystemConfiguratorAccess().isSystemFipsEnabled();
-+
-+    private static final boolean plainKeySupportEnabled = SharedSecrets
-+            .getJavaSecuritySystemConfiguratorAccess().isPlainKeySupportEnabled();
-+
-+    private static final MethodHandle fipsImportKey;
-+    private static final MethodHandle fipsExportKey;
-+    static {
-+        MethodHandle fipsImportKeyTmp = null;
-+        MethodHandle fipsExportKeyTmp = null;
-+        if (plainKeySupportEnabled) {
-+            try {
-+                fipsImportKeyTmp = MethodHandles.lookup().findStatic(
-+                        FIPSKeyImporter.class, "importKey",
-+                        MethodType.methodType(Long.class, SunPKCS11.class,
-+                        long.class, CK_ATTRIBUTE[].class));
-+                fipsExportKeyTmp = MethodHandles.lookup().findStatic(
-+                        FIPSKeyImporter.class, "exportKey",
-+                        MethodType.methodType(void.class, SunPKCS11.class,
-+                        long.class, long.class,
-+                        long.class, long.class, Map.class));
-+            } catch (Throwable t) {
-+                throw new SecurityException("FIPS key importer-exporter" +
-+                        " initialization failed", t);
-+            }
-+        }
-+        fipsImportKey = fipsImportKeyTmp;
-+        fipsExportKey = fipsExportKeyTmp;
-+    }
-+
-+    private static final String FIPS_NSSDB_PATH_PROP = "fips.nssdb.path";
-+
-     static final Debug debug = Debug.getInstance("sunpkcs11");
-     // the PKCS11 object through which we make the native calls
-     @SuppressWarnings("serial") // Type of field is not Serializable;
-@@ -123,6 +161,29 @@ public final class SunPKCS11 extends AuthProvider {
-             return AccessController.doPrivileged(new PrivilegedExceptionAction<>() {
-                 @Override
-                 public SunPKCS11 run() throws Exception {
-+                    if (systemFipsEnabled) {
-+                        /*
-+                         * The nssSecmodDirectory attribute in the SunPKCS11
-+                         * NSS configuration file takes the value of the
-+                         * fips.nssdb.path System property after expansion.
-+                         * Security properties expansion is unsupported.
-+                         */
-+                        String nssdbPath =
-+                                SecurityProperties.privilegedGetOverridable(
-+                                        FIPS_NSSDB_PATH_PROP);
-+                        if (System.getSecurityManager() != null) {
-+                            AccessController.doPrivileged(
-+                                    (PrivilegedAction<Void>) () -> {
-+                                        System.setProperty(
-+                                                FIPS_NSSDB_PATH_PROP,
-+                                                nssdbPath);
-+                                        return null;
-+                                    });
-+                        } else {
-+                            System.setProperty(
-+                                    FIPS_NSSDB_PATH_PROP, nssdbPath);
-+                        }
-+                    }
-                     return new SunPKCS11(new Config(newConfigName));
-                 }
-             });
-@@ -325,9 +386,19 @@ public final class SunPKCS11 extends AuthProvider {
-             // request multithreaded access first
-             initArgs.flags = CKF_OS_LOCKING_OK;
-             PKCS11 tmpPKCS11;
-+            MethodHandle fipsKeyImporter = null;
-+            MethodHandle fipsKeyExporter = null;
-+            if (plainKeySupportEnabled) {
-+                fipsKeyImporter = MethodHandles.insertArguments(
-+                        fipsImportKey, 0, this);
-+                fipsKeyExporter = MethodHandles.insertArguments(
-+                        fipsExportKey, 0, this);
-+            }
-             try {
--                tmpPKCS11 = PKCS11.getInstance(library, functionList, initArgs,
--                    config.getOmitInitialize());
-+                tmpPKCS11 = PKCS11.getInstance(
-+                    library, functionList, initArgs,
-+                    config.getOmitInitialize(), fipsKeyImporter,
-+                    fipsKeyExporter);
-             } catch (PKCS11Exception e) {
-                 if (debug != null) {
-                     debug.println("Multi-threaded initialization failed: " + e);
-@@ -342,8 +413,9 @@ public final class SunPKCS11 extends AuthProvider {
-                 } else {
-                     initArgs.flags = 0;
-                 }
--                tmpPKCS11 = PKCS11.getInstance(library, functionList, initArgs,
--                    config.getOmitInitialize());
-+                tmpPKCS11 = PKCS11.getInstance(library,
-+                    functionList, initArgs, config.getOmitInitialize(), fipsKeyImporter,
-+                    fipsKeyExporter);
-             }
-             p11 = tmpPKCS11;
- 
-@@ -1390,11 +1462,52 @@ public final class SunPKCS11 extends AuthProvider {
-         }
- 
-         @Override
-+        @SuppressWarnings("removal")
-         public Object newInstance(Object param)
-                 throws NoSuchAlgorithmException {
-             if (!token.isValid()) {
-                 throw new NoSuchAlgorithmException("Token has been removed");
-             }
-+            if (systemFipsEnabled && !token.fipsLoggedIn &&
-+                    !getType().equals("KeyStore")) {
-+                /*
-+                 * The NSS Software Token in FIPS 140-2 mode requires a
-+                 * user login for most operations. See sftk_fipsCheck
-+                 * (nss/lib/softoken/fipstokn.c). In case of a KeyStore
-+                 * service, let the caller perform the login with
-+                 * KeyStore::load. Keytool, for example, does this to pass a
-+                 * PIN from either the -srcstorepass or -deststorepass
-+                 * argument. In case of a non-KeyStore service, perform the
-+                 * login now with the PIN available in the fips.nssdb.pin
-+                 * property.
-+                 */
-+                try {
-+                    if (System.getSecurityManager() != null) {
-+                        try {
-+                            AccessController.doPrivileged(
-+                                    (PrivilegedExceptionAction<Void>) () -> {
-+                                        token.ensureLoggedIn(null);
-+                                        return null;
-+                                    });
-+                        } catch (PrivilegedActionException pae) {
-+                            Exception e = pae.getException();
-+                            if (e instanceof LoginException le) {
-+                                throw le;
-+                            } else if (e instanceof PKCS11Exception p11e) {
-+                                throw p11e;
-+                            } else {
-+                                throw new RuntimeException(e);
-+                            }
-+                        }
-+                    } else {
-+                        token.ensureLoggedIn(null);
-+                    }
-+                } catch (PKCS11Exception | LoginException e) {
-+                    throw new ProviderException("FIPS: error during the Token" +
-+                            " login required for the " + getType() +
-+                            " service.", e);
-+                }
-+            }
-             try {
-                 return newInstance0(param);
-             } catch (PKCS11Exception e) {
-@@ -1753,6 +1866,9 @@ public final class SunPKCS11 extends AuthProvider {
-         try {
-             session = token.getOpSession();
-             p11.C_Logout(session.id());
-+            if (systemFipsEnabled) {
-+                token.fipsLoggedIn = false;
-+            }
-             if (debug != null) {
-                 debug.println("logout succeeded");
-             }
-diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
-index a6f5f0a8764..9a07c96ca4e 100644
---- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
-+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
-@@ -33,6 +33,7 @@ import java.lang.ref.*;
- import java.security.*;
- import javax.security.auth.login.LoginException;
- 
-+import jdk.internal.access.SharedSecrets;
- import sun.security.jca.JCAUtil;
- 
- import sun.security.pkcs11.wrapper.*;
-@@ -48,6 +49,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Exception.RV.*;
-  */
- final class Token implements Serializable {
- 
-+    private static final boolean systemFipsEnabled = SharedSecrets
-+            .getJavaSecuritySystemConfiguratorAccess().isSystemFipsEnabled();
-+
-     // need to be serializable to allow SecureRandom to be serialized
-     @Serial
-     private static final long serialVersionUID = 2541527649100571747L;
-@@ -125,6 +129,10 @@ final class Token implements Serializable {
-     // flag indicating whether we are logged in
-     private volatile boolean loggedIn;
- 
-+    // Flag indicating the login status for the NSS Software Token in FIPS mode.
-+    // This Token is never asynchronously removed. Used from SunPKCS11.
-+    volatile boolean fipsLoggedIn;
-+
-     // time we last checked login status
-     private long lastLoginCheck;
- 
-@@ -242,7 +250,12 @@ final class Token implements Serializable {
-     // call provider.login() if not
-     void ensureLoggedIn(Session session) throws PKCS11Exception, LoginException {
-         if (!isLoggedIn(session)) {
--            provider.login(null, null);
-+            if (systemFipsEnabled) {
-+                provider.login(null, new FIPSTokenLoginHandler());
-+                fipsLoggedIn = true;
-+            } else {
-+                provider.login(null, null);
-+            }
-         }
-     }
- 
-diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
-index 0fd13fd6fa6..3c959c942a1 100644
---- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
-+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
-@@ -49,6 +49,9 @@ package sun.security.pkcs11.wrapper;
- 
- import java.io.File;
- import java.io.IOException;
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.invoke.MethodType;
- import java.util.*;
- 
- import java.security.AccessController;
-@@ -174,18 +177,43 @@ public class PKCS11 {
-         return version;
-     }
- 
-+    /*
-+     * Compatibility wrapper to allow this method to work as before
-+     * when FIPS mode support is not active.
-+     */
-+    public static synchronized PKCS11 getInstance(String pkcs11ModulePath,
-+           String functionList, CK_C_INITIALIZE_ARGS pInitArgs,
-+           boolean omitInitialize) throws IOException, PKCS11Exception {
-+        return getInstance(pkcs11ModulePath, functionList,
-+                           pInitArgs, omitInitialize, null, null);
-+    }
-+
-     public static synchronized PKCS11 getInstance(String pkcs11ModulePath,
-             String functionList, CK_C_INITIALIZE_ARGS pInitArgs,
--            boolean omitInitialize) throws IOException, PKCS11Exception {
-+            boolean omitInitialize, MethodHandle fipsKeyImporter,
-+            MethodHandle fipsKeyExporter)
-+                    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 &&
-+                    fipsKeyExporter != null;
-             if ((pInitArgs != null)
-                     && ((pInitArgs.flags & CKF_OS_LOCKING_OK) != 0)) {
--                pkcs11 = new PKCS11(pkcs11ModulePath, functionList);
-+                if (nssFipsMode) {
-+                    pkcs11 = new FIPSPKCS11(pkcs11ModulePath, functionList,
-+                            fipsKeyImporter, fipsKeyExporter);
-+                } else {
-+                    pkcs11 = new PKCS11(pkcs11ModulePath, functionList);
-+                }
-             } else {
--                pkcs11 = new SynchronizedPKCS11(pkcs11ModulePath, functionList);
-+                if (nssFipsMode) {
-+                    pkcs11 = new SynchronizedFIPSPKCS11(pkcs11ModulePath,
-+                            functionList, fipsKeyImporter, fipsKeyExporter);
-+                } else {
-+                    pkcs11 = new SynchronizedPKCS11(pkcs11ModulePath, functionList);
-+                }
-             }
-             if (omitInitialize == false) {
-                 try {
-@@ -2012,4 +2040,194 @@ 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;
-+    private MethodHandle fipsKeyExporter;
-+    private MethodHandle hC_GetAttributeValue;
-+    FIPSPKCS11(String pkcs11ModulePath, String functionListName,
-+            MethodHandle fipsKeyImporter, MethodHandle fipsKeyExporter)
-+                    throws IOException {
-+        super(pkcs11ModulePath, functionListName);
-+        this.fipsKeyImporter = fipsKeyImporter;
-+        this.fipsKeyExporter = fipsKeyExporter;
-+        try {
-+            hC_GetAttributeValue = MethodHandles.insertArguments(
-+                    MethodHandles.lookup().findSpecial(PKCS11.class,
-+                            "C_GetAttributeValue", MethodType.methodType(
-+                                    void.class, long.class, long.class,
-+                                    CK_ATTRIBUTE[].class),
-+                            FIPSPKCS11.class), 0, this);
-+        } catch (Throwable t) {
-+            throw new RuntimeException(
-+                    "sun.security.pkcs11.wrapper.PKCS11" +
-+                    "::C_GetAttributeValue method not found.", t);
-+        }
-+    }
-+
-+    public 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) {
-+                if (t instanceof PKCS11Exception) {
-+                    throw (PKCS11Exception)t;
-+                }
-+                throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                        t.getMessage());
-+            }
-+        }
-+        return super.C_CreateObject(hSession, pTemplate);
-+    }
-+
-+    public void C_GetAttributeValue(long hSession, long hObject,
-+            CK_ATTRIBUTE[] pTemplate) throws PKCS11Exception {
-+        FIPSPKCS11Helper.C_GetAttributeValue(hC_GetAttributeValue,
-+                fipsKeyExporter, hSession, hObject, pTemplate);
-+    }
-+}
-+
-+// FIPSPKCS11 synchronized counterpart.
-+static class SynchronizedFIPSPKCS11 extends SynchronizedPKCS11 {
-+    private MethodHandle fipsKeyImporter;
-+    private MethodHandle fipsKeyExporter;
-+    private MethodHandle hC_GetAttributeValue;
-+    SynchronizedFIPSPKCS11(String pkcs11ModulePath, String functionListName,
-+            MethodHandle fipsKeyImporter, MethodHandle fipsKeyExporter)
-+                    throws IOException {
-+        super(pkcs11ModulePath, functionListName);
-+        this.fipsKeyImporter = fipsKeyImporter;
-+        this.fipsKeyExporter = fipsKeyExporter;
-+        try {
-+            hC_GetAttributeValue = MethodHandles.insertArguments(
-+                    MethodHandles.lookup().findSpecial(SynchronizedPKCS11.class,
-+                            "C_GetAttributeValue", MethodType.methodType(
-+                                    void.class, long.class, long.class,
-+                                    CK_ATTRIBUTE[].class),
-+                            SynchronizedFIPSPKCS11.class), 0, this);
-+        } catch (Throwable t) {
-+            throw new RuntimeException(
-+                    "sun.security.pkcs11.wrapper.SynchronizedPKCS11" +
-+                    "::C_GetAttributeValue method not found.", t);
-+        }
-+    }
-+
-+    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) {
-+                if (t instanceof PKCS11Exception) {
-+                    throw (PKCS11Exception)t;
-+                }
-+                throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                        t.getMessage());
-+            }
-+        }
-+        return super.C_CreateObject(hSession, pTemplate);
-+    }
-+
-+    public synchronized void C_GetAttributeValue(long hSession, long hObject,
-+            CK_ATTRIBUTE[] pTemplate) throws PKCS11Exception {
-+        FIPSPKCS11Helper.C_GetAttributeValue(hC_GetAttributeValue,
-+                fipsKeyExporter, hSession, hObject, 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;
-+    }
-+    static void C_GetAttributeValue(MethodHandle hC_GetAttributeValue,
-+            MethodHandle fipsKeyExporter, long hSession, long hObject,
-+            CK_ATTRIBUTE[] pTemplate) throws PKCS11Exception {
-+        Map<Long, CK_ATTRIBUTE> sensitiveAttrs = new HashMap<>();
-+        List<CK_ATTRIBUTE> nonSensitiveAttrs = new LinkedList<>();
-+        FIPSPKCS11Helper.getAttributesBySensitivity(pTemplate,
-+                sensitiveAttrs, nonSensitiveAttrs);
-+        try {
-+            if (sensitiveAttrs.size() > 0) {
-+                long keyClass = -1L;
-+                long keyType = -1L;
-+                try {
-+                    // Secret and private keys have both class and type
-+                    // attributes, so we can query them at once.
-+                    CK_ATTRIBUTE[] queryAttrs = new CK_ATTRIBUTE[]{
-+                            new CK_ATTRIBUTE(CKA_CLASS),
-+                            new CK_ATTRIBUTE(CKA_KEY_TYPE),
-+                    };
-+                    hC_GetAttributeValue.invoke(hSession, hObject, queryAttrs);
-+                    keyClass = queryAttrs[0].getLong();
-+                    keyType = queryAttrs[1].getLong();
-+                } catch (PKCS11Exception e) {
-+                    // If the query fails, the object is neither a secret nor a
-+                    // private key. As this case won't be handled with the FIPS
-+                    // Key Exporter, we keep keyClass initialized to -1L.
-+                }
-+                if (keyClass == CKO_SECRET_KEY || keyClass == CKO_PRIVATE_KEY) {
-+                    fipsKeyExporter.invoke(hSession, hObject, keyClass, keyType,
-+                            sensitiveAttrs);
-+                    if (nonSensitiveAttrs.size() > 0) {
-+                        CK_ATTRIBUTE[] pNonSensitiveAttrs =
-+                                new CK_ATTRIBUTE[nonSensitiveAttrs.size()];
-+                        int i = 0;
-+                        for (CK_ATTRIBUTE nonSensAttr : nonSensitiveAttrs) {
-+                            pNonSensitiveAttrs[i++] = nonSensAttr;
-+                        }
-+                        hC_GetAttributeValue.invoke(hSession, hObject,
-+                                pNonSensitiveAttrs);
-+                        // libj2pkcs11 allocates new CK_ATTRIBUTE objects, so we
-+                        // update the reference on the previous CK_ATTRIBUTEs
-+                        i = 0;
-+                        for (CK_ATTRIBUTE nonSensAttr : nonSensitiveAttrs) {
-+                            nonSensAttr.pValue = pNonSensitiveAttrs[i++].pValue;
-+                        }
-+                    }
-+                    return;
-+                }
-+            }
-+            hC_GetAttributeValue.invoke(hSession, hObject, pTemplate);
-+        } catch (Throwable t) {
-+            if (t instanceof PKCS11Exception) {
-+                throw (PKCS11Exception)t;
-+            }
-+            throw new PKCS11Exception(CKR_GENERAL_ERROR,
-+                    t.getMessage());
-+        }
-+    }
-+    private static void getAttributesBySensitivity(CK_ATTRIBUTE[] pTemplate,
-+            Map<Long, CK_ATTRIBUTE> sensitiveAttrs,
-+            List<CK_ATTRIBUTE> nonSensitiveAttrs) {
-+        for (CK_ATTRIBUTE attr : pTemplate) {
-+            long type = attr.type;
-+            // Aligned with NSS' sftk_isSensitive in lib/softoken/pkcs11u.c
-+            if (type == CKA_VALUE || type == CKA_PRIVATE_EXPONENT ||
-+                    type == CKA_PRIME_1 || type == CKA_PRIME_2 ||
-+                    type == CKA_EXPONENT_1 || type == CKA_EXPONENT_2 ||
-+                    type == CKA_COEFFICIENT) {
-+                sensitiveAttrs.put(type, attr);
-+            } else {
-+                nonSensitiveAttrs.add(attr);
-+            }
-+        }
-+    }
-+}
- }
-diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
-index 920422376f8..6aa308fa5f8 100644
---- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
-+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
-@@ -215,6 +215,14 @@ public class PKCS11Exception extends Exception {
-         return res;
-     }
- 
-+    /**
-+     * Constructor taking the error code from the RV enum and
-+     * extra info for error message.
-+     */
-+    public PKCS11Exception(RV errorEnum, String extraInfo) {
-+        this(errorEnum.value, extraInfo);
-+    }
-+
-     /**
-      * Constructor taking the error code (the CKR_* constants in PKCS#11) and
-      * extra info for error message.
-diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
-index 7f8c4dba002..e65b11fc3ee 100644
---- a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
-+++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
-@@ -34,6 +34,7 @@ import java.security.ProviderException;
- import java.util.HashMap;
- import java.util.List;
- 
-+import jdk.internal.access.SharedSecrets;
- import sun.security.ec.ed.EdDSAKeyFactory;
- import sun.security.ec.ed.EdDSAKeyPairGenerator;
- import sun.security.ec.ed.EdDSASignature;
-@@ -50,6 +51,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) {
-@@ -240,83 +245,85 @@ 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 ProviderServiceA(this, "KeyPairGenerator",
--            "EC", "sun.security.ec.ECKeyPairGenerator", 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 ProviderServiceA(this, "KeyPairGenerator",
-+                "EC", "sun.security.ec.ECKeyPairGenerator", ATTRS));
-+
-+            /*
-+             * Key Agreement engine
-+             */
-+            putService(new ProviderService(this, "KeyAgreement",
-+                "ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
-+        }
-     }
- 
-     private void putXDHEntries() {
-@@ -333,23 +340,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() {
-@@ -364,21 +373,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));
-+        }
- 
-     }
- }
-diff --git a/test/jdk/sun/security/pkcs11/fips/NssdbPin.java b/test/jdk/sun/security/pkcs11/fips/NssdbPin.java
-new file mode 100644
-index 00000000000..ce01c655eb8
---- /dev/null
-+++ b/test/jdk/sun/security/pkcs11/fips/NssdbPin.java
-@@ -0,0 +1,349 @@
-+/*
-+ * Copyright (c) 2022, 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.
-+ */
-+
-+import java.lang.reflect.Method;
-+import java.nio.charset.StandardCharsets;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.security.KeyStore;
-+import java.security.Provider;
-+import java.security.Security;
-+import java.util.Arrays;
-+import java.util.function.Consumer;
-+import java.util.List;
-+import javax.crypto.Cipher;
-+import javax.crypto.spec.SecretKeySpec;
-+
-+import jdk.test.lib.process.Proc;
-+import jdk.test.lib.util.FileUtils;
-+
-+/*
-+ * @test
-+ * @bug 9999999
-+ * @summary
-+ *   Test that the fips.nssdb.path and fips.nssdb.pin properties can be used
-+ *   for a successful login into an NSS DB. Some additional unitary testing
-+ *   is then performed. This test depends on NSS modutil and must be run in
-+ *   FIPS mode (the SunPKCS11-NSS-FIPS security provider has to be available).
-+ * @modules jdk.crypto.cryptoki/sun.security.pkcs11:+open
-+ * @library /test/lib
-+ * @requires (jdk.version.major >= 8)
-+ * @run main/othervm/timeout=600 NssdbPin
-+ * @author Martin Balao (mbalao@redhat.com)
-+ */
-+
-+public final class NssdbPin {
-+
-+    // Public properties and names
-+    private static final String FIPS_NSSDB_PATH_PROP = "fips.nssdb.path";
-+    private static final String FIPS_NSSDB_PIN_PROP = "fips.nssdb.pin";
-+    private static final String FIPS_PROVIDER_NAME = "SunPKCS11-NSS-FIPS";
-+    private static final String NSSDB_TOKEN_NAME =
-+            "NSS FIPS 140-2 Certificate DB";
-+
-+    // Data to be tested
-+    private static final String[] PINS_TO_TEST =
-+            new String[] {
-+                    "",
-+                    "1234567890abcdef1234567890ABCDEF\uA4F7"
-+            };
-+    private static enum PropType { SYSTEM, SECURITY }
-+    private static enum LoginType { IMPLICIT, EXPLICIT }
-+
-+    // Internal test fields
-+    private static final boolean DEBUG = true;
-+    private static class TestContext {
-+        String pin;
-+        PropType propType;
-+        Path workspace;
-+        String nssdbPath;
-+        Path nssdbPinFile;
-+        LoginType loginType;
-+        TestContext(String pin, Path workspace) {
-+            this.pin = pin;
-+            this.workspace = workspace;
-+            this.nssdbPath = "sql:" + workspace;
-+            this.loginType = LoginType.IMPLICIT;
-+        }
-+    }
-+
-+    public static void main(String[] args) throws Throwable {
-+        if (args.length == 3) {
-+            // Executed by a child process.
-+            mainChild(args[0], args[1], LoginType.valueOf(args[2]));
-+        } else if (args.length == 0) {
-+            // Executed by the parent process.
-+            mainLauncher();
-+            // Test defaults
-+            mainChild("sql:/etc/pki/nssdb", "", LoginType.IMPLICIT);
-+            System.out.println("TEST PASS - OK");
-+        } else {
-+            throw new Exception("Unexpected number of arguments.");
-+        }
-+    }
-+
-+    private static void mainChild(String expectedPath, String expectedPin,
-+            LoginType loginType) throws Throwable {
-+        if (DEBUG) {
-+            for (String prop : Arrays.asList(FIPS_NSSDB_PATH_PROP,
-+                    FIPS_NSSDB_PIN_PROP)) {
-+                System.out.println(prop + " (System): " +
-+                        System.getProperty(prop));
-+                System.out.println(prop + " (Security): " +
-+                        Security.getProperty(prop));
-+            }
-+        }
-+
-+        /*
-+         * Functional cross-test against an NSS DB generated by modutil
-+         * with the same PIN. Check that we can perform a crypto operation
-+         * that requires a login. The login might be explicit or implicit.
-+         */
-+        Provider p = Security.getProvider(FIPS_PROVIDER_NAME);
-+        if (DEBUG) {
-+            System.out.println(FIPS_PROVIDER_NAME + ": " + p);
-+        }
-+        if (p == null) {
-+            throw new Exception(FIPS_PROVIDER_NAME + " initialization failed.");
-+        }
-+        if (DEBUG) {
-+            System.out.println("Login type: " + loginType);
-+        }
-+        if (loginType == LoginType.EXPLICIT) {
-+            // Do the expansion to account for truncation, so C_Login in
-+            // the NSS Software Token gets a UTF-8 encoded PIN.
-+            byte[] pinUtf8 = expectedPin.getBytes(StandardCharsets.UTF_8);
-+            char[] pinChar = new char[pinUtf8.length];
-+            for (int i = 0; i < pinChar.length; i++) {
-+                pinChar[i] = (char)(pinUtf8[i] & 0xFF);
-+            }
-+            KeyStore.getInstance("PKCS11", p).load(null, pinChar);
-+            if (DEBUG) {
-+                System.out.println("Explicit login succeeded.");
-+            }
-+        }
-+        if (DEBUG) {
-+            System.out.println("Trying a crypto operation...");
-+        }
-+        final int blockSize = 16;
-+        Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding", p);
-+        cipher.init(Cipher.ENCRYPT_MODE,
-+                new SecretKeySpec(new byte[blockSize], "AES"));
-+        if (cipher.doFinal(new byte[blockSize]).length != blockSize) {
-+            throw new Exception("Could not perform a crypto operation.");
-+        }
-+        if (DEBUG) {
-+            if (loginType == LoginType.IMPLICIT) {
-+                System.out.println("Implicit login succeeded.");
-+            }
-+            System.out.println("Crypto operation after login succeeded.");
-+        }
-+
-+        if (loginType == LoginType.IMPLICIT) {
-+            /*
-+             * Additional unitary testing. Expected to succeed at this point.
-+             */
-+            if (DEBUG) {
-+                System.out.println("Trying unitary test...");
-+            }
-+            String sysPathProp = System.getProperty(FIPS_NSSDB_PATH_PROP);
-+            if (DEBUG) {
-+                System.out.println("Path value (as a System property): " +
-+                        sysPathProp);
-+            }
-+            if (!expectedPath.equals(sysPathProp)) {
-+                throw new Exception("Path is different than expected: " +
-+                        sysPathProp + " (actual) vs " + expectedPath +
-+                        " (expected).");
-+            }
-+            Class<?> c = Class
-+                    .forName("sun.security.pkcs11.FIPSTokenLoginHandler");
-+            Method m = c.getDeclaredMethod("getFipsNssdbPin");
-+            m.setAccessible(true);
-+            String pin = null;
-+            char[] pinChar = (char[]) m.invoke(c);
-+            if (pinChar != null) {
-+                byte[] pinUtf8 = new byte[pinChar.length];
-+                for (int i = 0; i < pinUtf8.length; i++) {
-+                    pinUtf8[i] = (byte) pinChar[i];
-+                }
-+                pin = new String(pinUtf8, StandardCharsets.UTF_8);
-+            }
-+            if (!expectedPin.isEmpty() && !expectedPin.equals(pin) ||
-+                    expectedPin.isEmpty() && pin != null) {
-+                throw new Exception("PIN is different than expected: '" + pin +
-+                         "' (actual) vs '" + expectedPin + "' (expected).");
-+            }
-+            if (DEBUG) {
-+                System.out.println("PIN value: " + pin);
-+                System.out.println("Unitary test succeeded.");
-+            }
-+        }
-+    }
-+
-+    private static void mainLauncher() throws Throwable {
-+        for (String pin : PINS_TO_TEST) {
-+            Path workspace = Files.createTempDirectory(null);
-+            try {
-+                TestContext ctx = new TestContext(pin, workspace);
-+                createNSSDB(ctx);
-+                {
-+                    ctx.loginType = LoginType.IMPLICIT;
-+                    for (PropType propType : PropType.values()) {
-+                        ctx.propType = propType;
-+                        pinLauncher(ctx);
-+                        envLauncher(ctx);
-+                        fileLauncher(ctx);
-+                    }
-+                }
-+                explicitLoginLauncher(ctx);
-+            } finally {
-+                FileUtils.deleteFileTreeWithRetry(workspace);
-+            }
-+        }
-+    }
-+
-+    private static void pinLauncher(TestContext ctx) throws Throwable {
-+        launchTest(p -> {}, "pin:" + ctx.pin, ctx);
-+    }
-+
-+    private static void envLauncher(TestContext ctx) throws Throwable {
-+        final String NSSDB_PIN_ENV_VAR = "NSSDB_PIN_ENV_VAR";
-+        launchTest(p -> p.env(NSSDB_PIN_ENV_VAR, ctx.pin),
-+                "env:" + NSSDB_PIN_ENV_VAR, ctx);
-+    }
-+
-+    private static void fileLauncher(TestContext ctx) throws Throwable {
-+        // The file containing the PIN (ctx.nssdbPinFile) was created by the
-+        // generatePinFile method, called from createNSSDB.
-+        launchTest(p -> {}, "file:" + ctx.nssdbPinFile, ctx);
-+    }
-+
-+    private static void explicitLoginLauncher(TestContext ctx)
-+            throws Throwable {
-+        ctx.loginType = LoginType.EXPLICIT;
-+        ctx.propType = PropType.SYSTEM;
-+        launchTest(p -> {}, "Invalid PIN, must be ignored", ctx);
-+    }
-+
-+    private static void launchTest(Consumer<Proc> procCb, String pinPropVal,
-+            TestContext ctx) throws Throwable {
-+        if (DEBUG) {
-+            System.out.println("Launching JVM with " + FIPS_NSSDB_PATH_PROP +
-+                    "=" + ctx.nssdbPath + " and " + FIPS_NSSDB_PIN_PROP +
-+                    "=" + pinPropVal);
-+        }
-+        Proc p = Proc.create(NssdbPin.class.getName())
-+                .args(ctx.nssdbPath, ctx.pin, ctx.loginType.name());
-+        if (ctx.propType == PropType.SYSTEM) {
-+            p.prop(FIPS_NSSDB_PATH_PROP, ctx.nssdbPath);
-+            p.prop(FIPS_NSSDB_PIN_PROP, pinPropVal);
-+            // Make sure that Security properties defaults are not used.
-+            p.secprop(FIPS_NSSDB_PATH_PROP, "");
-+            p.secprop(FIPS_NSSDB_PIN_PROP, "");
-+        } else if (ctx.propType == PropType.SECURITY) {
-+            p.secprop(FIPS_NSSDB_PATH_PROP, ctx.nssdbPath);
-+            pinPropVal = escapeForPropsFile(pinPropVal);
-+            p.secprop(FIPS_NSSDB_PIN_PROP, pinPropVal);
-+        } else {
-+            throw new Exception("Unsupported property type.");
-+        }
-+        if (DEBUG) {
-+            p.inheritIO();
-+            p.prop("java.security.debug", "sunpkcs11");
-+            p.debug(NssdbPin.class.getName());
-+
-+            // Need the launched process to connect to a debugger?
-+            //System.setProperty("test.vm.opts", "-Xdebug -Xrunjdwp:" +
-+            //         "transport=dt_socket,address=localhost:8000,suspend=y");
-+        } else {
-+            p.nodump();
-+        }
-+        procCb.accept(p);
-+        p.start().waitFor(0);
-+    }
-+
-+    private static String escapeForPropsFile(String str) throws Throwable {
-+        StringBuffer sb = new StringBuffer();
-+        for (int i = 0; i < str.length(); i++) {
-+            int cp = str.codePointAt(i);
-+            if (Character.UnicodeBlock.of(cp)
-+                    == Character.UnicodeBlock.BASIC_LATIN) {
-+                sb.append(Character.toChars(cp));
-+            } else {
-+                sb.append("\\u").append(String.format("%04X", cp));
-+            }
-+        }
-+        return sb.toString();
-+    }
-+
-+    private static void createNSSDB(TestContext ctx) throws Throwable {
-+        ProcessBuilder pb = getModutilPB(ctx, "-create");
-+        if (DEBUG) {
-+            System.out.println("Creating an NSS DB in " + ctx.workspace +
-+                    "...");
-+            System.out.println("cmd: " + String.join(" ", pb.command()));
-+        }
-+        if (pb.start().waitFor() != 0) {
-+            throw new Exception("NSS DB creation failed.");
-+        }
-+        generatePinFile(ctx);
-+        pb = getModutilPB(ctx, "-changepw", NSSDB_TOKEN_NAME,
-+                "-newpwfile", ctx.nssdbPinFile.toString());
-+        if (DEBUG) {
-+            System.out.println("NSS DB created.");
-+            System.out.println("Changing NSS DB PIN...");
-+            System.out.println("cmd: " + String.join(" ", pb.command()));
-+        }
-+        if (pb.start().waitFor() != 0) {
-+            throw new Exception("NSS DB PIN change failed.");
-+        }
-+        if (DEBUG) {
-+            System.out.println("NSS DB PIN changed.");
-+        }
-+    }
-+
-+    private static ProcessBuilder getModutilPB(TestContext ctx, String... args)
-+            throws Throwable {
-+        ProcessBuilder pb = new ProcessBuilder("modutil", "-force");
-+        List<String> pbCommand = pb.command();
-+        if (args != null) {
-+            pbCommand.addAll(Arrays.asList(args));
-+        }
-+        pbCommand.add("-dbdir");
-+        pbCommand.add(ctx.nssdbPath);
-+        if (DEBUG) {
-+            pb.inheritIO();
-+        } else {
-+            pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-+        }
-+        return pb;
-+    }
-+
-+    private static void generatePinFile(TestContext ctx) throws Throwable {
-+        ctx.nssdbPinFile = Files.createTempFile(ctx.workspace, null, null);
-+        Files.writeString(ctx.nssdbPinFile, ctx.pin + System.lineSeparator() +
-+                "2nd line with garbage");
-+    }
-+}
-diff --git a/test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java b/test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java
-new file mode 100644
-index 00000000000..87f1ad04505
---- /dev/null
-+++ b/test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java
-@@ -0,0 +1,77 @@
-+/*
-+ * Copyright (c) 2022, 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.
-+ */
-+
-+import java.security.Provider;
-+import java.security.Security;
-+
-+/*
-+ * @test
-+ * @bug 9999999
-+ * @requires (jdk.version.major >= 8)
-+ * @run main/othervm/timeout=30 VerifyMissingAttributes
-+ * @author Martin Balao (mbalao@redhat.com)
-+ */
-+
-+public final class VerifyMissingAttributes {
-+
-+    private static final String[] svcAlgImplementedIn = {
-+            "AlgorithmParameterGenerator.DSA",
-+            "AlgorithmParameters.DSA",
-+            "CertificateFactory.X.509",
-+            "KeyStore.JKS",
-+            "KeyStore.CaseExactJKS",
-+            "KeyStore.DKS",
-+            "CertStore.Collection",
-+            "CertStore.com.sun.security.IndexedCollection"
-+    };
-+
-+    public static void main(String[] args) throws Throwable {
-+        Provider sunProvider = Security.getProvider("SUN");
-+        for (String svcAlg : svcAlgImplementedIn) {
-+            String filter = svcAlg + " ImplementedIn:Software";
-+            doQuery(sunProvider, filter);
-+        }
-+        if (Double.parseDouble(
-+                System.getProperty("java.specification.version")) >= 17) {
-+            String filter = "KeyFactory.RSASSA-PSS SupportedKeyClasses:" +
-+                    "java.security.interfaces.RSAPublicKey" +
-+                    "|java.security.interfaces.RSAPrivateKey";
-+            doQuery(Security.getProvider("SunRsaSign"), filter);
-+        }
-+        System.out.println("TEST PASS - OK");
-+    }
-+
-+    private static void doQuery(Provider expectedProvider, String filter)
-+            throws Exception {
-+        if (expectedProvider == null) {
-+            throw new Exception("Provider not found.");
-+        }
-+        Provider[] providers = Security.getProviders(filter);
-+        if (providers == null || providers.length != 1 ||
-+                providers[0] != expectedProvider) {
-+            throw new Exception("Failure retrieving the provider with this" +
-+                    " query: " + filter);
-+        }
-+    }
-+}

diff --git a/fips-21u-de44431fab9.patch b/fips-21u-de44431fab9.patch
new file mode 100644
index 0000000..7799396
--- /dev/null
+++ b/fips-21u-de44431fab9.patch
@@ -0,0 +1,4324 @@
+diff --git a/make/autoconf/build-aux/pkg.m4 b/make/autoconf/build-aux/pkg.m4
+index 5f4b22bb27f..1ca9f5b8ffe 100644
+--- a/make/autoconf/build-aux/pkg.m4
++++ b/make/autoconf/build-aux/pkg.m4
+@@ -179,3 +179,19 @@ else
+ 	ifelse([$3], , :, [$3])
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
++
++dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
++dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++dnl -------------------------------------------
++dnl Since: 0.28
++dnl
++dnl Retrieves the value of the pkg-config variable for the given module.
++AC_DEFUN([PKG_CHECK_VAR],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
++
++_PKG_CONFIG([$1], [variable="][$3]["], [$2])
++AS_VAR_COPY([$1], [pkg_cv_][$1])
++
++AS_VAR_IF([$1], [""], [$5], [$4])dnl
++])dnl PKG_CHECK_VAR
+diff --git a/make/autoconf/lib-sysconf.m4 b/make/autoconf/lib-sysconf.m4
+new file mode 100644
+index 00000000000..f48fc7f7e80
+--- /dev/null
++++ b/make/autoconf/lib-sysconf.m4
+@@ -0,0 +1,87 @@
++#
++# 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([for NSS library directory])
++  PKG_CHECK_VAR(NSS_LIBDIR, nss, libdir, [AC_MSG_RESULT([$NSS_LIBDIR])], [AC_MSG_RESULT([not found])])
++
++  AC_MSG_CHECKING([whether to link 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)
++  AC_SUBST(NSS_LIBDIR)
++])
+diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
+index 51d4f724c33..feb0bcf3e75 100644
+--- a/make/autoconf/libraries.m4
++++ b/make/autoconf/libraries.m4
+@@ -35,6 +35,7 @@ m4_include([lib-std.m4])
+ m4_include([lib-x11.m4])
+ 
+ m4_include([lib-tests.m4])
++m4_include([lib-sysconf.m4])
+ 
+ ################################################################################
+ # Determine which libraries are needed for this configuration
+@@ -128,6 +129,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
+   LIB_SETUP_X11
+ 
+   LIB_TESTS_SETUP_GTEST
++  LIB_SETUP_SYSCONF_LIBS
+ 
+   BASIC_JDKLIB_LIBS=""
+   BASIC_JDKLIB_LIBS_TARGET=""
+diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+index 7f085676ca9..2476b9ae964 100644
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -822,6 +822,11 @@ PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@
+ # Libraries
+ #
+ 
++USE_SYSCONF_NSS:=@USE_SYSCONF_NSS@
++NSS_LIBS:=@NSS_LIBS@
++NSS_CFLAGS:=@NSS_CFLAGS@
++NSS_LIBDIR:=@NSS_LIBDIR@
++
+ USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
+ LCMS_CFLAGS:=@LCMS_CFLAGS@
+ LCMS_LIBS:=@LCMS_LIBS@
+diff --git a/make/modules/java.base/Gendata.gmk b/make/modules/java.base/Gendata.gmk
+index 9e5cfe2d0fc..434ade8e182 100644
+--- a/make/modules/java.base/Gendata.gmk
++++ b/make/modules/java.base/Gendata.gmk
+@@ -98,3 +98,17 @@ $(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS_JDK) $(GENDATA_JAVA_SECURITY_SRC) $(REST
+ TARGETS += $(GENDATA_JAVA_SECURITY)
+ 
+ ################################################################################
++
++GENDATA_NSS_FIPS_CFG_SRC := $(TOPDIR)/src/java.base/share/conf/security/nss.fips.cfg.in
++GENDATA_NSS_FIPS_CFG := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/nss.fips.cfg
++
++$(GENDATA_NSS_FIPS_CFG): $(GENDATA_NSS_FIPS_CFG_SRC)
++	$(call LogInfo, Generating nss.fips.cfg)
++	$(call MakeTargetDir)
++	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_$(@F), \
++	    ( $(SED) -e 's:@NSS_LIBDIR@:$(NSS_LIBDIR):g' $< ) > $@ \
++	)
++
++TARGETS += $(GENDATA_NSS_FIPS_CFG)
++
++################################################################################
+diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
+index 1e0f66726d0..59fe923f2c5 100644
+--- a/make/modules/java.base/Lib.gmk
++++ b/make/modules/java.base/Lib.gmk
+@@ -163,6 +163,29 @@ 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
++
++$(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)
++
+ ################################################################################
+ # Create the symbols file for static builds.
+ 
+diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+index 0a5cb1abc4d..81cc931a10c 100644
+--- a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
++++ b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+@@ -31,6 +31,7 @@ import java.security.SecureRandom;
+ import java.security.PrivilegedAction;
+ import java.util.HashMap;
+ import java.util.List;
++import jdk.internal.access.SharedSecrets;
+ import static sun.security.util.SecurityConstants.PROVIDER_VER;
+ import static sun.security.util.SecurityProviderConstants.*;
+ 
+@@ -84,6 +85,10 @@ import static sun.security.util.SecurityProviderConstants.*;
+ 
+ public final class SunJCE extends Provider {
+ 
++    private static final boolean systemFipsEnabled =
++            SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
++            .isSystemFipsEnabled();
++
+     @java.io.Serial
+     private static final long serialVersionUID = 6812507587804302833L;
+ 
+@@ -149,301 +154,302 @@ public final class SunJCE extends Provider {
+     void putEntries() {
+         // reuse attribute map and reset before each reuse
+         HashMap<String, String> attrs = new HashMap<>(3);
+-        attrs.put("SupportedKeyClasses",
+-                "java.security.interfaces.RSAPublicKey" +
+-                "|java.security.interfaces.RSAPrivateKey");
+-        ps("Signature", "NONEwithRSA",
+-                "com.sun.crypto.provider.RSACipherAdaptor", null, attrs);
+-        // continue adding cipher specific attributes
+-        attrs.put("SupportedModes", "ECB");
+-        attrs.put("SupportedPaddings", "NOPADDING|PKCS1PADDING|OAEPPADDING"
+-                + "|OAEPWITHMD5ANDMGF1PADDING"
+-                + "|OAEPWITHSHA1ANDMGF1PADDING"
+-                + "|OAEPWITHSHA-1ANDMGF1PADDING"
+-                + "|OAEPWITHSHA-224ANDMGF1PADDING"
+-                + "|OAEPWITHSHA-256ANDMGF1PADDING"
+-                + "|OAEPWITHSHA-384ANDMGF1PADDING"
+-                + "|OAEPWITHSHA-512ANDMGF1PADDING"
+-                + "|OAEPWITHSHA-512/224ANDMGF1PADDING"
+-                + "|OAEPWITHSHA-512/256ANDMGF1PADDING");
+-        ps("Cipher", "RSA",
+-                "com.sun.crypto.provider.RSACipher", null, attrs);
+-
+-        // common block cipher modes, pads
+-        final String BLOCK_MODES = "ECB|CBC|PCBC|CTR|CTS|CFB|OFB" +
+-            "|CFB8|CFB16|CFB24|CFB32|CFB40|CFB48|CFB56|CFB64" +
+-            "|OFB8|OFB16|OFB24|OFB32|OFB40|OFB48|OFB56|OFB64";
+-        final String BLOCK_MODES128 = BLOCK_MODES +
+-            "|CFB72|CFB80|CFB88|CFB96|CFB104|CFB112|CFB120|CFB128" +
+-            "|OFB72|OFB80|OFB88|OFB96|OFB104|OFB112|OFB120|OFB128";
+-        final String BLOCK_PADS = "NOPADDING|PKCS5PADDING|ISO10126PADDING";
+-
+-        attrs.clear();
+-        attrs.put("SupportedModes", BLOCK_MODES);
+-        attrs.put("SupportedPaddings", BLOCK_PADS);
+-        attrs.put("SupportedKeyFormats", "RAW");
+-        ps("Cipher", "DES",
+-                "com.sun.crypto.provider.DESCipher", null, attrs);
+-        psA("Cipher", "DESede", "com.sun.crypto.provider.DESedeCipher",
+-                attrs);
+-        ps("Cipher", "Blowfish",
+-                "com.sun.crypto.provider.BlowfishCipher", null, attrs);
+-
+-        ps("Cipher", "RC2",
+-                "com.sun.crypto.provider.RC2Cipher", null, attrs);
+-
+-        attrs.clear();
+-        attrs.put("SupportedModes", BLOCK_MODES128);
+-        attrs.put("SupportedPaddings", BLOCK_PADS);
+-        attrs.put("SupportedKeyFormats", "RAW");
+-        psA("Cipher", "AES",
+-                "com.sun.crypto.provider.AESCipher$General", attrs);
+-
+-        attrs.clear();
+-        attrs.put("SupportedKeyFormats", "RAW");
+-        psA("Cipher", "AES/KW/NoPadding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES_KW_NoPadding",
+-                attrs);
+-        ps("Cipher", "AES/KW/PKCS5Padding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES_KW_PKCS5Padding",
+-                null, attrs);
+-        psA("Cipher", "AES/KWP/NoPadding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES_KWP_NoPadding",
+-                attrs);
+-
+-        psA("Cipher", "AES_128/ECB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES128_ECB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_128/CBC/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES128_CBC_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_128/OFB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES128_OFB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_128/CFB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES128_CFB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_128/KW/NoPadding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_NoPadding",
+-                attrs);
+-        ps("Cipher", "AES_128/KW/PKCS5Padding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_PKCS5Padding",
+-                null, attrs);
+-        psA("Cipher", "AES_128/KWP/NoPadding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES128_KWP_NoPadding",
+-                attrs);
+-
+-        psA("Cipher", "AES_192/ECB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES192_ECB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_192/CBC/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES192_CBC_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_192/OFB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES192_OFB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_192/CFB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES192_CFB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_192/KW/NoPadding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_NoPadding",
+-                attrs);
+-        ps("Cipher", "AES_192/KW/PKCS5Padding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_PKCS5Padding",
+-                null, attrs);
+-        psA("Cipher", "AES_192/KWP/NoPadding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES192_KWP_NoPadding",
+-                attrs);
+-
+-        psA("Cipher", "AES_256/ECB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES256_ECB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_256/CBC/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES256_CBC_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_256/OFB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES256_OFB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_256/CFB/NoPadding",
+-                "com.sun.crypto.provider.AESCipher$AES256_CFB_NoPadding",
+-                attrs);
+-        psA("Cipher", "AES_256/KW/NoPadding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_NoPadding",
+-                attrs);
+-        ps("Cipher", "AES_256/KW/PKCS5Padding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_PKCS5Padding",
+-                null, attrs);
+-        psA("Cipher", "AES_256/KWP/NoPadding",
+-                "com.sun.crypto.provider.KeyWrapCipher$AES256_KWP_NoPadding",
+-                attrs);
+-
+-        attrs.clear();
+-        attrs.put("SupportedModes", "GCM");
+-        attrs.put("SupportedKeyFormats", "RAW");
+-
+-        ps("Cipher", "AES/GCM/NoPadding",
+-                "com.sun.crypto.provider.GaloisCounterMode$AESGCM", null,
+-                attrs);
+-        psA("Cipher", "AES_128/GCM/NoPadding",
+-                "com.sun.crypto.provider.GaloisCounterMode$AES128",
+-                attrs);
+-        psA("Cipher", "AES_192/GCM/NoPadding",
+-                "com.sun.crypto.provider.GaloisCounterMode$AES192",
+-                attrs);
+-        psA("Cipher", "AES_256/GCM/NoPadding",
+-                "com.sun.crypto.provider.GaloisCounterMode$AES256",
+-                attrs);
+-
+-        attrs.clear();
+-        attrs.put("SupportedModes", "CBC");
+-        attrs.put("SupportedPaddings", "NOPADDING");
+-        attrs.put("SupportedKeyFormats", "RAW");
+-        ps("Cipher", "DESedeWrap",
+-                "com.sun.crypto.provider.DESedeWrapCipher", null, attrs);
+-
+-        attrs.clear();
+-        attrs.put("SupportedModes", "ECB");
+-        attrs.put("SupportedPaddings", "NOPADDING");
+-        attrs.put("SupportedKeyFormats", "RAW");
+-        psA("Cipher", "ARCFOUR",
+-                "com.sun.crypto.provider.ARCFOURCipher", attrs);
+-
+-        attrs.clear();
+-        attrs.put("SupportedKeyFormats", "RAW");
+-        ps("Cipher",  "ChaCha20",
+-                "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Only",
+-                null, attrs);
+-        psA("Cipher",  "ChaCha20-Poly1305",
+-                "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305",
+-                attrs);
+-
+-        // PBES1
+-        psA("Cipher", "PBEWithMD5AndDES",
+-                "com.sun.crypto.provider.PBEWithMD5AndDESCipher",
+-                null);
+-        ps("Cipher", "PBEWithMD5AndTripleDES",
+-                "com.sun.crypto.provider.PBEWithMD5AndTripleDESCipher");
+-        psA("Cipher", "PBEWithSHA1AndDESede",
+-                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndDESede",
+-                null);
+-        psA("Cipher", "PBEWithSHA1AndRC2_40",
+-                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_40",
+-                null);
+-        psA("Cipher", "PBEWithSHA1AndRC2_128",
+-                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_128",
+-                null);
+-        psA("Cipher", "PBEWithSHA1AndRC4_40",
+-                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_40",
+-                null);
+-
+-        psA("Cipher", "PBEWithSHA1AndRC4_128",
+-                "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_128",
+-                null);
+-
+-        // PBES2
+-        ps("Cipher", "PBEWithHmacSHA1AndAES_128",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_128");
+-
+-        ps("Cipher", "PBEWithHmacSHA224AndAES_128",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_128");
+-
+-        ps("Cipher", "PBEWithHmacSHA256AndAES_128",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_128");
+-
+-        ps("Cipher", "PBEWithHmacSHA384AndAES_128",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_128");
+-
+-        ps("Cipher", "PBEWithHmacSHA512AndAES_128",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_128");
+-
+-        ps("Cipher", "PBEWithHmacSHA512/224AndAES_128",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA512_224AndAES_128");
+-
+-        ps("Cipher", "PBEWithHmacSHA512/256AndAES_128",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_128");
+-
+-
+-        ps("Cipher", "PBEWithHmacSHA1AndAES_256",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_256");
+-
+-        ps("Cipher", "PBEWithHmacSHA224AndAES_256",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_256");
+-
+-        ps("Cipher", "PBEWithHmacSHA256AndAES_256",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_256");
+-
+-        ps("Cipher", "PBEWithHmacSHA384AndAES_256",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_256");
+-
+-        ps("Cipher", "PBEWithHmacSHA512AndAES_256",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_256");
+-
+-        ps("Cipher", "PBEWithHmacSHA512/224AndAES_256",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA512_224AndAES_256");
+-
+-        ps("Cipher", "PBEWithHmacSHA512/256AndAES_256",
+-                "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_256");
+-
+-        /*
+-         * Key(pair) Generator engines
+-         */
+-        ps("KeyGenerator", "DES",
+-                "com.sun.crypto.provider.DESKeyGenerator");
+-        psA("KeyGenerator", "DESede",
+-                "com.sun.crypto.provider.DESedeKeyGenerator",
+-                null);
+-        ps("KeyGenerator", "Blowfish",
+-                "com.sun.crypto.provider.BlowfishKeyGenerator");
+-        psA("KeyGenerator", "AES",
+-                "com.sun.crypto.provider.AESKeyGenerator",
+-                null);
+-        ps("KeyGenerator", "RC2",
+-                "com.sun.crypto.provider.KeyGeneratorCore$RC2KeyGenerator");
+-        psA("KeyGenerator", "ARCFOUR",
+-                "com.sun.crypto.provider.KeyGeneratorCore$ARCFOURKeyGenerator",
+-                null);
+-        ps("KeyGenerator", "ChaCha20",
+-                "com.sun.crypto.provider.KeyGeneratorCore$ChaCha20KeyGenerator");
+-        ps("KeyGenerator", "HmacMD5",
+-                "com.sun.crypto.provider.HmacMD5KeyGenerator");
+-
+-        psA("KeyGenerator", "HmacSHA1",
+-                "com.sun.crypto.provider.HmacSHA1KeyGenerator", null);
+-        psA("KeyGenerator", "HmacSHA224",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA224",
+-                null);
+-        psA("KeyGenerator", "HmacSHA256",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA256",
+-                null);
+-        psA("KeyGenerator", "HmacSHA384",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA384",
+-                null);
+-        psA("KeyGenerator", "HmacSHA512",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512",
+-                null);
+-        psA("KeyGenerator", "HmacSHA512/224",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_224",
+-                null);
+-        psA("KeyGenerator", "HmacSHA512/256",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_256",
+-                null);
+-
+-        psA("KeyGenerator", "HmacSHA3-224",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_224",
+-                null);
+-        psA("KeyGenerator", "HmacSHA3-256",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_256",
+-                null);
+-        psA("KeyGenerator", "HmacSHA3-384",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_384",
+-                null);
+-        psA("KeyGenerator", "HmacSHA3-512",
+-                "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_512",
+-                null);
+-
+-        psA("KeyPairGenerator", "DiffieHellman",
+-                "com.sun.crypto.provider.DHKeyPairGenerator",
+-                null);
++        if (!systemFipsEnabled) {
++            attrs.put("SupportedKeyClasses",
++                    "java.security.interfaces.RSAPublicKey" +
++                    "|java.security.interfaces.RSAPrivateKey");
++            ps("Signature", "NONEwithRSA",
++               "com.sun.crypto.provider.RSACipherAdaptor", null, attrs);
++            // continue adding cipher specific attributes
++            attrs.put("SupportedModes", "ECB");
++            attrs.put("SupportedPaddings", "NOPADDING|PKCS1PADDING|OAEPPADDING"
++                    + "|OAEPWITHMD5ANDMGF1PADDING"
++                    + "|OAEPWITHSHA1ANDMGF1PADDING"
++                    + "|OAEPWITHSHA-1ANDMGF1PADDING"
++                    + "|OAEPWITHSHA-224ANDMGF1PADDING"
++                    + "|OAEPWITHSHA-256ANDMGF1PADDING"
++                    + "|OAEPWITHSHA-384ANDMGF1PADDING"
++                    + "|OAEPWITHSHA-512ANDMGF1PADDING"
++                    + "|OAEPWITHSHA-512/224ANDMGF1PADDING"
++                    + "|OAEPWITHSHA-512/256ANDMGF1PADDING");
++            ps("Cipher", "RSA",
++                    "com.sun.crypto.provider.RSACipher", null, attrs);
++
++            // common block cipher modes, pads
++            final String BLOCK_MODES = "ECB|CBC|PCBC|CTR|CTS|CFB|OFB" +
++                "|CFB8|CFB16|CFB24|CFB32|CFB40|CFB48|CFB56|CFB64" +
++                "|OFB8|OFB16|OFB24|OFB32|OFB40|OFB48|OFB56|OFB64";
++            final String BLOCK_MODES128 = BLOCK_MODES +
++                "|CFB72|CFB80|CFB88|CFB96|CFB104|CFB112|CFB120|CFB128" +
++                "|OFB72|OFB80|OFB88|OFB96|OFB104|OFB112|OFB120|OFB128";
++            final String BLOCK_PADS = "NOPADDING|PKCS5PADDING|ISO10126PADDING";
++
++            attrs.clear();
++            attrs.put("SupportedModes", BLOCK_MODES);
++            attrs.put("SupportedPaddings", BLOCK_PADS);
++            attrs.put("SupportedKeyFormats", "RAW");
++            ps("Cipher", "DES",
++                    "com.sun.crypto.provider.DESCipher", null, attrs);
++            psA("Cipher", "DESede", "com.sun.crypto.provider.DESedeCipher",
++                    attrs);
++            ps("Cipher", "Blowfish",
++                    "com.sun.crypto.provider.BlowfishCipher", null, attrs);
++
++            ps("Cipher", "RC2",
++                    "com.sun.crypto.provider.RC2Cipher", null, attrs);
++
++            attrs.clear();
++            attrs.put("SupportedModes", BLOCK_MODES128);
++            attrs.put("SupportedPaddings", BLOCK_PADS);
++            attrs.put("SupportedKeyFormats", "RAW");
++            psA("Cipher", "AES",
++                    "com.sun.crypto.provider.AESCipher$General", attrs);
++
++            attrs.clear();
++            attrs.put("SupportedKeyFormats", "RAW");
++            psA("Cipher", "AES/KW/NoPadding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES_KW_NoPadding",
++                    attrs);
++            ps("Cipher", "AES/KW/PKCS5Padding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES_KW_PKCS5Padding",
++                    null, attrs);
++            psA("Cipher", "AES/KWP/NoPadding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES_KWP_NoPadding",
++                    attrs);
++
++            psA("Cipher", "AES_128/ECB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES128_ECB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_128/CBC/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES128_CBC_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_128/OFB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES128_OFB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_128/CFB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES128_CFB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_128/KW/NoPadding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_NoPadding",
++                    attrs);
++            ps("Cipher", "AES_128/KW/PKCS5Padding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_PKCS5Padding",
++                    null, attrs);
++            psA("Cipher", "AES_128/KWP/NoPadding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES128_KWP_NoPadding",
++                    attrs);
++
++            psA("Cipher", "AES_192/ECB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES192_ECB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_192/CBC/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES192_CBC_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_192/OFB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES192_OFB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_192/CFB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES192_CFB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_192/KW/NoPadding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_NoPadding",
++                    attrs);
++            ps("Cipher", "AES_192/KW/PKCS5Padding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_PKCS5Padding",
++                    null, attrs);
++            psA("Cipher", "AES_192/KWP/NoPadding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES192_KWP_NoPadding",
++                    attrs);
++
++            psA("Cipher", "AES_256/ECB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES256_ECB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_256/CBC/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES256_CBC_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_256/OFB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES256_OFB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_256/CFB/NoPadding",
++                    "com.sun.crypto.provider.AESCipher$AES256_CFB_NoPadding",
++                    attrs);
++            psA("Cipher", "AES_256/KW/NoPadding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_NoPadding",
++                    attrs);
++            ps("Cipher", "AES_256/KW/PKCS5Padding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_PKCS5Padding",
++                    null, attrs);
++            psA("Cipher", "AES_256/KWP/NoPadding",
++                    "com.sun.crypto.provider.KeyWrapCipher$AES256_KWP_NoPadding",
++                    attrs);
++
++            attrs.clear();
++            attrs.put("SupportedModes", "GCM");
++            attrs.put("SupportedKeyFormats", "RAW");
++
++            ps("Cipher", "AES/GCM/NoPadding",
++                    "com.sun.crypto.provider.GaloisCounterMode$AESGCM", null,
++                    attrs);
++            psA("Cipher", "AES_128/GCM/NoPadding",
++                    "com.sun.crypto.provider.GaloisCounterMode$AES128",
++                    attrs);
++            psA("Cipher", "AES_192/GCM/NoPadding",
++                    "com.sun.crypto.provider.GaloisCounterMode$AES192",
++                    attrs);
++            psA("Cipher", "AES_256/GCM/NoPadding",
++                    "com.sun.crypto.provider.GaloisCounterMode$AES256",
++                    attrs);
++
++            attrs.clear();
++            attrs.put("SupportedModes", "CBC");
++            attrs.put("SupportedPaddings", "NOPADDING");
++            attrs.put("SupportedKeyFormats", "RAW");
++            ps("Cipher", "DESedeWrap",
++                    "com.sun.crypto.provider.DESedeWrapCipher", null, attrs);
++
++            attrs.clear();
++            attrs.put("SupportedModes", "ECB");
++            attrs.put("SupportedPaddings", "NOPADDING");
++            attrs.put("SupportedKeyFormats", "RAW");
++            psA("Cipher", "ARCFOUR",
++                    "com.sun.crypto.provider.ARCFOURCipher", attrs);
++
++            attrs.clear();
++            attrs.put("SupportedKeyFormats", "RAW");
++            ps("Cipher",  "ChaCha20",
++                    "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Only",
++                    null, attrs);
++            psA("Cipher",  "ChaCha20-Poly1305",
++                    "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305",
++                    attrs);
++
++            // PBES1
++            psA("Cipher", "PBEWithMD5AndDES",
++                    "com.sun.crypto.provider.PBEWithMD5AndDESCipher",
++                    null);
++            ps("Cipher", "PBEWithMD5AndTripleDES",
++                    "com.sun.crypto.provider.PBEWithMD5AndTripleDESCipher");
++            psA("Cipher", "PBEWithSHA1AndDESede",
++                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndDESede",
++                    null);
++            psA("Cipher", "PBEWithSHA1AndRC2_40",
++                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_40",
++                    null);
++            psA("Cipher", "PBEWithSHA1AndRC2_128",
++                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_128",
++                    null);
++            psA("Cipher", "PBEWithSHA1AndRC4_40",
++                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_40",
++                    null);
++
++            psA("Cipher", "PBEWithSHA1AndRC4_128",
++                    "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_128",
++                    null);
++
++            // PBES2
++            ps("Cipher", "PBEWithHmacSHA1AndAES_128",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_128");
++
++            ps("Cipher", "PBEWithHmacSHA224AndAES_128",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_128");
++
++            ps("Cipher", "PBEWithHmacSHA256AndAES_128",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_128");
++
++            ps("Cipher", "PBEWithHmacSHA384AndAES_128",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_128");
++
++            ps("Cipher", "PBEWithHmacSHA512AndAES_128",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_128");
++
++            ps("Cipher", "PBEWithHmacSHA512/224AndAES_128",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA512_224AndAES_128");
++
++            ps("Cipher", "PBEWithHmacSHA512/256AndAES_128",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_128");
++
++            ps("Cipher", "PBEWithHmacSHA1AndAES_256",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_256");
++
++            ps("Cipher", "PBEWithHmacSHA224AndAES_256",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_256");
++
++            ps("Cipher", "PBEWithHmacSHA256AndAES_256",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_256");
++
++            ps("Cipher", "PBEWithHmacSHA384AndAES_256",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_256");
++
++            ps("Cipher", "PBEWithHmacSHA512AndAES_256",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_256");
++
++            ps("Cipher", "PBEWithHmacSHA512/224AndAES_256",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA512_224AndAES_256");
++
++            ps("Cipher", "PBEWithHmacSHA512/256AndAES_256",
++                    "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_256");
++
++            /*
++             * Key(pair) Generator engines
++             */
++            ps("KeyGenerator", "DES",
++                    "com.sun.crypto.provider.DESKeyGenerator");
++            psA("KeyGenerator", "DESede",
++                    "com.sun.crypto.provider.DESedeKeyGenerator",
++                    null);
++            ps("KeyGenerator", "Blowfish",
++                    "com.sun.crypto.provider.BlowfishKeyGenerator");
++            psA("KeyGenerator", "AES",
++                    "com.sun.crypto.provider.AESKeyGenerator",
++                    null);
++            ps("KeyGenerator", "RC2",
++                    "com.sun.crypto.provider.KeyGeneratorCore$RC2KeyGenerator");
++            psA("KeyGenerator", "ARCFOUR",
++                    "com.sun.crypto.provider.KeyGeneratorCore$ARCFOURKeyGenerator",
++                    null);
++            ps("KeyGenerator", "ChaCha20",
++                    "com.sun.crypto.provider.KeyGeneratorCore$ChaCha20KeyGenerator");
++            ps("KeyGenerator", "HmacMD5",
++                    "com.sun.crypto.provider.HmacMD5KeyGenerator");
++
++            psA("KeyGenerator", "HmacSHA1",
++                    "com.sun.crypto.provider.HmacSHA1KeyGenerator", null);
++            psA("KeyGenerator", "HmacSHA224",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA224",
++                    null);
++            psA("KeyGenerator", "HmacSHA256",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA256",
++                    null);
++            psA("KeyGenerator", "HmacSHA384",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA384",
++                    null);
++            psA("KeyGenerator", "HmacSHA512",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512",
++                    null);
++            psA("KeyGenerator", "HmacSHA512/224",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_224",
++                    null);
++            psA("KeyGenerator", "HmacSHA512/256",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_256",
++                    null);
++
++            psA("KeyGenerator", "HmacSHA3-224",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_224",
++                    null);
++            psA("KeyGenerator", "HmacSHA3-256",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_256",
++                    null);
++            psA("KeyGenerator", "HmacSHA3-384",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_384",
++                    null);
++            psA("KeyGenerator", "HmacSHA3-512",
++                    "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_512",
++                    null);
++
++            psA("KeyPairGenerator", "DiffieHellman",
++                    "com.sun.crypto.provider.DHKeyPairGenerator",
++                    null);
++        }
+ 
+         /*
+          * Algorithm parameter generation engines
+@@ -452,15 +458,17 @@ public final class SunJCE extends Provider {
+                 "DiffieHellman", "com.sun.crypto.provider.DHParameterGenerator",
+                 null);
+ 
+-        /*
+-         * Key Agreement engines
+-         */
+-        attrs.clear();
+-        attrs.put("SupportedKeyClasses", "javax.crypto.interfaces.DHPublicKey" +
+-                        "|javax.crypto.interfaces.DHPrivateKey");
+-        psA("KeyAgreement", "DiffieHellman",
+-                "com.sun.crypto.provider.DHKeyAgreement",
+-                attrs);
++        if (!systemFipsEnabled) {
++            /*
++             * Key Agreement engines
++             */
++            attrs.clear();
++            attrs.put("SupportedKeyClasses", "javax.crypto.interfaces.DHPublicKey" +
++                            "|javax.crypto.interfaces.DHPrivateKey");
++            psA("KeyAgreement", "DiffieHellman",
++                    "com.sun.crypto.provider.DHKeyAgreement",
++                    attrs);
++        }
+ 
+         /*
+          * Algorithm Parameter engines
+@@ -630,10 +638,10 @@ public final class SunJCE extends Provider {
+                 "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512AndAES_128");
+ 
+         ps("SecretKeyFactory", "PBEWithHmacSHA512/224AndAES_128",
+-                "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_224AndAES_128");
++               "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_224AndAES_128");
+ 
+         ps("SecretKeyFactory", "PBEWithHmacSHA512/256AndAES_128",
+-                "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_256AndAES_128");
++               "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_256AndAES_128");
+ 
+         ps("SecretKeyFactory", "PBEWithHmacSHA1AndAES_256",
+                 "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA1AndAES_256");
+@@ -656,153 +664,154 @@ public final class SunJCE extends Provider {
+         ps("SecretKeyFactory", "PBEWithHmacSHA512/256AndAES_256",
+                 "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512_256AndAES_256");
+ 
+-        // PBKDF2
+-        psA("SecretKeyFactory", "PBKDF2WithHmacSHA1",
+-                "com.sun.crypto.provider.PBKDF2Core$HmacSHA1",
+-                null);
+-        ps("SecretKeyFactory", "PBKDF2WithHmacSHA224",
+-                "com.sun.crypto.provider.PBKDF2Core$HmacSHA224");
+-        ps("SecretKeyFactory", "PBKDF2WithHmacSHA256",
+-                "com.sun.crypto.provider.PBKDF2Core$HmacSHA256");
+-        ps("SecretKeyFactory", "PBKDF2WithHmacSHA384",
+-                "com.sun.crypto.provider.PBKDF2Core$HmacSHA384");
+-        ps("SecretKeyFactory", "PBKDF2WithHmacSHA512",
+-                "com.sun.crypto.provider.PBKDF2Core$HmacSHA512");
+-        ps("SecretKeyFactory", "PBKDF2WithHmacSHA512/224",
+-                "com.sun.crypto.provider.PBKDF2Core$HmacSHA512_224");
+-        ps("SecretKeyFactory", "PBKDF2WithHmacSHA512/256",
+-                "com.sun.crypto.provider.PBKDF2Core$HmacSHA512_256");
+-
+-        /*
+-         * MAC
+-         */
+-        attrs.clear();
+-        attrs.put("SupportedKeyFormats", "RAW");
+-        ps("Mac", "HmacMD5", "com.sun.crypto.provider.HmacMD5", null, attrs);
+-        psA("Mac", "HmacSHA1", "com.sun.crypto.provider.HmacSHA1",
+-                attrs);
+-        psA("Mac", "HmacSHA224",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA224", attrs);
+-        psA("Mac", "HmacSHA256",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA256", attrs);
+-        psA("Mac", "HmacSHA384",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA384", attrs);
+-        psA("Mac", "HmacSHA512",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA512", attrs);
+-        psA("Mac", "HmacSHA512/224",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA512_224", attrs);
+-        psA("Mac", "HmacSHA512/256",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA512_256", attrs);
+-        psA("Mac", "HmacSHA3-224",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA3_224", attrs);
+-        psA("Mac", "HmacSHA3-256",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA3_256", attrs);
+-        psA("Mac", "HmacSHA3-384",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA3_384", attrs);
+-        psA("Mac", "HmacSHA3-512",
+-                "com.sun.crypto.provider.HmacCore$HmacSHA3_512", attrs);
+-
+-        ps("Mac", "HmacPBESHA1",
+-                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1",
+-                null, attrs);
+-        ps("Mac", "HmacPBESHA224",
+-                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224",
+-                null, attrs);
+-        ps("Mac", "HmacPBESHA256",
+-                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256",
+-                null, attrs);
+-        ps("Mac", "HmacPBESHA384",
+-                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384",
+-                null, attrs);
+-        ps("Mac", "HmacPBESHA512",
+-                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512",
+-                null, attrs);
+-        ps("Mac", "HmacPBESHA512/224",
+-                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224",
+-                null, attrs);
+-        ps("Mac", "HmacPBESHA512/256",
+-                "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256",
+-                null, attrs);
+-
+-
+-        // PBMAC1
+-        ps("Mac", "PBEWithHmacSHA1",
+-                "com.sun.crypto.provider.PBMAC1Core$HmacSHA1", null, attrs);
+-        ps("Mac", "PBEWithHmacSHA224",
+-                "com.sun.crypto.provider.PBMAC1Core$HmacSHA224", null, attrs);
+-        ps("Mac", "PBEWithHmacSHA256",
+-                "com.sun.crypto.provider.PBMAC1Core$HmacSHA256", null, attrs);
+-        ps("Mac", "PBEWithHmacSHA384",
+-                "com.sun.crypto.provider.PBMAC1Core$HmacSHA384", null, attrs);
+-        ps("Mac", "PBEWithHmacSHA512",
+-                "com.sun.crypto.provider.PBMAC1Core$HmacSHA512", null, attrs);
+-        ps("Mac", "PBEWithHmacSHA512/224",
+-                "com.sun.crypto.provider.PBMAC1Core$HmacSHA512_224", null, attrs);
+-        ps("Mac", "PBEWithHmacSHA512/256",
+-                "com.sun.crypto.provider.PBMAC1Core$HmacSHA512_256", null, attrs);
+-
+-        ps("Mac", "SslMacMD5",
+-                "com.sun.crypto.provider.SslMacCore$SslMacMD5", null, attrs);
+-        ps("Mac", "SslMacSHA1",
+-                "com.sun.crypto.provider.SslMacCore$SslMacSHA1", null, attrs);
+-
+-        /*
+-         * KeyStore
+-         */
+-        ps("KeyStore", "JCEKS",
+-                "com.sun.crypto.provider.JceKeyStore");
+-
+-        /*
+-         * KEMs
+-         */
+-        attrs.clear();
+-        attrs.put("ImplementedIn", "Software");
+-        attrs.put("SupportedKeyClasses", "java.security.interfaces.ECKey" +
+-                "|java.security.interfaces.XECKey");
+-        ps("KEM", "DHKEM", "com.sun.crypto.provider.DHKEM", null, attrs);
+-
+-        attrs.clear();
+-        attrs.put("ImplementedIn", "Software");
+-        ps("KEM", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$K", null, attrs);
+-        psA("KEM", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$K2", attrs);
+-        psA("KEM", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$K3", attrs);
+-        psA("KEM", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$K5",attrs);
+-
+-        ps("KeyPairGenerator", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$KPG", null, attrs);
+-        psA("KeyPairGenerator", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$KPG2", attrs);
+-        psA("KeyPairGenerator", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$KPG3", attrs);
+-        psA("KeyPairGenerator", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$KPG5", attrs);
+-
+-        ps("KeyFactory", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$KF", null, attrs);
+-        psA("KeyFactory", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$KF2", attrs);
+-        psA("KeyFactory", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$KF3", attrs);
+-        psA("KeyFactory", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$KF5", attrs);
+-
+-        /*
+-         * SSL/TLS mechanisms
+-         *
+-         * These are strictly internal implementations and may
+-         * be changed at any time.  These names were chosen
+-         * because PKCS11/SunPKCS11 does not yet have TLS1.2
+-         * mechanisms, and it will cause calls to come here.
+-         */
+-        ps("KeyGenerator", "SunTlsPrf",
+-                "com.sun.crypto.provider.TlsPrfGenerator$V10");
+-        ps("KeyGenerator", "SunTls12Prf",
+-                "com.sun.crypto.provider.TlsPrfGenerator$V12");
+-
+-        ps("KeyGenerator", "SunTlsMasterSecret",
+-                "com.sun.crypto.provider.TlsMasterSecretGenerator",
+-                List.of("SunTls12MasterSecret", "SunTlsExtendedMasterSecret"),
+-                null);
+-
+-        ps("KeyGenerator", "SunTlsKeyMaterial",
+-                "com.sun.crypto.provider.TlsKeyMaterialGenerator",
+-                List.of("SunTls12KeyMaterial"), null);
+-
+-        ps("KeyGenerator", "SunTlsRsaPremasterSecret",
+-                "com.sun.crypto.provider.TlsRsaPremasterSecretGenerator",
+-                List.of("SunTls12RsaPremasterSecret"), null);
++        if (!systemFipsEnabled) {
++            // PBKDF2
++            psA("SecretKeyFactory", "PBKDF2WithHmacSHA1",
++                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA1",
++                    null);
++            ps("SecretKeyFactory", "PBKDF2WithHmacSHA224",
++                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA224");
++            ps("SecretKeyFactory", "PBKDF2WithHmacSHA256",
++                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA256");
++            ps("SecretKeyFactory", "PBKDF2WithHmacSHA384",
++                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA384");
++            ps("SecretKeyFactory", "PBKDF2WithHmacSHA512",
++                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA512");
++            ps("SecretKeyFactory", "PBKDF2WithHmacSHA512/224",
++                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA512_224");
++            ps("SecretKeyFactory", "PBKDF2WithHmacSHA512/256",
++                    "com.sun.crypto.provider.PBKDF2Core$HmacSHA512_256");
++
++            /*
++             * MAC
++             */
++            attrs.clear();
++            attrs.put("SupportedKeyFormats", "RAW");
++            ps("Mac", "HmacMD5", "com.sun.crypto.provider.HmacMD5", null, attrs);
++            psA("Mac", "HmacSHA1", "com.sun.crypto.provider.HmacSHA1",
++                    attrs);
++            psA("Mac", "HmacSHA224",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA224", attrs);
++            psA("Mac", "HmacSHA256",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA256", attrs);
++            psA("Mac", "HmacSHA384",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA384", attrs);
++            psA("Mac", "HmacSHA512",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA512", attrs);
++            psA("Mac", "HmacSHA512/224",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA512_224", attrs);
++            psA("Mac", "HmacSHA512/256",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA512_256", attrs);
++            psA("Mac", "HmacSHA3-224",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA3_224", attrs);
++            psA("Mac", "HmacSHA3-256",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA3_256", attrs);
++            psA("Mac", "HmacSHA3-384",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA3_384", attrs);
++            psA("Mac", "HmacSHA3-512",
++                    "com.sun.crypto.provider.HmacCore$HmacSHA3_512", attrs);
++
++            ps("Mac", "HmacPBESHA1",
++                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1",
++                    null, attrs);
++            ps("Mac", "HmacPBESHA224",
++                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224",
++                    null, attrs);
++            ps("Mac", "HmacPBESHA256",
++                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256",
++                    null, attrs);
++            ps("Mac", "HmacPBESHA384",
++                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384",
++                    null, attrs);
++            ps("Mac", "HmacPBESHA512",
++                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512",
++                    null, attrs);
++            ps("Mac", "HmacPBESHA512/224",
++                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224",
++                    null, attrs);
++            ps("Mac", "HmacPBESHA512/256",
++                    "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256",
++                    null, attrs);
++
++            // PBMAC1
++            ps("Mac", "PBEWithHmacSHA1",
++                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA1", null, attrs);
++            ps("Mac", "PBEWithHmacSHA224",
++                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA224", null, attrs);
++            ps("Mac", "PBEWithHmacSHA256",
++                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA256", null, attrs);
++            ps("Mac", "PBEWithHmacSHA384",
++                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA384", null, attrs);
++            ps("Mac", "PBEWithHmacSHA512",
++                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA512", null, attrs);
++            ps("Mac", "PBEWithHmacSHA512/224",
++                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA512_224", null, attrs);
++            ps("Mac", "PBEWithHmacSHA512/256",
++                    "com.sun.crypto.provider.PBMAC1Core$HmacSHA512_256", null, attrs);
++
++            ps("Mac", "SslMacMD5",
++                    "com.sun.crypto.provider.SslMacCore$SslMacMD5", null, attrs);
++            ps("Mac", "SslMacSHA1",
++                    "com.sun.crypto.provider.SslMacCore$SslMacSHA1", null, attrs);
++
++            /*
++             * KeyStore
++             */
++            ps("KeyStore", "JCEKS",
++                    "com.sun.crypto.provider.JceKeyStore");
++
++            /*
++             * KEMs
++             */
++            attrs.clear();
++            attrs.put("ImplementedIn", "Software");
++            attrs.put("SupportedKeyClasses", "java.security.interfaces.ECKey" +
++                      "|java.security.interfaces.XECKey");
++            ps("KEM", "DHKEM", "com.sun.crypto.provider.DHKEM", null, attrs);
++
++            attrs.clear();
++            attrs.put("ImplementedIn", "Software");
++            ps("KEM", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$K", null, attrs);
++            psA("KEM", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$K2", attrs);
++            psA("KEM", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$K3", attrs);
++            psA("KEM", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$K5",attrs);
++
++            ps("KeyPairGenerator", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$KPG", null, attrs);
++            psA("KeyPairGenerator", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$KPG2", attrs);
++            psA("KeyPairGenerator", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$KPG3", attrs);
++            psA("KeyPairGenerator", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$KPG5", attrs);
++
++            ps("KeyFactory", "ML-KEM", "com.sun.crypto.provider.ML_KEM_Impls$KF", null, attrs);
++            psA("KeyFactory", "ML-KEM-512", "com.sun.crypto.provider.ML_KEM_Impls$KF2", attrs);
++            psA("KeyFactory", "ML-KEM-768", "com.sun.crypto.provider.ML_KEM_Impls$KF3", attrs);
++            psA("KeyFactory", "ML-KEM-1024", "com.sun.crypto.provider.ML_KEM_Impls$KF5", attrs);
++
++            /*
++             * SSL/TLS mechanisms
++             *
++             * These are strictly internal implementations and may
++             * be changed at any time.  These names were chosen
++             * because PKCS11/SunPKCS11 does not yet have TLS1.2
++             * mechanisms, and it will cause calls to come here.
++             */
++            ps("KeyGenerator", "SunTlsPrf",
++                    "com.sun.crypto.provider.TlsPrfGenerator$V10");
++            ps("KeyGenerator", "SunTls12Prf",
++                    "com.sun.crypto.provider.TlsPrfGenerator$V12");
++
++            ps("KeyGenerator", "SunTlsMasterSecret",
++                    "com.sun.crypto.provider.TlsMasterSecretGenerator",
++                    List.of("SunTls12MasterSecret", "SunTlsExtendedMasterSecret"),
++                    null);
++
++            ps("KeyGenerator", "SunTlsKeyMaterial",
++                    "com.sun.crypto.provider.TlsKeyMaterialGenerator",
++                    List.of("SunTls12KeyMaterial"), null);
++
++            ps("KeyGenerator", "SunTlsRsaPremasterSecret",
++                    "com.sun.crypto.provider.TlsRsaPremasterSecretGenerator",
++                    List.of("SunTls12RsaPremasterSecret"), null);
++        }
+     }
+ 
+     // Return the instance of this class or create one if needed.
+diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
+index 671529f71a1..af632936921 100644
+--- a/src/java.base/share/classes/java/security/Security.java
++++ b/src/java.base/share/classes/java/security/Security.java
+@@ -34,6 +34,7 @@ import java.net.URL;
+ import jdk.internal.access.JavaSecurityPropertiesAccess;
+ 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;
+@@ -58,6 +59,11 @@ import sun.security.jca.*;
+ 
+ public final class Security {
+ 
++    private static final String SYS_PROP_SWITCH =
++        "java.security.disableSystemPropertiesFile";
++    private static final String SEC_PROP_SWITCH =
++        "security.useSystemPropertiesFile";
++
+     /* Are we debugging? -- for developers */
+     private static final Debug sdebug =
+                         Debug.getInstance("properties");
+@@ -75,6 +81,19 @@ public final class Security {
+     }
+ 
+     static {
++        // Initialise here as used by code with system properties disabled
++        SharedSecrets.setJavaSecuritySystemConfiguratorAccess(
++            new JavaSecuritySystemConfiguratorAccess() {
++                @Override
++                public boolean isSystemFipsEnabled() {
++                    return SystemConfigurator.isSystemFipsEnabled();
++                }
++                @Override
++                public boolean isPlainKeySupportEnabled() {
++                    return SystemConfigurator.isPlainKeySupportEnabled();
++                }
++            });
++
+         // doPrivileged here because there are multiple
+         // things in initialize that might require privs.
+         // (the FileInputStream call and the File.exists call,
+@@ -96,6 +115,7 @@ public final class Security {
+     private static void initialize() {
+         props = new Properties();
+         boolean overrideAll = false;
++        boolean systemSecPropsEnabled = false;
+ 
+         // first load the system properties file
+         // to determine the value of security.overridePropertiesFile
+@@ -116,6 +136,61 @@ public final class Security {
+             }
+             loadProps(null, extraPropFile, overrideAll);
+         }
++
++        boolean sysUseProps = Boolean.valueOf(System.getProperty(SYS_PROP_SWITCH, "false"));
++        boolean secUseProps = Boolean.valueOf(props.getProperty(SEC_PROP_SWITCH));
++        if (sdebug != null) {
++            sdebug.println(SYS_PROP_SWITCH + "=" + sysUseProps);
++            sdebug.println(SEC_PROP_SWITCH + "=" + secUseProps);
++        }
++        if (!sysUseProps && secUseProps) {
++            systemSecPropsEnabled = SystemConfigurator.configureSysProps(props);
++            if (!systemSecPropsEnabled) {
++                if (sdebug != null) {
++                    sdebug.println("WARNING: System security properties could not be loaded.");
++                }
++            }
++        } else {
++            if (sdebug != null) {
++                sdebug.println("System security property support disabled by user.");
++            }
++        }
++
++        if (systemSecPropsEnabled) {
++            boolean shouldEnable;
++            String sysProp = System.getProperty("com.redhat.fips");
++            if (sysProp == null) {
++                shouldEnable = true;
++                if (sdebug != null) {
++                    sdebug.println("com.redhat.fips unset, using default value of true");
++                }
++            } else {
++                shouldEnable = Boolean.valueOf(sysProp);
++                if (sdebug != null) {
++                    sdebug.println("com.redhat.fips set, using its value " + shouldEnable);
++                }
++            }
++            if (shouldEnable) {
++                boolean fipsEnabled = SystemConfigurator.configureFIPS(props);
++                if (sdebug != null) {
++                    if (fipsEnabled) {
++                        sdebug.println("FIPS mode support configured and enabled.");
++                    } else {
++                        sdebug.println("FIPS mode support disabled.");
++                    }
++                }
++            } else {
++                if (sdebug != null ) {
++                    sdebug.println("FIPS mode support disabled by user.");
++                }
++            }
++        } else {
++            if (sdebug != null) {
++                sdebug.println("WARNING: FIPS mode support can not be enabled without " +
++                               "system security properties being enabled.");
++            }
++        }
++
+         initialSecurityProperties = (Properties) props.clone();
+         if (sdebug != null) {
+             for (String key : props.stringPropertyNames()) {
+@@ -126,7 +201,7 @@ public final class Security {
+ 
+     }
+ 
+-    private static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
++    static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
+         InputStream is = null;
+         try {
+             if (masterFile != null && masterFile.exists()) {
+diff --git a/src/java.base/share/classes/java/security/SystemConfigurator.java b/src/java.base/share/classes/java/security/SystemConfigurator.java
+new file mode 100644
+index 00000000000..9d26a54f5d4
+--- /dev/null
++++ b/src/java.base/share/classes/java/security/SystemConfigurator.java
+@@ -0,0 +1,232 @@
++/*
++ * Copyright (c) 2019, 2021, Red Hat, Inc.
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package java.security;
++
++import java.io.BufferedInputStream;
++import java.io.FileInputStream;
++import java.io.IOException;
++
++import java.util.Iterator;
++import java.util.Map.Entry;
++import java.util.Properties;
++
++import sun.security.util.Debug;
++
++/**
++ * Internal class to align OpenJDK with global crypto-policies.
++ * Called from java.security.Security class initialization,
++ * during startup.
++ *
++ */
++
++final class SystemConfigurator {
++
++    private static final Debug sdebug =
++            Debug.getInstance("properties");
++
++    private static final String CRYPTO_POLICIES_BASE_DIR =
++            "/etc/crypto-policies";
++
++    private static final String CRYPTO_POLICIES_JAVA_CONFIG =
++            CRYPTO_POLICIES_BASE_DIR + "/back-ends/java.config";
++
++    private static boolean systemFipsEnabled = false;
++    private static boolean plainKeySupportEnabled = false;
++
++    private static final String SYSTEMCONF_NATIVE_LIB = "systemconf";
++
++    private static native boolean getSystemFIPSEnabled()
++            throws IOException;
++
++    static {
++        @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
++     * security.useSystemPropertiesFile is true.
++     */
++    static boolean configureSysProps(Properties props) {
++        // now load the system file, if it exists, so its values
++        // will win if they conflict with the earlier values
++        return Security.loadProps(null, CRYPTO_POLICIES_JAVA_CONFIG, false);
++    }
++
++    /*
++     * Invoked at the end of java.security.Security initialisation
++     * if java.security properties have been loaded
++     */
++    static boolean configureFIPS(Properties props) {
++        boolean loadedProps = false;
++
++        try {
++            if (enableFips()) {
++                if (sdebug != null) { sdebug.println("FIPS mode detected"); }
++                // Remove all security providers
++                Iterator<Entry<Object, Object>> i = props.entrySet().iterator();
++                while (i.hasNext()) {
++                    Entry<Object, Object> e = i.next();
++                    if (((String) e.getKey()).startsWith("security.provider")) {
++                        if (sdebug != null) { sdebug.println("Removing provider: " + e); }
++                        i.remove();
++                    }
++                }
++                // Add FIPS security providers
++                String fipsProviderValue = null;
++                for (int n = 1;
++                     (fipsProviderValue = (String) props.get("fips.provider." + n)) != null; n++) {
++                    String fipsProviderKey = "security.provider." + n;
++                    if (sdebug != null) {
++                        sdebug.println("Adding provider " + n + ": " +
++                                fipsProviderKey + "=" + fipsProviderValue);
++                    }
++                    props.put(fipsProviderKey, fipsProviderValue);
++                }
++                // Add other security properties
++                String keystoreTypeValue = (String) props.get("fips.keystore.type");
++                if (keystoreTypeValue != null) {
++                    String nonFipsKeystoreType = props.getProperty("keystore.type");
++                    props.put("keystore.type", keystoreTypeValue);
++                    if (keystoreTypeValue.equals("PKCS11")) {
++                        // If keystore.type is PKCS11, javax.net.ssl.keyStore
++                        // must be "NONE". See JDK-8238264.
++                        System.setProperty("javax.net.ssl.keyStore", "NONE");
++                    }
++                    if (System.getProperty("javax.net.ssl.trustStoreType") == null) {
++                        // If no trustStoreType has been set, use the
++                        // previous keystore.type under FIPS mode. In
++                        // a default configuration, the Trust Store will
++                        // be 'cacerts' (JKS type).
++                        System.setProperty("javax.net.ssl.trustStoreType",
++                                nonFipsKeystoreType);
++                    }
++                    if (sdebug != null) {
++                        sdebug.println("FIPS mode default keystore.type = " +
++                                keystoreTypeValue);
++                        sdebug.println("FIPS mode javax.net.ssl.keyStore = " +
++                                        System.getProperty("javax.net.ssl.keyStore", ""));
++                        sdebug.println("FIPS mode javax.net.ssl.trustStoreType = " +
++                                System.getProperty("javax.net.ssl.trustStoreType", ""));
++                    }
++                }
++                loadedProps = true;
++                systemFipsEnabled = true;
++                String plainKeySupport = System.getProperty("com.redhat.fips.plainKeySupport",
++                                                            "true");
++                plainKeySupportEnabled = !"false".equals(plainKeySupport);
++                if (sdebug != null) {
++                    if (plainKeySupportEnabled) {
++                        sdebug.println("FIPS support enabled with plain key support");
++                    } else {
++                        sdebug.println("FIPS support enabled without plain key support");
++                    }
++                }
++            } else {
++                if (sdebug != null) { sdebug.println("FIPS mode not detected"); }
++            }
++        } catch (Exception e) {
++            if (sdebug != null) {
++                sdebug.println("unable to load FIPS configuration");
++                e.printStackTrace();
++            }
++        }
++        return loadedProps;
++    }
++
++    /**
++     * 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;
++    }
++
++    /**
++     * 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;
++    }
++
++    /**
++     * Determines whether FIPS mode should be enabled.
++     *
++     * OpenJDK FIPS mode will be enabled only if the system is in
++     * FIPS mode.
++     *
++     * Calls to this method only occur if the system property
++     * com.redhat.fips is not set to false.
++     *
++     * 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.
++     *
++     * @return true if the system is in FIPS mode
++     */
++    private static boolean enableFips() throws Exception {
++        if (sdebug != null) {
++            sdebug.println("Calling getSystemFIPSEnabled (libsystemconf)...");
++        }
++        try {
++            boolean fipsEnabled = getSystemFIPSEnabled();
++            if (sdebug != null) {
++                sdebug.println("Call to getSystemFIPSEnabled (libsystemconf) returned: "
++                               + fipsEnabled);
++            }
++            return fipsEnabled;
++        } catch (IOException e) {
++            if (sdebug != null) {
++                sdebug.println("Call to getSystemFIPSEnabled (libsystemconf) failed:");
++                sdebug.println(e.getMessage());
++            }
++            throw e;
++        }
++    }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
+new file mode 100644
+index 00000000000..3f3caac64dc
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/access/JavaSecuritySystemConfiguratorAccess.java
+@@ -0,0 +1,31 @@
++/*
++ * 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();
++    boolean isPlainKeySupportEnabled();
++}
+diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
+index 919d758a6e3..b1e5fbaf84a 100644
+--- a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
++++ b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
+@@ -43,6 +43,7 @@ import java.io.PrintStream;
+ import java.io.PrintWriter;
+ import java.io.RandomAccessFile;
+ import java.security.ProtectionDomain;
++import java.security.Security;
+ import java.security.Signature;
+ 
+ /** A repository of "shared secrets", which are a mechanism for
+@@ -90,6 +91,7 @@ public class SharedSecrets {
+     private static JavaxCryptoSealedObjectAccess javaxCryptoSealedObjectAccess;
+     private static JavaxCryptoSpecAccess javaxCryptoSpecAccess;
+     private static JavaTemplateAccess javaTemplateAccess;
++    private static JavaSecuritySystemConfiguratorAccess javaSecuritySystemConfiguratorAccess;
+ 
+     public static void setJavaUtilCollectionAccess(JavaUtilCollectionAccess juca) {
+         javaUtilCollectionAccess = juca;
+@@ -537,4 +539,15 @@ public class SharedSecrets {
+             MethodHandles.lookup().ensureInitialized(c);
+         } catch (IllegalAccessException e) {}
+     }
++
++    public static void setJavaSecuritySystemConfiguratorAccess(JavaSecuritySystemConfiguratorAccess jssca) {
++        javaSecuritySystemConfiguratorAccess = jssca;
++    }
++
++    public static JavaSecuritySystemConfiguratorAccess getJavaSecuritySystemConfiguratorAccess() {
++        if (javaSecuritySystemConfiguratorAccess == null) {
++            ensureClassInitialized(Security.class);
++        }
++        return javaSecuritySystemConfiguratorAccess;
++    }
+ }
+diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
+index 3af9d4e542f..37a15919095 100644
+--- a/src/java.base/share/classes/module-info.java
++++ b/src/java.base/share/classes/module-info.java
+@@ -158,6 +158,7 @@ module java.base {
+         java.naming,
+         java.rmi,
+         jdk.charsets,
++        jdk.crypto.ec,
+         jdk.jartool,
+         jdk.jlink,
+         jdk.jfr,
+diff --git a/src/java.base/share/classes/sun/security/provider/SunEntries.java b/src/java.base/share/classes/sun/security/provider/SunEntries.java
+index 769e5bfc651..85278be81eb 100644
+--- a/src/java.base/share/classes/sun/security/provider/SunEntries.java
++++ b/src/java.base/share/classes/sun/security/provider/SunEntries.java
+@@ -38,6 +38,7 @@ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.LinkedHashSet;
+ 
++import jdk.internal.access.SharedSecrets;
+ import jdk.internal.util.StaticProperty;
+ import sun.security.action.GetBooleanAction;
+ 
+@@ -91,6 +92,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;
+ 
+@@ -102,98 +107,100 @@ 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);
+-        }
+-        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");
+-
+-        attrs.clear();
+-        attrs.put("ImplementedIn", "Software");
+-        addWithAlias(p, "Signature", "HSS/LMS", "sun.security.provider.HSS", 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);
+ 
+-        add(p, "Signature", "ML-DSA", "sun.security.provider.ML_DSA_Impls$SIG", attrs);
+-        addWithAlias(p, "Signature", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$SIG2", attrs);
+-        addWithAlias(p, "Signature", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$SIG3", attrs);
+-        addWithAlias(p, "Signature", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$SIG5", 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");
++
++            attrs.clear();
++            attrs.put("ImplementedIn", "Software");
++            addWithAlias(p, "Signature", "HSS/LMS", "sun.security.provider.HSS", attrs);
++
++            add(p, "Signature", "ML-DSA", "sun.security.provider.ML_DSA_Impls$SIG", attrs);
++            addWithAlias(p, "Signature", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$SIG2", attrs);
++            addWithAlias(p, "Signature", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$SIG3", attrs);
++            addWithAlias(p, "Signature", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$SIG5", attrs);
++        }
+ 
+         /*
+          *  Key Pair Generator engines
+@@ -201,16 +208,18 @@ public final class SunEntries {
+         attrs.clear();
+         attrs.put("ImplementedIn", "Software");
+ 
+-        String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
+-        dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
+-        attrs.put("KeySize", "2048");
+-        addWithAlias(p, "KeyPairGenerator", "DSA", dsaKPGImplClass, attrs);
+-        attrs.remove("KeySize");
+-
+-        add(p, "KeyPairGenerator", "ML-DSA", "sun.security.provider.ML_DSA_Impls$KPG", attrs);
+-        addWithAlias(p, "KeyPairGenerator", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$KPG2", attrs);
+-        addWithAlias(p, "KeyPairGenerator", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$KPG3", attrs);
+-        addWithAlias(p, "KeyPairGenerator", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$KPG5", attrs);
++        if (!systemFipsEnabled) {
++            String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
++            dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
++            attrs.put("KeySize", "2048");
++            addWithAlias(p, "KeyPairGenerator", "DSA", dsaKPGImplClass, attrs);
++            attrs.remove("KeySize");
++
++            add(p, "KeyPairGenerator", "ML-DSA", "sun.security.provider.ML_DSA_Impls$KPG", attrs);
++            addWithAlias(p, "KeyPairGenerator", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$KPG2", attrs);
++            addWithAlias(p, "KeyPairGenerator", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$KPG3", attrs);
++            addWithAlias(p, "KeyPairGenerator", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$KPG5", attrs);
++        }
+ 
+         /*
+          * Algorithm Parameter Generator engines
+@@ -226,53 +235,55 @@ public final class SunEntries {
+         addWithAlias(p, "AlgorithmParameters", "DSA",
+                 "sun.security.provider.DSAParameters", attrs);
+ 
+-        /*
+-         * Key factories
+-         */
+-        addWithAlias(p, "KeyFactory", "DSA",
+-                "sun.security.provider.DSAKeyFactory", attrs);
+-        addWithAlias(p, "KeyFactory", "HSS/LMS",
+-                "sun.security.provider.HSS$KeyFactoryImpl", attrs);
+-
+-        add(p, "KeyFactory", "ML-DSA", "sun.security.provider.ML_DSA_Impls$KF", attrs);
+-        addWithAlias(p, "KeyFactory", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$KF2", attrs);
+-        addWithAlias(p, "KeyFactory", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$KF3", attrs);
+-        addWithAlias(p, "KeyFactory", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$KF5", attrs);
++        if (!systemFipsEnabled) {
++            /*
++             * Key factories
++             */
++            addWithAlias(p, "KeyFactory", "DSA",
++                    "sun.security.provider.DSAKeyFactory", attrs);
++            addWithAlias(p, "KeyFactory", "HSS/LMS",
++                    "sun.security.provider.HSS$KeyFactoryImpl", attrs);
+ 
+-        /*
+-         * Digest engines
+-         */
+-        addWithAlias(p, "MessageDigest", "MD2", "sun.security.provider.MD2",
+-                attrs);
+-        addWithAlias(p, "MessageDigest", "MD5", "sun.security.provider.MD5",
+-                attrs);
+-        addWithAlias(p, "MessageDigest", "SHA-1", "sun.security.provider.SHA",
+-                attrs);
++            add(p, "KeyFactory", "ML-DSA", "sun.security.provider.ML_DSA_Impls$KF", attrs);
++            addWithAlias(p, "KeyFactory", "ML-DSA-44", "sun.security.provider.ML_DSA_Impls$KF2", attrs);
++            addWithAlias(p, "KeyFactory", "ML-DSA-65", "sun.security.provider.ML_DSA_Impls$KF3", attrs);
++            addWithAlias(p, "KeyFactory", "ML-DSA-87", "sun.security.provider.ML_DSA_Impls$KF5", 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);
+-        addWithAlias(p, "MessageDigest", "SHAKE128-256",
+-                "sun.security.provider.SHA3$SHAKE128Hash", attrs);
+-        addWithAlias(p, "MessageDigest", "SHAKE256-512",
+-                "sun.security.provider.SHA3$SHAKE256Hash", attrs);
++            /*
++             * Digest engines
++             */
++            addWithAlias(p, "MessageDigest", "MD2", "sun.security.provider.MD2",
++                         attrs);
++            addWithAlias(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);
++            addWithAlias(p, "MessageDigest", "SHAKE128-256",
++                    "sun.security.provider.SHA3$SHAKE128Hash", attrs);
++            addWithAlias(p, "MessageDigest", "SHAKE256-512",
++                    "sun.security.provider.SHA3$SHAKE256Hash", attrs);
++        }
+ 
+         /*
+          * Certificates
+diff --git a/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java b/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
+index 539ef1e8ee8..435f57e3ff2 100644
+--- a/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
++++ b/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
+@@ -27,6 +27,7 @@ package sun.security.rsa;
+ 
+ import java.util.*;
+ import java.security.Provider;
++import jdk.internal.access.SharedSecrets;
+ import static sun.security.util.SecurityProviderConstants.getAliases;
+ 
+ /**
+@@ -36,6 +37,10 @@ import static sun.security.util.SecurityProviderConstants.getAliases;
+  */
+ public final class SunRsaSignEntries {
+ 
++    private static final boolean systemFipsEnabled =
++            SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
++            .isSystemFipsEnabled();
++
+     private void add(Provider p, String type, String algo, String cn,
+              List<String> aliases, HashMap<String, String> attrs) {
+          services.add(new Provider.Service(p, type, algo, cn,
+@@ -63,42 +68,49 @@ public final class SunRsaSignEntries {
+         add(p, "KeyFactory", "RSA",
+                 "sun.security.rsa.RSAKeyFactory$Legacy",
+                 getAliases("PKCS1"), null);
+-        add(p, "KeyPairGenerator", "RSA",
+-                "sun.security.rsa.RSAKeyPairGenerator$Legacy",
+-                getAliases("PKCS1"), null);
+-        addA(p, "Signature", "MD2withRSA",
+-                "sun.security.rsa.RSASignature$MD2withRSA", attrs);
+-        addA(p, "Signature", "MD5withRSA",
+-                "sun.security.rsa.RSASignature$MD5withRSA", attrs);
+-        addA(p, "Signature", "SHA1withRSA",
+-                "sun.security.rsa.RSASignature$SHA1withRSA", attrs);
+-        addA(p, "Signature", "SHA224withRSA",
+-                "sun.security.rsa.RSASignature$SHA224withRSA", attrs);
+-        addA(p, "Signature", "SHA256withRSA",
+-                "sun.security.rsa.RSASignature$SHA256withRSA", attrs);
+-        addA(p, "Signature", "SHA384withRSA",
+-                "sun.security.rsa.RSASignature$SHA384withRSA", attrs);
+-        addA(p, "Signature", "SHA512withRSA",
+-                "sun.security.rsa.RSASignature$SHA512withRSA", attrs);
+-        addA(p, "Signature", "SHA512/224withRSA",
+-                "sun.security.rsa.RSASignature$SHA512_224withRSA", attrs);
+-        addA(p, "Signature", "SHA512/256withRSA",
+-                "sun.security.rsa.RSASignature$SHA512_256withRSA", attrs);
+-        addA(p, "Signature", "SHA3-224withRSA",
+-                "sun.security.rsa.RSASignature$SHA3_224withRSA", attrs);
+-        addA(p, "Signature", "SHA3-256withRSA",
+-                "sun.security.rsa.RSASignature$SHA3_256withRSA", attrs);
+-        addA(p, "Signature", "SHA3-384withRSA",
+-               "sun.security.rsa.RSASignature$SHA3_384withRSA", attrs);
+-        addA(p, "Signature", "SHA3-512withRSA",
+-                "sun.security.rsa.RSASignature$SHA3_512withRSA", attrs);
++
++        if (!systemFipsEnabled) {
++            add(p, "KeyPairGenerator", "RSA",
++                    "sun.security.rsa.RSAKeyPairGenerator$Legacy",
++                    getAliases("PKCS1"), null);
++            addA(p, "Signature", "MD2withRSA",
++                    "sun.security.rsa.RSASignature$MD2withRSA", attrs);
++            addA(p, "Signature", "MD5withRSA",
++                    "sun.security.rsa.RSASignature$MD5withRSA", attrs);
++            addA(p, "Signature", "SHA1withRSA",
++                    "sun.security.rsa.RSASignature$SHA1withRSA", attrs);
++            addA(p, "Signature", "SHA224withRSA",
++                    "sun.security.rsa.RSASignature$SHA224withRSA", attrs);
++            addA(p, "Signature", "SHA256withRSA",
++                    "sun.security.rsa.RSASignature$SHA256withRSA", attrs);
++            addA(p, "Signature", "SHA384withRSA",
++                    "sun.security.rsa.RSASignature$SHA384withRSA", attrs);
++            addA(p, "Signature", "SHA512withRSA",
++                    "sun.security.rsa.RSASignature$SHA512withRSA", attrs);
++            addA(p, "Signature", "SHA512/224withRSA",
++                    "sun.security.rsa.RSASignature$SHA512_224withRSA", attrs);
++            addA(p, "Signature", "SHA512/256withRSA",
++                    "sun.security.rsa.RSASignature$SHA512_256withRSA", attrs);
++            addA(p, "Signature", "SHA3-224withRSA",
++                    "sun.security.rsa.RSASignature$SHA3_224withRSA", attrs);
++            addA(p, "Signature", "SHA3-256withRSA",
++                    "sun.security.rsa.RSASignature$SHA3_256withRSA", attrs);
++            addA(p, "Signature", "SHA3-384withRSA",
++                   "sun.security.rsa.RSASignature$SHA3_384withRSA", attrs);
++            addA(p, "Signature", "SHA3-512withRSA",
++                    "sun.security.rsa.RSASignature$SHA3_512withRSA", attrs);
++        }
+ 
+         addA(p, "KeyFactory", "RSASSA-PSS",
+                 "sun.security.rsa.RSAKeyFactory$PSS", attrs);
+-        addA(p, "KeyPairGenerator", "RSASSA-PSS",
+-                "sun.security.rsa.RSAKeyPairGenerator$PSS", attrs);
+-        addA(p, "Signature", "RSASSA-PSS",
+-                "sun.security.rsa.RSAPSSSignature", attrs);
++
++        if (!systemFipsEnabled) {
++            addA(p, "KeyPairGenerator", "RSASSA-PSS",
++                    "sun.security.rsa.RSAKeyPairGenerator$PSS", attrs);
++            addA(p, "Signature", "RSASSA-PSS",
++                    "sun.security.rsa.RSAPSSSignature", attrs);
++        }
++
+         addA(p, "AlgorithmParameters", "RSASSA-PSS",
+                 "sun.security.rsa.PSSParameters", null);
+     }
+diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
+index cdd951a770a..16f96b33f10 100644
+--- a/src/java.base/share/conf/security/java.security
++++ b/src/java.base/share/conf/security/java.security
+@@ -85,6 +85,17 @@ security.provider.tbd=Apple
+ #endif
+ security.provider.tbd=SunPKCS11
+ 
++#
++# Security providers used when FIPS mode support is active
++#
++fips.provider.1=SunPKCS11 ${java.home}/conf/security/nss.fips.cfg
++fips.provider.2=SUN
++fips.provider.3=SunEC
++fips.provider.4=SunJSSE
++fips.provider.5=SunJCE
++fips.provider.6=SunRsaSign
++fips.provider.7=XMLDSig
++
+ #
+ # A list of preferred providers for specific algorithms. These providers will
+ # be searched for matching algorithms before the list of registered providers.
+@@ -295,6 +306,47 @@ policy.ignoreIdentityScope=false
+ #
+ keystore.type=pkcs12
+ 
++#
++# Default keystore type used when global crypto-policies are set to FIPS.
++#
++fips.keystore.type=pkcs12
++
++#
++# Location of the NSS DB keystore (PKCS11) in FIPS mode.
++#
++# The syntax for this property is identical to the 'nssSecmodDirectory'
++# attribute available in the SunPKCS11 NSS configuration file. Use the
++# 'sql:' prefix to refer to an SQLite DB.
++#
++# If the system property fips.nssdb.path is also specified, it supersedes
++# the security property value defined here.
++#
++# Note: the default value for this property points to an NSS DB that might be
++# readable by multiple operating system users and unsuitable to store keys.
++#
++fips.nssdb.path=sql:/etc/pki/nssdb
++
++#
++# PIN for the NSS DB keystore (PKCS11) in FIPS mode.
++#
++# Values must take any of the following forms:
++#   1) pin:<value>
++#        Value: clear text PIN value.
++#   2) env:<value>
++#        Value: environment variable containing the PIN value.
++#   3) file:<value>
++#        Value: path to a file containing the PIN value in its first
++#        line.
++#
++# If the system property fips.nssdb.pin is also specified, it supersedes
++# the security property value defined here.
++#
++# When used as a system property, UTF-8 encoded values are valid. When
++# used as a security property (such as in this file), encode non-Basic
++# Latin Unicode characters with \uXXXX.
++#
++fips.nssdb.pin=pin:
++
+ #
+ # Controls compatibility mode for JKS and PKCS12 keystore types.
+ #
+@@ -332,6 +384,13 @@ package.definition=sun.misc.,\
+ #
+ 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=false
++
+ #
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+diff --git a/src/java.base/share/conf/security/nss.fips.cfg.in b/src/java.base/share/conf/security/nss.fips.cfg.in
+new file mode 100644
+index 00000000000..6de716e6b42
+--- /dev/null
++++ b/src/java.base/share/conf/security/nss.fips.cfg.in
+@@ -0,0 +1,8 @@
++name = NSS-FIPS
++nssLibraryDirectory = @NSS_LIBDIR@
++nssSecmodDirectory = ${fips.nssdb.path}
++nssDbMode = readWrite
++nssModule = fips
++
++attributes(*,CKO_SECRET_KEY,*)={ CKA_SIGN=true CKA_ENCRYPT=true }
++
+diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy
+index 01299b0520d..1c7fd074524 100644
+--- a/src/java.base/share/lib/security/default.policy
++++ b/src/java.base/share/lib/security/default.policy
+@@ -131,6 +131,7 @@ grant codeBase "jrt:/jdk.charsets" {
+ grant codeBase "jrt:/jdk.crypto.ec" {
+     permission java.lang.RuntimePermission
+                    "accessClassInPackage.sun.security.*";
++    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.access";
+     permission java.lang.RuntimePermission "loadLibrary.sunec";
+     permission java.security.SecurityPermission "putProviderProperty.SunEC";
+     permission java.security.SecurityPermission "clearProviderProperties.SunEC";
+@@ -151,6 +152,8 @@ grant codeBase "jrt:/jdk.crypto.cryptoki" {
+     permission java.util.PropertyPermission "os.name", "read";
+     permission java.util.PropertyPermission "os.arch", "read";
+     permission java.util.PropertyPermission "jdk.crypto.KeyAgreement.legacyKDF", "read";
++    permission java.util.PropertyPermission "fips.nssdb.path", "read,write";
++    permission java.util.PropertyPermission "fips.nssdb.pin", "read";
+     permission java.security.SecurityPermission "putProviderProperty.*";
+     permission java.security.SecurityPermission "clearProviderProperties.*";
+     permission java.security.SecurityPermission "removeProviderProperty.*";
+diff --git a/src/java.base/share/native/libsystemconf/systemconf.c b/src/java.base/share/native/libsystemconf/systemconf.c
+new file mode 100644
+index 00000000000..ddf9befe5bc
+--- /dev/null
++++ b/src/java.base/share/native/libsystemconf/systemconf.c
+@@ -0,0 +1,236 @@
++/*
++ * Copyright (c) 2021, Red Hat, Inc.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#include <jni.h>
++#include <jni_util.h>
++#include "jvm_md.h"
++#include <stdio.h>
++
++#ifdef LINUX
++
++#ifdef SYSCONF_NSS
++#include <nss3/pk11pub.h>
++#else
++#include <dlfcn.h>
++#endif //SYSCONF_NSS
++
++#include "java_security_SystemConfigurator.h"
++
++#define MSG_MAX_SIZE 256
++#define FIPS_ENABLED_PATH "/proc/sys/crypto/fips_enabled"
++
++typedef int (SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE)(void);
++
++static SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE *getSystemFIPSEnabled;
++static jmethodID debugPrintlnMethodID = NULL;
++static jobject debugObj = NULL;
++
++static void dbgPrint(JNIEnv *env, const char* msg)
++{
++    jstring jMsg;
++    if (debugObj != NULL) {
++        jMsg = (*env)->NewStringUTF(env, msg);
++        CHECK_NULL(jMsg);
++        (*env)->CallVoidMethod(env, debugObj, debugPrintlnMethodID, jMsg);
++    }
++}
++
++static void throwIOException(JNIEnv *env, const char *msg)
++{
++    jclass cls = (*env)->FindClass(env, "java/io/IOException");
++    if (cls != 0)
++        (*env)->ThrowNew(env, cls, msg);
++}
++
++static void handle_msg(JNIEnv *env, const char* msg, int msg_bytes)
++{
++  if (msg_bytes > 0 && msg_bytes < MSG_MAX_SIZE) {
++    dbgPrint(env, msg);
++  } else {
++    dbgPrint(env, "systemconf: cannot render message");
++  }
++}
++
++// Only used when NSS is not linked at build time
++#ifndef SYSCONF_NSS
++
++static void *nss_handle;
++
++static jboolean loadNSS(JNIEnv *env)
++{
++  char msg[MSG_MAX_SIZE];
++  int msg_bytes;
++  const char* errmsg;
++
++  nss_handle = dlopen(JNI_LIB_NAME("nss3"), RTLD_LAZY);
++  if (nss_handle == NULL) {
++    errmsg = dlerror();
++    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "loadNSS: dlopen: %s\n",
++                         errmsg);
++    handle_msg(env, msg, msg_bytes);
++    return JNI_FALSE;
++  }
++  dlerror(); /* Clear errors */
++  getSystemFIPSEnabled = (SECMOD_GET_SYSTEM_FIPS_ENABLED_TYPE*)dlsym(nss_handle, "SECMOD_GetSystemFIPSEnabled");
++  if ((errmsg = dlerror()) != NULL) {
++    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "loadNSS: dlsym: %s\n",
++                         errmsg);
++    handle_msg(env, msg, msg_bytes);
++    return JNI_FALSE;
++  }
++  return JNI_TRUE;
++}
++
++static void closeNSS(JNIEnv *env)
++{
++  char msg[MSG_MAX_SIZE];
++  int msg_bytes;
++  const char* errmsg;
++
++  if (dlclose(nss_handle) != 0) {
++    errmsg = dlerror();
++    msg_bytes = snprintf(msg, MSG_MAX_SIZE, "closeNSS: dlclose: %s\n",
++                         errmsg);
++    handle_msg(env, msg, msg_bytes);
++  }
++}
++
++#endif
++
++/*
++ * Class:     java_security_SystemConfigurator
++ * Method:    JNI_OnLoad
++ */
++JNIEXPORT jint JNICALL DEF_JNI_OnLoad(JavaVM *vm, void *reserved)
++{
++    JNIEnv *env;
++    jclass sysConfCls, debugCls;
++    jfieldID sdebugFld;
++
++    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {
++        return JNI_EVERSION; /* JNI version not supported */
++    }
++
++    sysConfCls = (*env)->FindClass(env,"java/security/SystemConfigurator");
++    if (sysConfCls == NULL) {
++        printf("libsystemconf: SystemConfigurator class not found\n");
++        return JNI_ERR;
++    }
++    sdebugFld = (*env)->GetStaticFieldID(env, sysConfCls,
++            "sdebug", "Lsun/security/util/Debug;");
++    if (sdebugFld == NULL) {
++        printf("libsystemconf: SystemConfigurator::sdebug field not found\n");
++        return JNI_ERR;
++    }
++    debugObj = (*env)->GetStaticObjectField(env, sysConfCls, sdebugFld);
++    if (debugObj != NULL) {
++        debugCls = (*env)->FindClass(env,"sun/security/util/Debug");
++        if (debugCls == NULL) {
++            printf("libsystemconf: Debug class not found\n");
++            return JNI_ERR;
++        }
++        debugPrintlnMethodID = (*env)->GetMethodID(env, debugCls,
++                "println", "(Ljava/lang/String;)V");
++        if (debugPrintlnMethodID == NULL) {
++            printf("libsystemconf: Debug::println(String) method not found\n");
++            return JNI_ERR;
++        }
++        debugObj = (*env)->NewGlobalRef(env, debugObj);
++    }
++
++#ifdef SYSCONF_NSS
++    getSystemFIPSEnabled = *SECMOD_GetSystemFIPSEnabled;
++#else
++    if (loadNSS(env) == JNI_FALSE) {
++      dbgPrint(env, "libsystemconf: Failed to load NSS library.");
++    }
++#endif
++
++    return (*env)->GetVersion(env);
++}
++
++/*
++ * Class:     java_security_SystemConfigurator
++ * Method:    JNI_OnUnload
++ */
++JNIEXPORT void JNICALL DEF_JNI_OnUnload(JavaVM *vm, void *reserved)
++{
++    JNIEnv *env;
++
++    if (debugObj != NULL) {
++        if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {
++            return; /* Should not happen */
++        }
++#ifndef SYSCONF_NSS
++        closeNSS(env);
++#endif
++        (*env)->DeleteGlobalRef(env, debugObj);
++    }
++}
++
++JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEnabled
++  (JNIEnv *env, jclass cls)
++{
++    int fips_enabled;
++    char msg[MSG_MAX_SIZE];
++    int msg_bytes;
++
++    if (getSystemFIPSEnabled != NULL) {
++      dbgPrint(env, "getSystemFIPSEnabled: calling SECMOD_GetSystemFIPSEnabled");
++      fips_enabled = (*getSystemFIPSEnabled)();
++      msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:"   \
++                           " SECMOD_GetSystemFIPSEnabled returned 0x%x", fips_enabled);
++      handle_msg(env, msg, msg_bytes);
++      return (fips_enabled == 1 ? JNI_TRUE : JNI_FALSE);
++    } else {
++      FILE *fe;
++
++      dbgPrint(env, "getSystemFIPSEnabled: reading " FIPS_ENABLED_PATH);
++      if ((fe = fopen(FIPS_ENABLED_PATH, "r")) == NULL) {
++        throwIOException(env, "Cannot open " FIPS_ENABLED_PATH);
++        return JNI_FALSE;
++      }
++      fips_enabled = fgetc(fe);
++      fclose(fe);
++      if (fips_enabled == EOF) {
++        throwIOException(env, "Cannot read " FIPS_ENABLED_PATH);
++        return JNI_FALSE;
++      }
++      msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:"   \
++                           " read character is '%c'", fips_enabled);
++      handle_msg(env, msg, msg_bytes);
++      return (fips_enabled == '1' ? JNI_TRUE : JNI_FALSE);
++    }
++}
++
++#else // !LINUX
++
++JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEnabled
++  (JNIEnv *env, jclass cls)
++{
++    return JNI_FALSE;
++}
++
++#endif
+diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
+new file mode 100644
+index 00000000000..48d6d656a28
+--- /dev/null
++++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
+@@ -0,0 +1,457 @@
++/*
++ * 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.security.interfaces.RSAPrivateCrtKey;
++import java.security.interfaces.RSAPrivateKey;
++import java.util.HashMap;
++import java.util.Map;
++import java.util.concurrent.locks.ReentrantLock;
++
++import javax.crypto.Cipher;
++import javax.crypto.SecretKeyFactory;
++import javax.crypto.spec.SecretKeySpec;
++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.RV.*;
++import sun.security.pkcs11.wrapper.PKCS11Exception;
++import sun.security.rsa.RSAPrivateCrtKeyImpl;
++import sun.security.rsa.RSAUtil;
++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 volatile P11Key importerKey = null;
++    private static SecretKeySpec exporterKey = null;
++    private static volatile P11Key exporterKeyP11 = null;
++    private static final ReentrantLock importerKeyLock = new ReentrantLock();
++    // Do not take the exporterKeyLock with the importerKeyLock held.
++    private static final ReentrantLock exporterKeyLock = new ReentrantLock();
++    private static volatile CK_MECHANISM importerKeyMechanism = null;
++    private static volatile CK_MECHANISM exporterKeyMechanism = null;
++    private static Cipher importerCipher = null;
++    private static Cipher exporterCipher = null;
++
++    private static volatile Provider sunECProvider = null;
++    private static final ReentrantLock sunECProviderLock = 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,
++                                " fips key importer");
++                    }
++                    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 (debug != null) {
++                        debug.println("Unrecognized private key type.");
++                    }
++                    throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                            " fips key importer");
++                }
++            } 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,
++                        " fips key importer");
++            }
++            attributes = new CK_ATTRIBUTE[attrsMap.size()];
++            attrsMap.values().toArray(attributes);
++            importerKeyLock.lock();
++            try {
++                // No need to reset the cipher object because no multi-part
++                // operations are performed.
++                encKeyBytes = importerCipher.doFinal(keyBytes);
++            } finally {
++                importerKeyLock.unlock();
++            }
++            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) {
++            if (t instanceof PKCS11Exception) {
++                throw (PKCS11Exception)t;
++            }
++            throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                    t.getMessage());
++        } finally {
++            importerKey.releaseKeyID();
++        }
++        return Long.valueOf(keyID);
++    }
++
++    static void exportKey(SunPKCS11 sunPKCS11, long hSession, long hObject,
++            long keyClass, long keyType, Map<Long, CK_ATTRIBUTE> sensitiveAttrs)
++            throws PKCS11Exception {
++        Token token = sunPKCS11.getToken();
++        if (debug != null) {
++            debug.println("Private or Secret key will be exported in" +
++                    " system FIPS mode.");
++        }
++        if (exporterKeyP11 == null) {
++            try {
++                exporterKeyLock.lock();
++                if (exporterKeyP11 == null) {
++                    if (exporterKeyMechanism == null) {
++                        // Exporter Key creation has not been tried yet. Try it.
++                        createExporterKey(token);
++                    }
++                    if (exporterKeyP11 == null || exporterCipher == null) {
++                        if (debug != null) {
++                            debug.println("Exporter Key could not be" +
++                                    " generated.");
++                        }
++                        throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                                " fips key exporter");
++                    }
++                    if (debug != null) {
++                        debug.println("Exporter Key successfully" +
++                                " generated.");
++                    }
++                }
++            } finally {
++                exporterKeyLock.unlock();
++            }
++        }
++        long exporterKeyID = exporterKeyP11.getKeyID();
++        try {
++            byte[] wrappedKeyBytes = token.p11.C_WrapKey(hSession,
++                    exporterKeyMechanism, exporterKeyID, hObject);
++            byte[] plainExportedKey = null;
++            exporterKeyLock.lock();
++            try {
++                // No need to reset the cipher object because no multi-part
++                // operations are performed.
++                plainExportedKey = exporterCipher.doFinal(wrappedKeyBytes);
++            } finally {
++                exporterKeyLock.unlock();
++            }
++            if (keyClass == CKO_PRIVATE_KEY) {
++                exportPrivateKey(sensitiveAttrs, keyType, plainExportedKey);
++            } else if (keyClass == CKO_SECRET_KEY) {
++                checkAttrs(sensitiveAttrs, "CKO_SECRET_KEY", CKA_VALUE);
++                // CKA_VALUE is guaranteed to be present, since sensitiveAttrs'
++                // size is greater than 0 and no invalid attributes exist
++                sensitiveAttrs.get(CKA_VALUE).pValue = plainExportedKey;
++            } else {
++                throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                        " fips key exporter");
++            }
++        } catch (Throwable t) {
++            if (t instanceof PKCS11Exception) {
++                throw (PKCS11Exception)t;
++            }
++            throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                    t.getMessage());
++        } finally {
++            exporterKeyP11.releaseKeyID();
++        }
++    }
++
++    private static void exportPrivateKey(
++            Map<Long, CK_ATTRIBUTE> sensitiveAttrs, long keyType,
++            byte[] plainExportedKey) throws Throwable {
++        if (keyType == CKK_RSA) {
++            checkAttrs(sensitiveAttrs, "CKO_PRIVATE_KEY CKK_RSA",
++                    CKA_PRIVATE_EXPONENT, CKA_PRIME_1, CKA_PRIME_2,
++                    CKA_EXPONENT_1, CKA_EXPONENT_2, CKA_COEFFICIENT);
++            RSAPrivateKey rsaPKey = RSAPrivateCrtKeyImpl.newKey(
++                    RSAUtil.KeyType.RSA, "PKCS#8", plainExportedKey);
++            CK_ATTRIBUTE attr;
++            if ((attr = sensitiveAttrs.get(CKA_PRIVATE_EXPONENT)) != null) {
++                attr.pValue = rsaPKey.getPrivateExponent().toByteArray();
++            }
++            if (rsaPKey instanceof RSAPrivateCrtKey) {
++                RSAPrivateCrtKey rsaPCrtKey = (RSAPrivateCrtKey) rsaPKey;
++                if ((attr = sensitiveAttrs.get(CKA_PRIME_1)) != null) {
++                    attr.pValue = rsaPCrtKey.getPrimeP().toByteArray();
++                }
++                if ((attr = sensitiveAttrs.get(CKA_PRIME_2)) != null) {
++                    attr.pValue = rsaPCrtKey.getPrimeQ().toByteArray();
++                }
++                if ((attr = sensitiveAttrs.get(CKA_EXPONENT_1)) != null) {
++                    attr.pValue = rsaPCrtKey.getPrimeExponentP().toByteArray();
++                }
++                if ((attr = sensitiveAttrs.get(CKA_EXPONENT_2)) != null) {
++                    attr.pValue = rsaPCrtKey.getPrimeExponentQ().toByteArray();
++                }
++                if ((attr = sensitiveAttrs.get(CKA_COEFFICIENT)) != null) {
++                    attr.pValue = rsaPCrtKey.getCrtCoefficient().toByteArray();
++                }
++            } else {
++                checkAttrs(sensitiveAttrs, "CKO_PRIVATE_KEY CKK_RSA",
++                        CKA_PRIVATE_EXPONENT);
++            }
++        } else if (keyType == CKK_DSA) {
++            checkAttrs(sensitiveAttrs, "CKO_PRIVATE_KEY CKK_DSA", CKA_VALUE);
++            // CKA_VALUE is guaranteed to be present, since sensitiveAttrs'
++            // size is greater than 0 and no invalid attributes exist
++            sensitiveAttrs.get(CKA_VALUE).pValue =
++                    new sun.security.provider.DSAPrivateKey(plainExportedKey)
++                            .getX().toByteArray();
++        } else if (keyType == CKK_EC) {
++            checkAttrs(sensitiveAttrs, "CKO_PRIVATE_KEY CKK_EC", CKA_VALUE);
++            // CKA_VALUE is guaranteed to be present, since sensitiveAttrs'
++            // size is greater than 0 and no invalid attributes exist
++            sensitiveAttrs.get(CKA_VALUE).pValue =
++                    ECUtil.decodePKCS8ECPrivateKey(plainExportedKey)
++                            .getS().toByteArray();
++        } else {
++            throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                    " unsupported CKO_PRIVATE_KEY key type: " + keyType);
++        }
++    }
++
++    private static void checkAttrs(Map<Long, CK_ATTRIBUTE> sensitiveAttrs,
++                                     String keyName, long... validAttrs)
++            throws PKCS11Exception {
++        int sensitiveAttrsCount = sensitiveAttrs.size();
++        if (sensitiveAttrsCount <= validAttrs.length) {
++            int validAttrsCount = 0;
++            for (long validAttr : validAttrs) {
++                if (sensitiveAttrs.containsKey(validAttr)) validAttrsCount++;
++            }
++            if (validAttrsCount == sensitiveAttrsCount) return;
++        }
++        throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                " invalid attribute types for a " + keyName + " key object");
++    }
++
++    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");
++                importerCipher.init(Cipher.ENCRYPT_MODE, importerKey,
++                        new IvParameterSpec(
++                                (byte[])importerKeyMechanism.pParameter), null);
++            }
++        } 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.
++            if (debug != null) {
++                debug.println("Error generating the Importer Key");
++            }
++        }
++    }
++
++    private static void createExporterKey(Token token) {
++        if (debug != null) {
++            debug.println("Generating Exporter Key...");
++        }
++        byte[] iv = new byte[16];
++        JCAUtil.getSecureRandom().nextBytes(iv);
++        exporterKeyMechanism = new CK_MECHANISM(CKM_AES_CBC_PAD, iv);
++        byte[] exporterKeyRaw = new byte[32];
++        JCAUtil.getSecureRandom().nextBytes(exporterKeyRaw);
++        exporterKey = new SecretKeySpec(exporterKeyRaw, "AES");
++        try {
++            SecretKeyFactory skf = SecretKeyFactory.getInstance("AES");
++            exporterKeyP11 = (P11Key)(skf.translateKey(exporterKey));
++            if (exporterKeyP11 != null) {
++                exporterCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
++                exporterCipher.init(Cipher.DECRYPT_MODE, exporterKey,
++                        new IvParameterSpec(
++                                (byte[])exporterKeyMechanism.pParameter), null);
++            }
++        } catch (Throwable t) {
++            // best effort
++            exporterKey = null;
++            exporterKeyP11 = null;
++            exporterCipher = null;
++            // exporterKeyMechanism value is kept initialized to indicate that
++            // Exporter Key creation has been tried and failed.
++            if (debug != null) {
++                debug.println("Error generating the Exporter Key");
++            }
++        }
++    }
++}
+diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSTokenLoginHandler.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSTokenLoginHandler.java
+new file mode 100644
+index 00000000000..f8d505ca815
+--- /dev/null
++++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSTokenLoginHandler.java
+@@ -0,0 +1,149 @@
++/*
++ * Copyright (c) 2022, 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.io.BufferedReader;
++import java.io.ByteArrayInputStream;
++import java.io.InputStream;
++import java.io.InputStreamReader;
++import java.io.IOException;
++import java.nio.charset.StandardCharsets;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.nio.file.StandardOpenOption;
++import java.security.ProviderException;
++
++import javax.security.auth.callback.Callback;
++import javax.security.auth.callback.CallbackHandler;
++import javax.security.auth.callback.PasswordCallback;
++import javax.security.auth.callback.UnsupportedCallbackException;
++
++import sun.security.util.Debug;
++import sun.security.util.SecurityProperties;
++
++final class FIPSTokenLoginHandler implements CallbackHandler {
++
++    private static final String FIPS_NSSDB_PIN_PROP = "fips.nssdb.pin";
++
++    private static final Debug debug = Debug.getInstance("sunpkcs11");
++
++    public void handle(Callback[] callbacks)
++            throws IOException, UnsupportedCallbackException {
++        if (!(callbacks[0] instanceof PasswordCallback)) {
++            throw new UnsupportedCallbackException(callbacks[0]);
++        }
++        PasswordCallback pc = (PasswordCallback)callbacks[0];
++        pc.setPassword(getFipsNssdbPin());
++    }
++
++    private static char[] getFipsNssdbPin() throws ProviderException {
++        if (debug != null) {
++            debug.println("FIPS: Reading NSS DB PIN for token...");
++        }
++        String pinProp = SecurityProperties
++                .privilegedGetOverridable(FIPS_NSSDB_PIN_PROP);
++        if (pinProp != null && !pinProp.isEmpty()) {
++            String[] pinPropParts = pinProp.split(":", 2);
++            if (pinPropParts.length < 2) {
++                throw new ProviderException("Invalid " + FIPS_NSSDB_PIN_PROP +
++                        " property value.");
++            }
++            String prefix = pinPropParts[0].toLowerCase();
++            String value = pinPropParts[1];
++            String pin = null;
++            if (prefix.equals("env")) {
++                if (debug != null) {
++                    debug.println("FIPS: PIN value from the '" + value +
++                            "' environment variable.");
++                }
++                pin = System.getenv(value);
++            } else if (prefix.equals("file")) {
++                if (debug != null) {
++                    debug.println("FIPS: PIN value from the '" + value +
++                            "' file.");
++                }
++                pin = getPinFromFile(Paths.get(value));
++            } else if (prefix.equals("pin")) {
++                if (debug != null) {
++                    debug.println("FIPS: PIN value from the " +
++                            FIPS_NSSDB_PIN_PROP + " property.");
++                }
++                pin = value;
++            } else {
++                throw new ProviderException("Unsupported prefix for " +
++                        FIPS_NSSDB_PIN_PROP + ".");
++            }
++            if (pin != null && !pin.isEmpty()) {
++                if (debug != null) {
++                    debug.println("FIPS: non-empty PIN.");
++                }
++                /*
++                 * C_Login in libj2pkcs11 receives the PIN in a char[] and
++                 * discards the upper byte of each char, before passing
++                 * the value to the NSS Software Token. However, the
++                 * NSS Software Token accepts any UTF-8 PIN value. Thus,
++                 * expand the PIN here to account for later truncation.
++                 */
++                byte[] pinUtf8 = pin.getBytes(StandardCharsets.UTF_8);
++                char[] pinChar = new char[pinUtf8.length];
++                for (int i = 0; i < pinChar.length; i++) {
++                    pinChar[i] = (char)(pinUtf8[i] & 0xFF);
++                }
++                return pinChar;
++            }
++        }
++        if (debug != null) {
++            debug.println("FIPS: empty PIN.");
++        }
++        return null;
++    }
++
++    /*
++     * This method extracts the token PIN from the first line of a password
++     * file in the same way as NSS modutil. See for example the -newpwfile
++     * argument used to change the password for an NSS DB.
++     */
++    private static String getPinFromFile(Path f) throws ProviderException {
++        try (InputStream is =
++                Files.newInputStream(f, StandardOpenOption.READ)) {
++            /*
++             * SECU_FilePasswd in NSS (nss/cmd/lib/secutil.c), used by modutil,
++             * reads up to 4096 bytes. In addition, the NSS Software Token
++             * does not accept PINs longer than 500 bytes (see SFTK_MAX_PIN
++             * in nss/lib/softoken/pkcs11i.h).
++             */
++            BufferedReader in =
++                    new BufferedReader(new InputStreamReader(
++                            new ByteArrayInputStream(is.readNBytes(4096)),
++                            StandardCharsets.UTF_8));
++            return in.readLine();
++        } catch (IOException ioe) {
++            throw new ProviderException("Error reading " + FIPS_NSSDB_PIN_PROP +
++                    " from the '" + f + "' file.", ioe);
++        }
++    }
++}
+\ No newline at end of file
+diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
+index a76b37dd4c8..94673b51708 100644
+--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
++++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
+@@ -37,6 +37,8 @@ import javax.crypto.*;
+ import javax.crypto.interfaces.*;
+ import javax.crypto.spec.*;
+ 
++import jdk.internal.access.SharedSecrets;
++
+ import sun.security.rsa.RSAUtil.KeyType;
+ import sun.security.rsa.RSAPublicKeyImpl;
+ import sun.security.rsa.RSAPrivateCrtKeyImpl;
+@@ -72,6 +74,9 @@ abstract class P11Key implements Key, Length {
+     @Serial
+     private static final long serialVersionUID = -2575874101938349339L;
+ 
++    private static final boolean plainKeySupportEnabled = SharedSecrets
++            .getJavaSecuritySystemConfiguratorAccess().isPlainKeySupportEnabled();
++
+     private static final String PUBLIC = "public";
+     private static final String PRIVATE = "private";
+     private static final String SECRET = "secret";
+@@ -414,9 +419,10 @@ abstract class P11Key implements Key, Length {
+                     new CK_ATTRIBUTE(CKA_EXTRACTABLE),
+         });
+ 
+-        boolean keySensitive =
+-                (attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
+-                attrs[1].getBoolean() || !attrs[2].getBoolean();
++        boolean exportable = plainKeySupportEnabled && !algorithm.equals("DH");
++        boolean keySensitive = (!exportable &&
++               ((attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
++                attrs[1].getBoolean() || !attrs[2].getBoolean()));
+ 
+         return switch (algorithm) {
+             case "RSA" -> P11RSAPrivateKeyInternal.of(session, keyID, algorithm,
+@@ -468,7 +474,8 @@ abstract class P11Key implements Key, Length {
+ 
+         public String getFormat() {
+             token.ensureValid();
+-            if (sensitive || !extractable || (isNSS && tokenObject)) {
++            if (!plainKeySupportEnabled &&
++                (sensitive || !extractable || (isNSS && tokenObject))) {
+                 return null;
+             } else {
+                 return "RAW";
+@@ -1664,4 +1671,3 @@ final class SessionKeyRef extends PhantomReference<P11Key> {
+         this.clear();
+     }
+ }
+-
+diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+index aaafc373f80..6466581f4ae 100644
+--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
++++ b/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.util.stream.Collectors;
+ import java.security.*;
+@@ -42,10 +45,12 @@ 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;
+ import static sun.security.util.SecurityConstants.PROVIDER_VER;
++import sun.security.util.SecurityProperties;
+ import static sun.security.util.SecurityProviderConstants.getAliases;
+ 
+ import sun.security.pkcs11.Secmod.*;
+@@ -65,6 +70,39 @@ public final class SunPKCS11 extends AuthProvider {
+     @Serial
+     private static final long serialVersionUID = -1354835039035306505L;
+ 
++    private static final boolean systemFipsEnabled = SharedSecrets
++            .getJavaSecuritySystemConfiguratorAccess().isSystemFipsEnabled();
++
++    private static final boolean plainKeySupportEnabled = SharedSecrets
++            .getJavaSecuritySystemConfiguratorAccess().isPlainKeySupportEnabled();
++
++    private static final MethodHandle fipsImportKey;
++    private static final MethodHandle fipsExportKey;
++    static {
++        MethodHandle fipsImportKeyTmp = null;
++        MethodHandle fipsExportKeyTmp = null;
++        if (plainKeySupportEnabled) {
++            try {
++                fipsImportKeyTmp = MethodHandles.lookup().findStatic(
++                        FIPSKeyImporter.class, "importKey",
++                        MethodType.methodType(Long.class, SunPKCS11.class,
++                        long.class, CK_ATTRIBUTE[].class));
++                fipsExportKeyTmp = MethodHandles.lookup().findStatic(
++                        FIPSKeyImporter.class, "exportKey",
++                        MethodType.methodType(void.class, SunPKCS11.class,
++                        long.class, long.class,
++                        long.class, long.class, Map.class));
++            } catch (Throwable t) {
++                throw new SecurityException("FIPS key importer-exporter" +
++                        " initialization failed", t);
++            }
++        }
++        fipsImportKey = fipsImportKeyTmp;
++        fipsExportKey = fipsExportKeyTmp;
++    }
++
++    private static final String FIPS_NSSDB_PATH_PROP = "fips.nssdb.path";
++
+     static final Debug debug = Debug.getInstance("sunpkcs11");
+     // the PKCS11 object through which we make the native calls
+     @SuppressWarnings("serial") // Type of field is not Serializable;
+@@ -123,6 +161,29 @@ public final class SunPKCS11 extends AuthProvider {
+             return AccessController.doPrivileged(new PrivilegedExceptionAction<>() {
+                 @Override
+                 public SunPKCS11 run() throws Exception {
++                    if (systemFipsEnabled) {
++                        /*
++                         * The nssSecmodDirectory attribute in the SunPKCS11
++                         * NSS configuration file takes the value of the
++                         * fips.nssdb.path System property after expansion.
++                         * Security properties expansion is unsupported.
++                         */
++                        String nssdbPath =
++                                SecurityProperties.privilegedGetOverridable(
++                                        FIPS_NSSDB_PATH_PROP);
++                        if (System.getSecurityManager() != null) {
++                            AccessController.doPrivileged(
++                                    (PrivilegedAction<Void>) () -> {
++                                        System.setProperty(
++                                                FIPS_NSSDB_PATH_PROP,
++                                                nssdbPath);
++                                        return null;
++                                    });
++                        } else {
++                            System.setProperty(
++                                    FIPS_NSSDB_PATH_PROP, nssdbPath);
++                        }
++                    }
+                     return new SunPKCS11(new Config(newConfigName));
+                 }
+             });
+@@ -325,9 +386,19 @@ public final class SunPKCS11 extends AuthProvider {
+             // request multithreaded access first
+             initArgs.flags = CKF_OS_LOCKING_OK;
+             PKCS11 tmpPKCS11;
++            MethodHandle fipsKeyImporter = null;
++            MethodHandle fipsKeyExporter = null;
++            if (plainKeySupportEnabled) {
++                fipsKeyImporter = MethodHandles.insertArguments(
++                        fipsImportKey, 0, this);
++                fipsKeyExporter = MethodHandles.insertArguments(
++                        fipsExportKey, 0, this);
++            }
+             try {
+-                tmpPKCS11 = PKCS11.getInstance(library, functionList, initArgs,
+-                    config.getOmitInitialize());
++                tmpPKCS11 = PKCS11.getInstance(
++                    library, functionList, initArgs,
++                    config.getOmitInitialize(), fipsKeyImporter,
++                    fipsKeyExporter);
+             } catch (PKCS11Exception e) {
+                 if (debug != null) {
+                     debug.println("Multi-threaded initialization failed: " + e);
+@@ -342,8 +413,9 @@ public final class SunPKCS11 extends AuthProvider {
+                 } else {
+                     initArgs.flags = 0;
+                 }
+-                tmpPKCS11 = PKCS11.getInstance(library, functionList, initArgs,
+-                    config.getOmitInitialize());
++                tmpPKCS11 = PKCS11.getInstance(library,
++                    functionList, initArgs, config.getOmitInitialize(), fipsKeyImporter,
++                    fipsKeyExporter);
+             }
+             p11 = tmpPKCS11;
+ 
+@@ -1390,11 +1462,52 @@ public final class SunPKCS11 extends AuthProvider {
+         }
+ 
+         @Override
++        @SuppressWarnings("removal")
+         public Object newInstance(Object param)
+                 throws NoSuchAlgorithmException {
+             if (!token.isValid()) {
+                 throw new NoSuchAlgorithmException("Token has been removed");
+             }
++            if (systemFipsEnabled && !token.fipsLoggedIn &&
++                    !getType().equals("KeyStore")) {
++                /*
++                 * The NSS Software Token in FIPS 140-2 mode requires a
++                 * user login for most operations. See sftk_fipsCheck
++                 * (nss/lib/softoken/fipstokn.c). In case of a KeyStore
++                 * service, let the caller perform the login with
++                 * KeyStore::load. Keytool, for example, does this to pass a
++                 * PIN from either the -srcstorepass or -deststorepass
++                 * argument. In case of a non-KeyStore service, perform the
++                 * login now with the PIN available in the fips.nssdb.pin
++                 * property.
++                 */
++                try {
++                    if (System.getSecurityManager() != null) {
++                        try {
++                            AccessController.doPrivileged(
++                                    (PrivilegedExceptionAction<Void>) () -> {
++                                        token.ensureLoggedIn(null);
++                                        return null;
++                                    });
++                        } catch (PrivilegedActionException pae) {
++                            Exception e = pae.getException();
++                            if (e instanceof LoginException le) {
++                                throw le;
++                            } else if (e instanceof PKCS11Exception p11e) {
++                                throw p11e;
++                            } else {
++                                throw new RuntimeException(e);
++                            }
++                        }
++                    } else {
++                        token.ensureLoggedIn(null);
++                    }
++                } catch (PKCS11Exception | LoginException e) {
++                    throw new ProviderException("FIPS: error during the Token" +
++                            " login required for the " + getType() +
++                            " service.", e);
++                }
++            }
+             try {
+                 return newInstance0(param);
+             } catch (PKCS11Exception e) {
+@@ -1753,6 +1866,9 @@ public final class SunPKCS11 extends AuthProvider {
+         try {
+             session = token.getOpSession();
+             p11.C_Logout(session.id());
++            if (systemFipsEnabled) {
++                token.fipsLoggedIn = false;
++            }
+             if (debug != null) {
+                 debug.println("logout succeeded");
+             }
+diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
+index a6f5f0a8764..9a07c96ca4e 100644
+--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
++++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
+@@ -33,6 +33,7 @@ import java.lang.ref.*;
+ import java.security.*;
+ import javax.security.auth.login.LoginException;
+ 
++import jdk.internal.access.SharedSecrets;
+ import sun.security.jca.JCAUtil;
+ 
+ import sun.security.pkcs11.wrapper.*;
+@@ -48,6 +49,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Exception.RV.*;
+  */
+ final class Token implements Serializable {
+ 
++    private static final boolean systemFipsEnabled = SharedSecrets
++            .getJavaSecuritySystemConfiguratorAccess().isSystemFipsEnabled();
++
+     // need to be serializable to allow SecureRandom to be serialized
+     @Serial
+     private static final long serialVersionUID = 2541527649100571747L;
+@@ -125,6 +129,10 @@ final class Token implements Serializable {
+     // flag indicating whether we are logged in
+     private volatile boolean loggedIn;
+ 
++    // Flag indicating the login status for the NSS Software Token in FIPS mode.
++    // This Token is never asynchronously removed. Used from SunPKCS11.
++    volatile boolean fipsLoggedIn;
++
+     // time we last checked login status
+     private long lastLoginCheck;
+ 
+@@ -242,7 +250,12 @@ final class Token implements Serializable {
+     // call provider.login() if not
+     void ensureLoggedIn(Session session) throws PKCS11Exception, LoginException {
+         if (!isLoggedIn(session)) {
+-            provider.login(null, null);
++            if (systemFipsEnabled) {
++                provider.login(null, new FIPSTokenLoginHandler());
++                fipsLoggedIn = true;
++            } else {
++                provider.login(null, null);
++            }
+         }
+     }
+ 
+diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
+index 0fd13fd6fa6..3c959c942a1 100644
+--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
++++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
+@@ -49,6 +49,9 @@ package sun.security.pkcs11.wrapper;
+ 
+ import java.io.File;
+ import java.io.IOException;
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodHandles;
++import java.lang.invoke.MethodType;
+ import java.util.*;
+ 
+ import java.security.AccessController;
+@@ -174,18 +177,43 @@ public class PKCS11 {
+         return version;
+     }
+ 
++    /*
++     * Compatibility wrapper to allow this method to work as before
++     * when FIPS mode support is not active.
++     */
++    public static synchronized PKCS11 getInstance(String pkcs11ModulePath,
++           String functionList, CK_C_INITIALIZE_ARGS pInitArgs,
++           boolean omitInitialize) throws IOException, PKCS11Exception {
++        return getInstance(pkcs11ModulePath, functionList,
++                           pInitArgs, omitInitialize, null, null);
++    }
++
+     public static synchronized PKCS11 getInstance(String pkcs11ModulePath,
+             String functionList, CK_C_INITIALIZE_ARGS pInitArgs,
+-            boolean omitInitialize) throws IOException, PKCS11Exception {
++            boolean omitInitialize, MethodHandle fipsKeyImporter,
++            MethodHandle fipsKeyExporter)
++                    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 &&
++                    fipsKeyExporter != null;
+             if ((pInitArgs != null)
+                     && ((pInitArgs.flags & CKF_OS_LOCKING_OK) != 0)) {
+-                pkcs11 = new PKCS11(pkcs11ModulePath, functionList);
++                if (nssFipsMode) {
++                    pkcs11 = new FIPSPKCS11(pkcs11ModulePath, functionList,
++                            fipsKeyImporter, fipsKeyExporter);
++                } else {
++                    pkcs11 = new PKCS11(pkcs11ModulePath, functionList);
++                }
+             } else {
+-                pkcs11 = new SynchronizedPKCS11(pkcs11ModulePath, functionList);
++                if (nssFipsMode) {
++                    pkcs11 = new SynchronizedFIPSPKCS11(pkcs11ModulePath,
++                            functionList, fipsKeyImporter, fipsKeyExporter);
++                } else {
++                    pkcs11 = new SynchronizedPKCS11(pkcs11ModulePath, functionList);
++                }
+             }
+             if (omitInitialize == false) {
+                 try {
+@@ -2012,4 +2040,194 @@ 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;
++    private MethodHandle fipsKeyExporter;
++    private MethodHandle hC_GetAttributeValue;
++    FIPSPKCS11(String pkcs11ModulePath, String functionListName,
++            MethodHandle fipsKeyImporter, MethodHandle fipsKeyExporter)
++                    throws IOException {
++        super(pkcs11ModulePath, functionListName);
++        this.fipsKeyImporter = fipsKeyImporter;
++        this.fipsKeyExporter = fipsKeyExporter;
++        try {
++            hC_GetAttributeValue = MethodHandles.insertArguments(
++                    MethodHandles.lookup().findSpecial(PKCS11.class,
++                            "C_GetAttributeValue", MethodType.methodType(
++                                    void.class, long.class, long.class,
++                                    CK_ATTRIBUTE[].class),
++                            FIPSPKCS11.class), 0, this);
++        } catch (Throwable t) {
++            throw new RuntimeException(
++                    "sun.security.pkcs11.wrapper.PKCS11" +
++                    "::C_GetAttributeValue method not found.", t);
++        }
++    }
++
++    public 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) {
++                if (t instanceof PKCS11Exception) {
++                    throw (PKCS11Exception)t;
++                }
++                throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                        t.getMessage());
++            }
++        }
++        return super.C_CreateObject(hSession, pTemplate);
++    }
++
++    public void C_GetAttributeValue(long hSession, long hObject,
++            CK_ATTRIBUTE[] pTemplate) throws PKCS11Exception {
++        FIPSPKCS11Helper.C_GetAttributeValue(hC_GetAttributeValue,
++                fipsKeyExporter, hSession, hObject, pTemplate);
++    }
++}
++
++// FIPSPKCS11 synchronized counterpart.
++static class SynchronizedFIPSPKCS11 extends SynchronizedPKCS11 {
++    private MethodHandle fipsKeyImporter;
++    private MethodHandle fipsKeyExporter;
++    private MethodHandle hC_GetAttributeValue;
++    SynchronizedFIPSPKCS11(String pkcs11ModulePath, String functionListName,
++            MethodHandle fipsKeyImporter, MethodHandle fipsKeyExporter)
++                    throws IOException {
++        super(pkcs11ModulePath, functionListName);
++        this.fipsKeyImporter = fipsKeyImporter;
++        this.fipsKeyExporter = fipsKeyExporter;
++        try {
++            hC_GetAttributeValue = MethodHandles.insertArguments(
++                    MethodHandles.lookup().findSpecial(SynchronizedPKCS11.class,
++                            "C_GetAttributeValue", MethodType.methodType(
++                                    void.class, long.class, long.class,
++                                    CK_ATTRIBUTE[].class),
++                            SynchronizedFIPSPKCS11.class), 0, this);
++        } catch (Throwable t) {
++            throw new RuntimeException(
++                    "sun.security.pkcs11.wrapper.SynchronizedPKCS11" +
++                    "::C_GetAttributeValue method not found.", t);
++        }
++    }
++
++    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) {
++                if (t instanceof PKCS11Exception) {
++                    throw (PKCS11Exception)t;
++                }
++                throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                        t.getMessage());
++            }
++        }
++        return super.C_CreateObject(hSession, pTemplate);
++    }
++
++    public synchronized void C_GetAttributeValue(long hSession, long hObject,
++            CK_ATTRIBUTE[] pTemplate) throws PKCS11Exception {
++        FIPSPKCS11Helper.C_GetAttributeValue(hC_GetAttributeValue,
++                fipsKeyExporter, hSession, hObject, 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;
++    }
++    static void C_GetAttributeValue(MethodHandle hC_GetAttributeValue,
++            MethodHandle fipsKeyExporter, long hSession, long hObject,
++            CK_ATTRIBUTE[] pTemplate) throws PKCS11Exception {
++        Map<Long, CK_ATTRIBUTE> sensitiveAttrs = new HashMap<>();
++        List<CK_ATTRIBUTE> nonSensitiveAttrs = new LinkedList<>();
++        FIPSPKCS11Helper.getAttributesBySensitivity(pTemplate,
++                sensitiveAttrs, nonSensitiveAttrs);
++        try {
++            if (sensitiveAttrs.size() > 0) {
++                long keyClass = -1L;
++                long keyType = -1L;
++                try {
++                    // Secret and private keys have both class and type
++                    // attributes, so we can query them at once.
++                    CK_ATTRIBUTE[] queryAttrs = new CK_ATTRIBUTE[]{
++                            new CK_ATTRIBUTE(CKA_CLASS),
++                            new CK_ATTRIBUTE(CKA_KEY_TYPE),
++                    };
++                    hC_GetAttributeValue.invoke(hSession, hObject, queryAttrs);
++                    keyClass = queryAttrs[0].getLong();
++                    keyType = queryAttrs[1].getLong();
++                } catch (PKCS11Exception e) {
++                    // If the query fails, the object is neither a secret nor a
++                    // private key. As this case won't be handled with the FIPS
++                    // Key Exporter, we keep keyClass initialized to -1L.
++                }
++                if (keyClass == CKO_SECRET_KEY || keyClass == CKO_PRIVATE_KEY) {
++                    fipsKeyExporter.invoke(hSession, hObject, keyClass, keyType,
++                            sensitiveAttrs);
++                    if (nonSensitiveAttrs.size() > 0) {
++                        CK_ATTRIBUTE[] pNonSensitiveAttrs =
++                                new CK_ATTRIBUTE[nonSensitiveAttrs.size()];
++                        int i = 0;
++                        for (CK_ATTRIBUTE nonSensAttr : nonSensitiveAttrs) {
++                            pNonSensitiveAttrs[i++] = nonSensAttr;
++                        }
++                        hC_GetAttributeValue.invoke(hSession, hObject,
++                                pNonSensitiveAttrs);
++                        // libj2pkcs11 allocates new CK_ATTRIBUTE objects, so we
++                        // update the reference on the previous CK_ATTRIBUTEs
++                        i = 0;
++                        for (CK_ATTRIBUTE nonSensAttr : nonSensitiveAttrs) {
++                            nonSensAttr.pValue = pNonSensitiveAttrs[i++].pValue;
++                        }
++                    }
++                    return;
++                }
++            }
++            hC_GetAttributeValue.invoke(hSession, hObject, pTemplate);
++        } catch (Throwable t) {
++            if (t instanceof PKCS11Exception) {
++                throw (PKCS11Exception)t;
++            }
++            throw new PKCS11Exception(CKR_GENERAL_ERROR,
++                    t.getMessage());
++        }
++    }
++    private static void getAttributesBySensitivity(CK_ATTRIBUTE[] pTemplate,
++            Map<Long, CK_ATTRIBUTE> sensitiveAttrs,
++            List<CK_ATTRIBUTE> nonSensitiveAttrs) {
++        for (CK_ATTRIBUTE attr : pTemplate) {
++            long type = attr.type;
++            // Aligned with NSS' sftk_isSensitive in lib/softoken/pkcs11u.c
++            if (type == CKA_VALUE || type == CKA_PRIVATE_EXPONENT ||
++                    type == CKA_PRIME_1 || type == CKA_PRIME_2 ||
++                    type == CKA_EXPONENT_1 || type == CKA_EXPONENT_2 ||
++                    type == CKA_COEFFICIENT) {
++                sensitiveAttrs.put(type, attr);
++            } else {
++                nonSensitiveAttrs.add(attr);
++            }
++        }
++    }
++}
+ }
+diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
+index 920422376f8..6aa308fa5f8 100644
+--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
++++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
+@@ -215,6 +215,14 @@ public class PKCS11Exception extends Exception {
+         return res;
+     }
+ 
++    /**
++     * Constructor taking the error code from the RV enum and
++     * extra info for error message.
++     */
++    public PKCS11Exception(RV errorEnum, String extraInfo) {
++        this(errorEnum.value, extraInfo);
++    }
++
+     /**
+      * Constructor taking the error code (the CKR_* constants in PKCS#11) and
+      * extra info for error message.
+diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+index 7f8c4dba002..e65b11fc3ee 100644
+--- a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
++++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+@@ -34,6 +34,7 @@ import java.security.ProviderException;
+ import java.util.HashMap;
+ import java.util.List;
+ 
++import jdk.internal.access.SharedSecrets;
+ import sun.security.ec.ed.EdDSAKeyFactory;
+ import sun.security.ec.ed.EdDSAKeyPairGenerator;
+ import sun.security.ec.ed.EdDSASignature;
+@@ -50,6 +51,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) {
+@@ -240,83 +245,85 @@ 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 ProviderServiceA(this, "KeyPairGenerator",
+-            "EC", "sun.security.ec.ECKeyPairGenerator", 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 ProviderServiceA(this, "KeyPairGenerator",
++                "EC", "sun.security.ec.ECKeyPairGenerator", ATTRS));
++
++            /*
++             * Key Agreement engine
++             */
++            putService(new ProviderService(this, "KeyAgreement",
++                "ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
++        }
+     }
+ 
+     private void putXDHEntries() {
+@@ -333,23 +340,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() {
+@@ -364,21 +373,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));
++        }
+ 
+     }
+ }
+diff --git a/test/jdk/sun/security/pkcs11/fips/NssdbPin.java b/test/jdk/sun/security/pkcs11/fips/NssdbPin.java
+new file mode 100644
+index 00000000000..ce01c655eb8
+--- /dev/null
++++ b/test/jdk/sun/security/pkcs11/fips/NssdbPin.java
+@@ -0,0 +1,349 @@
++/*
++ * Copyright (c) 2022, 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.
++ */
++
++import java.lang.reflect.Method;
++import java.nio.charset.StandardCharsets;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.security.KeyStore;
++import java.security.Provider;
++import java.security.Security;
++import java.util.Arrays;
++import java.util.function.Consumer;
++import java.util.List;
++import javax.crypto.Cipher;
++import javax.crypto.spec.SecretKeySpec;
++
++import jdk.test.lib.process.Proc;
++import jdk.test.lib.util.FileUtils;
++
++/*
++ * @test
++ * @bug 9999999
++ * @summary
++ *   Test that the fips.nssdb.path and fips.nssdb.pin properties can be used
++ *   for a successful login into an NSS DB. Some additional unitary testing
++ *   is then performed. This test depends on NSS modutil and must be run in
++ *   FIPS mode (the SunPKCS11-NSS-FIPS security provider has to be available).
++ * @modules jdk.crypto.cryptoki/sun.security.pkcs11:+open
++ * @library /test/lib
++ * @requires (jdk.version.major >= 8)
++ * @run main/othervm/timeout=600 NssdbPin
++ * @author Martin Balao (mbalao@redhat.com)
++ */
++
++public final class NssdbPin {
++
++    // Public properties and names
++    private static final String FIPS_NSSDB_PATH_PROP = "fips.nssdb.path";
++    private static final String FIPS_NSSDB_PIN_PROP = "fips.nssdb.pin";
++    private static final String FIPS_PROVIDER_NAME = "SunPKCS11-NSS-FIPS";
++    private static final String NSSDB_TOKEN_NAME =
++            "NSS FIPS 140-2 Certificate DB";
++
++    // Data to be tested
++    private static final String[] PINS_TO_TEST =
++            new String[] {
++                    "",
++                    "1234567890abcdef1234567890ABCDEF\uA4F7"
++            };
++    private static enum PropType { SYSTEM, SECURITY }
++    private static enum LoginType { IMPLICIT, EXPLICIT }
++
++    // Internal test fields
++    private static final boolean DEBUG = true;
++    private static class TestContext {
++        String pin;
++        PropType propType;
++        Path workspace;
++        String nssdbPath;
++        Path nssdbPinFile;
++        LoginType loginType;
++        TestContext(String pin, Path workspace) {
++            this.pin = pin;
++            this.workspace = workspace;
++            this.nssdbPath = "sql:" + workspace;
++            this.loginType = LoginType.IMPLICIT;
++        }
++    }
++
++    public static void main(String[] args) throws Throwable {
++        if (args.length == 3) {
++            // Executed by a child process.
++            mainChild(args[0], args[1], LoginType.valueOf(args[2]));
++        } else if (args.length == 0) {
++            // Executed by the parent process.
++            mainLauncher();
++            // Test defaults
++            mainChild("sql:/etc/pki/nssdb", "", LoginType.IMPLICIT);
++            System.out.println("TEST PASS - OK");
++        } else {
++            throw new Exception("Unexpected number of arguments.");
++        }
++    }
++
++    private static void mainChild(String expectedPath, String expectedPin,
++            LoginType loginType) throws Throwable {
++        if (DEBUG) {
++            for (String prop : Arrays.asList(FIPS_NSSDB_PATH_PROP,
++                    FIPS_NSSDB_PIN_PROP)) {
++                System.out.println(prop + " (System): " +
++                        System.getProperty(prop));
++                System.out.println(prop + " (Security): " +
++                        Security.getProperty(prop));
++            }
++        }
++
++        /*
++         * Functional cross-test against an NSS DB generated by modutil
++         * with the same PIN. Check that we can perform a crypto operation
++         * that requires a login. The login might be explicit or implicit.
++         */
++        Provider p = Security.getProvider(FIPS_PROVIDER_NAME);
++        if (DEBUG) {
++            System.out.println(FIPS_PROVIDER_NAME + ": " + p);
++        }
++        if (p == null) {
++            throw new Exception(FIPS_PROVIDER_NAME + " initialization failed.");
++        }
++        if (DEBUG) {
++            System.out.println("Login type: " + loginType);
++        }
++        if (loginType == LoginType.EXPLICIT) {
++            // Do the expansion to account for truncation, so C_Login in
++            // the NSS Software Token gets a UTF-8 encoded PIN.
++            byte[] pinUtf8 = expectedPin.getBytes(StandardCharsets.UTF_8);
++            char[] pinChar = new char[pinUtf8.length];
++            for (int i = 0; i < pinChar.length; i++) {
++                pinChar[i] = (char)(pinUtf8[i] & 0xFF);
++            }
++            KeyStore.getInstance("PKCS11", p).load(null, pinChar);
++            if (DEBUG) {
++                System.out.println("Explicit login succeeded.");
++            }
++        }
++        if (DEBUG) {
++            System.out.println("Trying a crypto operation...");
++        }
++        final int blockSize = 16;
++        Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding", p);
++        cipher.init(Cipher.ENCRYPT_MODE,
++                new SecretKeySpec(new byte[blockSize], "AES"));
++        if (cipher.doFinal(new byte[blockSize]).length != blockSize) {
++            throw new Exception("Could not perform a crypto operation.");
++        }
++        if (DEBUG) {
++            if (loginType == LoginType.IMPLICIT) {
++                System.out.println("Implicit login succeeded.");
++            }
++            System.out.println("Crypto operation after login succeeded.");
++        }
++
++        if (loginType == LoginType.IMPLICIT) {
++            /*
++             * Additional unitary testing. Expected to succeed at this point.
++             */
++            if (DEBUG) {
++                System.out.println("Trying unitary test...");
++            }
++            String sysPathProp = System.getProperty(FIPS_NSSDB_PATH_PROP);
++            if (DEBUG) {
++                System.out.println("Path value (as a System property): " +
++                        sysPathProp);
++            }
++            if (!expectedPath.equals(sysPathProp)) {
++                throw new Exception("Path is different than expected: " +
++                        sysPathProp + " (actual) vs " + expectedPath +
++                        " (expected).");
++            }
++            Class<?> c = Class
++                    .forName("sun.security.pkcs11.FIPSTokenLoginHandler");
++            Method m = c.getDeclaredMethod("getFipsNssdbPin");
++            m.setAccessible(true);
++            String pin = null;
++            char[] pinChar = (char[]) m.invoke(c);
++            if (pinChar != null) {
++                byte[] pinUtf8 = new byte[pinChar.length];
++                for (int i = 0; i < pinUtf8.length; i++) {
++                    pinUtf8[i] = (byte) pinChar[i];
++                }
++                pin = new String(pinUtf8, StandardCharsets.UTF_8);
++            }
++            if (!expectedPin.isEmpty() && !expectedPin.equals(pin) ||
++                    expectedPin.isEmpty() && pin != null) {
++                throw new Exception("PIN is different than expected: '" + pin +
++                         "' (actual) vs '" + expectedPin + "' (expected).");
++            }
++            if (DEBUG) {
++                System.out.println("PIN value: " + pin);
++                System.out.println("Unitary test succeeded.");
++            }
++        }
++    }
++
++    private static void mainLauncher() throws Throwable {
++        for (String pin : PINS_TO_TEST) {
++            Path workspace = Files.createTempDirectory(null);
++            try {
++                TestContext ctx = new TestContext(pin, workspace);
++                createNSSDB(ctx);
++                {
++                    ctx.loginType = LoginType.IMPLICIT;
++                    for (PropType propType : PropType.values()) {
++                        ctx.propType = propType;
++                        pinLauncher(ctx);
++                        envLauncher(ctx);
++                        fileLauncher(ctx);
++                    }
++                }
++                explicitLoginLauncher(ctx);
++            } finally {
++                FileUtils.deleteFileTreeWithRetry(workspace);
++            }
++        }
++    }
++
++    private static void pinLauncher(TestContext ctx) throws Throwable {
++        launchTest(p -> {}, "pin:" + ctx.pin, ctx);
++    }
++
++    private static void envLauncher(TestContext ctx) throws Throwable {
++        final String NSSDB_PIN_ENV_VAR = "NSSDB_PIN_ENV_VAR";
++        launchTest(p -> p.env(NSSDB_PIN_ENV_VAR, ctx.pin),
++                "env:" + NSSDB_PIN_ENV_VAR, ctx);
++    }
++
++    private static void fileLauncher(TestContext ctx) throws Throwable {
++        // The file containing the PIN (ctx.nssdbPinFile) was created by the
++        // generatePinFile method, called from createNSSDB.
++        launchTest(p -> {}, "file:" + ctx.nssdbPinFile, ctx);
++    }
++
++    private static void explicitLoginLauncher(TestContext ctx)
++            throws Throwable {
++        ctx.loginType = LoginType.EXPLICIT;
++        ctx.propType = PropType.SYSTEM;
++        launchTest(p -> {}, "Invalid PIN, must be ignored", ctx);
++    }
++
++    private static void launchTest(Consumer<Proc> procCb, String pinPropVal,
++            TestContext ctx) throws Throwable {
++        if (DEBUG) {
++            System.out.println("Launching JVM with " + FIPS_NSSDB_PATH_PROP +
++                    "=" + ctx.nssdbPath + " and " + FIPS_NSSDB_PIN_PROP +
++                    "=" + pinPropVal);
++        }
++        Proc p = Proc.create(NssdbPin.class.getName())
++                .args(ctx.nssdbPath, ctx.pin, ctx.loginType.name());
++        if (ctx.propType == PropType.SYSTEM) {
++            p.prop(FIPS_NSSDB_PATH_PROP, ctx.nssdbPath);
++            p.prop(FIPS_NSSDB_PIN_PROP, pinPropVal);
++            // Make sure that Security properties defaults are not used.
++            p.secprop(FIPS_NSSDB_PATH_PROP, "");
++            p.secprop(FIPS_NSSDB_PIN_PROP, "");
++        } else if (ctx.propType == PropType.SECURITY) {
++            p.secprop(FIPS_NSSDB_PATH_PROP, ctx.nssdbPath);
++            pinPropVal = escapeForPropsFile(pinPropVal);
++            p.secprop(FIPS_NSSDB_PIN_PROP, pinPropVal);
++        } else {
++            throw new Exception("Unsupported property type.");
++        }
++        if (DEBUG) {
++            p.inheritIO();
++            p.prop("java.security.debug", "sunpkcs11");
++            p.debug(NssdbPin.class.getName());
++
++            // Need the launched process to connect to a debugger?
++            //System.setProperty("test.vm.opts", "-Xdebug -Xrunjdwp:" +
++            //         "transport=dt_socket,address=localhost:8000,suspend=y");
++        } else {
++            p.nodump();
++        }
++        procCb.accept(p);
++        p.start().waitFor(0);
++    }
++
++    private static String escapeForPropsFile(String str) throws Throwable {
++        StringBuffer sb = new StringBuffer();
++        for (int i = 0; i < str.length(); i++) {
++            int cp = str.codePointAt(i);
++            if (Character.UnicodeBlock.of(cp)
++                    == Character.UnicodeBlock.BASIC_LATIN) {
++                sb.append(Character.toChars(cp));
++            } else {
++                sb.append("\\u").append(String.format("%04X", cp));
++            }
++        }
++        return sb.toString();
++    }
++
++    private static void createNSSDB(TestContext ctx) throws Throwable {
++        ProcessBuilder pb = getModutilPB(ctx, "-create");
++        if (DEBUG) {
++            System.out.println("Creating an NSS DB in " + ctx.workspace +
++                    "...");
++            System.out.println("cmd: " + String.join(" ", pb.command()));
++        }
++        if (pb.start().waitFor() != 0) {
++            throw new Exception("NSS DB creation failed.");
++        }
++        generatePinFile(ctx);
++        pb = getModutilPB(ctx, "-changepw", NSSDB_TOKEN_NAME,
++                "-newpwfile", ctx.nssdbPinFile.toString());
++        if (DEBUG) {
++            System.out.println("NSS DB created.");
++            System.out.println("Changing NSS DB PIN...");
++            System.out.println("cmd: " + String.join(" ", pb.command()));
++        }
++        if (pb.start().waitFor() != 0) {
++            throw new Exception("NSS DB PIN change failed.");
++        }
++        if (DEBUG) {
++            System.out.println("NSS DB PIN changed.");
++        }
++    }
++
++    private static ProcessBuilder getModutilPB(TestContext ctx, String... args)
++            throws Throwable {
++        ProcessBuilder pb = new ProcessBuilder("modutil", "-force");
++        List<String> pbCommand = pb.command();
++        if (args != null) {
++            pbCommand.addAll(Arrays.asList(args));
++        }
++        pbCommand.add("-dbdir");
++        pbCommand.add(ctx.nssdbPath);
++        if (DEBUG) {
++            pb.inheritIO();
++        } else {
++            pb.redirectError(ProcessBuilder.Redirect.INHERIT);
++        }
++        return pb;
++    }
++
++    private static void generatePinFile(TestContext ctx) throws Throwable {
++        ctx.nssdbPinFile = Files.createTempFile(ctx.workspace, null, null);
++        Files.writeString(ctx.nssdbPinFile, ctx.pin + System.lineSeparator() +
++                "2nd line with garbage");
++    }
++}
+diff --git a/test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java b/test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java
+new file mode 100644
+index 00000000000..87f1ad04505
+--- /dev/null
++++ b/test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java
+@@ -0,0 +1,77 @@
++/*
++ * Copyright (c) 2022, 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.
++ */
++
++import java.security.Provider;
++import java.security.Security;
++
++/*
++ * @test
++ * @bug 9999999
++ * @requires (jdk.version.major >= 8)
++ * @run main/othervm/timeout=30 VerifyMissingAttributes
++ * @author Martin Balao (mbalao@redhat.com)
++ */
++
++public final class VerifyMissingAttributes {
++
++    private static final String[] svcAlgImplementedIn = {
++            "AlgorithmParameterGenerator.DSA",
++            "AlgorithmParameters.DSA",
++            "CertificateFactory.X.509",
++            "KeyStore.JKS",
++            "KeyStore.CaseExactJKS",
++            "KeyStore.DKS",
++            "CertStore.Collection",
++            "CertStore.com.sun.security.IndexedCollection"
++    };
++
++    public static void main(String[] args) throws Throwable {
++        Provider sunProvider = Security.getProvider("SUN");
++        for (String svcAlg : svcAlgImplementedIn) {
++            String filter = svcAlg + " ImplementedIn:Software";
++            doQuery(sunProvider, filter);
++        }
++        if (Double.parseDouble(
++                System.getProperty("java.specification.version")) >= 17) {
++            String filter = "KeyFactory.RSASSA-PSS SupportedKeyClasses:" +
++                    "java.security.interfaces.RSAPublicKey" +
++                    "|java.security.interfaces.RSAPrivateKey";
++            doQuery(Security.getProvider("SunRsaSign"), filter);
++        }
++        System.out.println("TEST PASS - OK");
++    }
++
++    private static void doQuery(Provider expectedProvider, String filter)
++            throws Exception {
++        if (expectedProvider == null) {
++            throw new Exception("Provider not found.");
++        }
++        Provider[] providers = Security.getProviders(filter);
++        if (providers == null || providers.length != 1 ||
++                providers[0] != expectedProvider) {
++            throw new Exception("Failure retrieving the provider with this" +
++                    " query: " + filter);
++        }
++    }
++}
+

diff --git a/java-21-openjdk-portable.spec b/java-21-openjdk-portable.spec
index 02659bb..8807be2 100644
--- a/java-21-openjdk-portable.spec
+++ b/java-21-openjdk-portable.spec
@@ -2,15 +2,15 @@
 %global featurever 21
 %global interimver 0
 %global updatever 13
-%global patchver 0
-%global buildver 9
-%global portablerelease 3
-%global rpmrelease 0
+%global patchver 1
+%global buildver 2
+%global portablerelease 1
+%global rpmrelease 1
 
 # Define IcedTea version used for SystemTap tapsets and desktop file
 %global icedteaver      6.0.0pre00-c848b93a8598
 # Define current Git revision for the FIPS support patches
-%global fipsver 133f17d2ac4
+%global fipsver de44431fab9
 # Define JDK versions
 %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
 %global javaver         %{featurever}
@@ -734,10 +734,6 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
 #
 #############################################
 
-# JDK-8395142: CA Enhancements
-Patch2001: 0001-8395142-CA-Enhancements.patch
-Patch2002: jdk8395690-CA-certificate-improvements.patch
-
 #############################################
 #
 # Portable build specific patches
@@ -808,7 +804,7 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 %else
 # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.14.3
+Provides: bundled(freetype) = 2.15.0
 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
 Provides: bundled(giflib) = 6.1.3
 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
@@ -818,7 +814,7 @@ Provides: bundled(lcms2) = 2.19.1
 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
 Provides: bundled(libjpeg) = 6b
 # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.58
+Provides: bundled(libpng) = 1.6.59
 # Version in src/java.base/share/native/libzip/zlib/zlib.h
 Provides: bundled(zlib) = 1.3.2
 %endif
@@ -1016,10 +1012,6 @@ sh %{SOURCE12} %{top_level_dir_name}
 pushd %{top_level_dir_name}
 # Add crypto policy and FIPS support
 %patch -P1001 -p1
-# Add CA Enhancements patch
-%patch -P2001 -p1
-# Add CA certificate improvements
-%patch -P2002 -p1
 popd # openjdk
 
 echo "Generating %{alt_java_name} man page"
@@ -1272,7 +1264,7 @@ function buildjdk() {
     %{?dts_command} make LOG=trace \
       WARNINGS_ARE_ERRORS="-Wno-error" \
       CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" $maketargets ||\
-        ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false )
+        ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
     popd
 }
 

diff --git a/jdk8395690-CA-certificate-improvements.patch b/jdk8395690-CA-certificate-improvements.patch
deleted file mode 100644
index 68a1797..0000000
--- a/jdk8395690-CA-certificate-improvements.patch
+++ /dev/null
@@ -1,451 +0,0 @@
-From 27ee732f867295fa755fb4127b04862c5624cbbd Mon Sep 17 00:00:00 2001
-From: Andrew John Hughes <andrew@openjdk.org>
-Date: Fri, 23 Oct 2026 23:59:53 +0100
-Subject: [PATCH] 8395690: CA certificate improvements
-
-Backport-of: bbd7a7239abee6d9d929717ab1808d059f279cda
----
- src/java.base/share/data/cacerts/comodoaaaca  |  32 ----
- .../share/data/cacerts/emsigneccrootcag3      |  22 ---
- .../share/data/cacerts/emsignrootcag1         |  29 ---
- .../share/data/cacerts/emsignrootcag2         |  39 ----
- .../certification/CAInterop.java              |  29 ---
- .../certification/EmSignRootG2CA.java         | 179 ------------------
- .../security/lib/cacerts/VerifyCACerts.java   |  13 +-
- 7 files changed, 3 insertions(+), 340 deletions(-)
- delete mode 100644 src/java.base/share/data/cacerts/comodoaaaca
- delete mode 100644 src/java.base/share/data/cacerts/emsigneccrootcag3
- delete mode 100644 src/java.base/share/data/cacerts/emsignrootcag1
- delete mode 100644 src/java.base/share/data/cacerts/emsignrootcag2
- delete mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java
-
-diff --git a/src/java.base/share/data/cacerts/comodoaaaca b/src/java.base/share/data/cacerts/comodoaaaca
-deleted file mode 100644
-index 76fc7fcf5f6..00000000000
---- a/src/java.base/share/data/cacerts/comodoaaaca
-+++ /dev/null
-@@ -1,32 +0,0 @@
--Owner: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
--Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
--Serial number: 1
--Valid from: Thu Jan 01 00:00:00 GMT 2004 until: Sun Dec 31 23:59:59 GMT 2028
--Signature algorithm name: SHA1withRSA
--Subject Public Key Algorithm: 2048-bit RSA key
--Version: 3
-------BEGIN CERTIFICATE-----
--MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
--MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
--GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
--YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
--MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
--BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
--GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
--ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
--BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
--3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
--YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
--rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
--ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
--oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
--MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
--QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
--b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
--AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
--GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
--Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
--G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
--l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
--smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
-------END CERTIFICATE-----
-diff --git a/src/java.base/share/data/cacerts/emsigneccrootcag3 b/src/java.base/share/data/cacerts/emsigneccrootcag3
-deleted file mode 100644
-index a286f81c2f4..00000000000
---- a/src/java.base/share/data/cacerts/emsigneccrootcag3
-+++ /dev/null
-@@ -1,22 +0,0 @@
--Owner: CN=emSign ECC Root CA - G3, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--Issuer: CN=emSign ECC Root CA - G3, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--Serial number: 3cf607a968700eda8b84
--Valid from: Sun Feb 18 18:30:00 GMT 2018 until: Wed Feb 18 18:30:00 GMT 2043
--Signature algorithm name: SHA384withECDSA
--Subject Public Key Algorithm: 384-bit EC (secp384r1) key
--Version: 3
-------BEGIN CERTIFICATE-----
--MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQG
--EwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNo
--bm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
--RzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4MTgzMDAwWjBrMQswCQYDVQQGEwJJ
--TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s
--b2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMw
--djAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0
--WXTsuwYc58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xyS
--fvalY8L1X44uT6EYGQIrMgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuB
--zhccLikenEhjQjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggq
--hkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+DCBeQyh+KTOgNG3qxrdWB
--CUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7jHvrZQnD
--+JbNR6iC8hZVdyR+EhCVBCyj
-------END CERTIFICATE-----
-diff --git a/src/java.base/share/data/cacerts/emsignrootcag1 b/src/java.base/share/data/cacerts/emsignrootcag1
-deleted file mode 100644
-index 6b06f6689bc..00000000000
---- a/src/java.base/share/data/cacerts/emsignrootcag1
-+++ /dev/null
-@@ -1,29 +0,0 @@
--Owner: CN=emSign Root CA - G1, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--Issuer: CN=emSign Root CA - G1, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--Serial number: 31f5e4620c6c58edd6d8
--Valid from: Sun Feb 18 18:30:00 GMT 2018 until: Wed Feb 18 18:30:00 GMT 2043
--Signature algorithm name: SHA256withRSA
--Subject Public Key Algorithm: 2048-bit RSA key
--Version: 3
-------BEGIN CERTIFICATE-----
--MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYD
--VQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBU
--ZWNobm9sb2dpZXMgTGltaXRlZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBH
--MTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgxODMwMDBaMGcxCzAJBgNVBAYTAklO
--MRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xv
--Z2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIBIjAN
--BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQz
--f2N4aLTNLnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO
--8oG0x5ZOrRkVUkr+PHB1cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aq
--d7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHWDV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhM
--tTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ6DqS0hdW5TUaQBw+jSzt
--Od9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrHhQIDAQAB
--o0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQD
--AgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31x
--PaOfG1vR2vjTnGs2vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjM
--wiI/aTvFthUvozXGaCocV685743QNcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6d
--GNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q+Mri/Tm3R7nrft8EI6/6nAYH
--6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeihU80Bv2noWgby
--RQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
--iN66zB+Afko=
-------END CERTIFICATE-----
-diff --git a/src/java.base/share/data/cacerts/emsignrootcag2 b/src/java.base/share/data/cacerts/emsignrootcag2
-deleted file mode 100644
-index e4e4ddda65a..00000000000
---- a/src/java.base/share/data/cacerts/emsignrootcag2
-+++ /dev/null
-@@ -1,39 +0,0 @@
--Owner: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--Issuer: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--Serial number: 864dbf0fe35ed77d8ed8
--Valid from: Sun Feb 18 18:30:00 GMT 2018 until: Wed Feb 18 18:30:00 GMT 2043
--Signature algorithm name: SHA384withRSA
--Subject Public Key Algorithm: 4096-bit RSA key
--Version: 3
-------BEGIN CERTIFICATE-----
--MIIFlTCCA32gAwIBAgILAIZNvw/jXtd9jtgwDQYJKoZIhvcNAQEMBQAwZzELMAkG
--A1UEBhMCSU4xEzARBgNVBAsTCmVtU2lnbiBQS0kxJTAjBgNVBAoTHGVNdWRocmEg
--VGVjaG5vbG9naWVzIExpbWl0ZWQxHDAaBgNVBAMTE2VtU2lnbiBSb290IENBIC0g
--RzIwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4MTgzMDAwWjBnMQswCQYDVQQGEwJJ
--TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s
--b2dpZXMgTGltaXRlZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBHMjCCAiIw
--DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMNwGIWW2kHfHK+sXTNwxF07K+IV
--ySTuyFM2r1v002wUfcdT+zs5OM5QbMYFFnedXQI6gCFLsjKrcaej48Zt37OyEb3i
--aPs7CsP4kAyTwzKH9aZe6gXYHrJq40/ZVMNcQVI2PcIp40B/SAN2gUZ+ZaUtIOvV
--jEx26/ebNaXRIsthlkOG/caB+QRwDw1tl7338Zlv0M2oTBUy4B3e7dGP5pgXH71M
--jqHPCoNo+xv9f0NTBT+hUDa8h8wUtcGQq9CDeJTpjWcD2bP2AMdVG6oVpMAUeUzo
--cCyglvtFdUMjggxBbw4qhau1HXPG8Ot9hwL7ZMi8tkTzrvUIxxb8G9LF/7kKeCE7
--tGZaVzDTnXuifl3msR4ErHsQ4P7lVu2AIjIAhrAXoedDidb7pMcf7TABdrYUT1Jo
--G/AiK+J9jO6GTjeADD4LMDSBZhHMuBK/PJ/g0kGBt+/C1L+/HURzQhJkMlRnM6Rv
--XoCtfKopSlns5trZmTi971Wjbn88QXP61lGpBCUPwCjs7rpOYvSUJtI+lcbF+37q
--kIqOXYkVT3cupDSpw+H89kFtj5GKY+Xny4LxY+3IvDIRiyd6ky1DPj713DI0yqve
--EpsIr3A0PdwuyUI7CS1jg0NnGFT6Xxyr0xB+VDt83FJYW8v16k2pbaQ4kVxA3aXd
--X9dZYyVR1S59KM75AgMBAAGjQjBAMB0GA1UdDgQWBBTt7E1FYRgo57MjKBEcTaUn
--DV7s9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
--AQwFAAOCAgEACFC/ilQg8KTCVBxFJW/sazomkS0kNYbEIZg4B3obqwsJ7SX98z8Z
--gfzBpz0nYClwwJjWbFN1R2zY8pCEot6/dgmA8Vbq0GxhwPM5YN/SZquNyRIxO3cU
--dlAcwf+vSezdVCf9wOzvSAF3q0a5ljvbdbNJNpfScQVp7UUd5sBsZk8jXO1KQ/go
--/Vf/GDPnrIFmxpAIGE3sgnO8lAv9FzUaAeuv7HWe47xN9J7+bQzF93yHuIXACPTL
--pQHhg2zMv5C7BAbuDHfbj1Cu294Z832yhSfBcziWGskOvl3es2EcHytbS9c9P+0z
--Mpka7zGC1FHrvLb/FoduH86TeZt0QjZ6pcplNzoaxDnDvzTJ6CC2Eny+qH/APFCu
--VUv5/wjwF+HPm8Pup2ARj9cEp92+0qcerfHacNq5hMeGZdbA/dzdUR/5z5zXdxAk
--nl8mcfGb0eMNSTXQmmB/i4AecNnr72uYjzlaXUGYN7Nrb6XouG0pnh0/BBtWWp0U
--ShIPpWEAqs7RJBj6+1ZUYXZ4ObrCw962DxhN2p19Hxw9LtuUUcLqqTPrFXYvwO4t
--ouj7KJnAkaTUfXGdEaFVtFig1EA30WzJY2X1vAQ7hVnniCjgaXAGqjsU6sklNM9n
--xDx5rFCCCEtj9Kh8UHjGK2QqgP5kwgttjOApQMaCoezMfK4KD7WpOXU=
-------END CERTIFICATE-----
-diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
-index 7247bb39f19..dfeeb8098d9 100644
---- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
-+++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
-@@ -426,28 +426,6 @@
-  * @run main/othervm/manual -Djava.security.debug=certpath CAInterop teliarootcav2 CRL
-  */
- 
--/*
-- * @test id=emsignrootcag1
-- * @bug 8319187
-- * @summary Interoperability tests with eMudhra Root CA G1
-- * @library /test/lib
-- * @build jtreg.SkippedException ValidatePathWithURL CAInterop
-- * @run main/othervm/manual -Djava.security.debug=certpath,ocsp CAInterop emsignrootcag1 OCSP
-- * @run main/othervm/manual -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop emsignrootcag1 OCSP
-- * @run main/othervm/manual -Djava.security.debug=certpath CAInterop emsignrootcag1 CRL
-- */
--
--/*
-- * @test id=emsigneccrootcag3
-- * @bug 8319187
-- * @summary Interoperability tests with eMudhra ECC Root CA G3
-- * @library /test/lib
-- * @build jtreg.SkippedException ValidatePathWithURL CAInterop
-- * @run main/othervm/manual -Djava.security.debug=certpath,ocsp CAInterop emsigneccrootcag3 OCSP
-- * @run main/othervm/manual -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop emsigneccrootcag3 OCSP
-- * @run main/othervm/manual -Djava.security.debug=certpath CAInterop emsigneccrootcag3 CRL
-- */
--
- /*
-  * @test id=certainlyrootr1
-  * @bug 8321408
-@@ -713,13 +691,6 @@ public class CAInterop {
-                     new CATestURLs("https://juolukka.cover.telia.fi:10600",
-                             "https://juolukka.cover.telia.fi:10601");
- 
--            case "emsignrootcag1" ->
--                    new CATestURLs("https://testovg1.emsign.com/RootOVG1.html",
--                            "https://testovg1r.emsign.com/RootOVG1MR.html");
--            case "emsigneccrootcag3" ->
--                    new CATestURLs("https://testovg3.emsign.com/RootOVG3.html",
--                            "https://testovg3r.emsign.com/RootOVG3MR.html");
--
-             case "certainlyrootr1" ->
-                     new CATestURLs("https://valid.root-r1.certainly.com",
-                             "https://revoked.root-r1.certainly.com");
-diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java
-deleted file mode 100644
-index 14e48a6e78f..00000000000
---- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java
-+++ /dev/null
-@@ -1,179 +0,0 @@
--/*
-- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation.
-- *
-- * 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.
-- */
--
--/*
-- * @test
-- * @bug 8319187
-- * @summary Interoperability tests with eMudhra emSign Root CA G2 CS root
-- * @build ValidatePathWithParams
-- * @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA OCSP
-- * @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA CRL
-- */
--
--public class EmSignRootG2CA {
--
--    // Owner: CN=emSign CS CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--    // Issuer: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--    // Serial number: c084e666596139a1fa9b
--    // Valid from: Sun Feb 18 10:30:00 PST 2018 until: Fri Feb 18 10:30:00 PST 2033
--    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
--            "MIIGeDCCBGCgAwIBAgILAMCE5mZZYTmh+pswDQYJKoZIhvcNAQEMBQAwZzELMAkG\n" +
--            "A1UEBhMCSU4xEzARBgNVBAsTCmVtU2lnbiBQS0kxJTAjBgNVBAoTHGVNdWRocmEg\n" +
--            "VGVjaG5vbG9naWVzIExpbWl0ZWQxHDAaBgNVBAMTE2VtU2lnbiBSb290IENBIC0g\n" +
--            "RzIwHhcNMTgwMjE4MTgzMDAwWhcNMzMwMjE4MTgzMDAwWjBlMQswCQYDVQQGEwJJ\n" +
--            "TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s\n" +
--            "b2dpZXMgTGltaXRlZDEaMBgGA1UEAxMRZW1TaWduIENTIENBIC0gRzIwggIiMA0G\n" +
--            "CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYYkv6Q9an5RylOJ6rkTAHT0cAwfYg\n" +
--            "ZsFKk/Hz/4VwWYsmzf+Z7M8i3CK3mnUcqgw0AIzrVLUwxiKAaL0qca+SbXwOk/7p\n" +
--            "Y/zwwLdg0OhHVGeeU3OTvkbsBpiLS08i7ids9FGrte6m1kqk+QSOY2F5AESxA4+F\n" +
--            "AKXGtzIImQd15m67C88AzzFsvszAAxSvVTqs4hb8BcRnUCzlAp7gMJSwwrrgTiEv\n" +
--            "6Ap6cFVT+n1oj6370sd5KBiRelLoqZtQx4njoNJkJlM30ftPNMGnqPLCloQ6koP/\n" +
--            "dAdpmwWB+F0/5d5UVmVPC3R/F8w7aX3fdSC8+M2E/ZXPVIYkEquLT7K2yXhRl3hn\n" +
--            "xwG6qqGp6TjvKvhiyac8qieu9YNG1R+PVFqejOFMohV2g0Z5MfwaruhUCNwHHeZs\n" +
--            "Dv/MVYMiHcV+5qU+MMzcKngb3RCmq0jzCb+MESomEMiAieCC15W7YC/LpgDHO0jY\n" +
--            "vV4AdLquUHfsOnhT2KD7mEg2PnL7JOwoQSFtuJYmM/coh+Y6CIoV3x+aV1bO7FDF\n" +
--            "ap33u36lE639oQj0tTqW3n1WcyNxhD0lwGlYIAjG8XnhRjtl6/MVVrGuyPWpB4TH\n" +
--            "u8CgNT0roENuq13RnHbBz2rLnndenHiMbxCyElGJBpZfXiF1H25KHUzvyzxt++L+\n" +
--            "hSfprX9BSXLpGQIDAQABo4IBJTCCASEwHwYDVR0jBBgwFoAU7exNRWEYKOezIygR\n" +
--            "HE2lJw1e7PQwHQYDVR0OBBYEFBWGyrZ0lhdIWDSCLM3S4XWer0S3MA4GA1UdDwEB\n" +
--            "/wQEAwIBBjATBgNVHSUEDDAKBggrBgEFBQcDAzA9BgNVHSAENjA0MDIGBFUdIAAw\n" +
--            "KjAoBggrBgEFBQcCARYcaHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbTASBgNV\n" +
--            "HRMBAf8ECDAGAQH/AgEAMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0\n" +
--            "cDovL29jc3AuZW1zaWduLmNvbTAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3Js\n" +
--            "LmVtc2lnbi5jb20/Um9vdENBRzIuY3JsMA0GCSqGSIb3DQEBDAUAA4ICAQCDkogs\n" +
--            "d5Tv1zwsQdk15btzYK/oI1tEwvN6IpIM9rSqIrje8XnXKjHHmbHX6emHIR31bxuK\n" +
--            "7mY77XjrJMWp+71udC/DgDy4tfZTXIzEekI0XQfcui1UPC08Ysl0taQKTANwsAOV\n" +
--            "VSi7boSGqLet0qSmeKVyQ5/blbwx1NhjyLTyi66rVYf7fYdPV55X5TKUJdKDgiRI\n" +
--            "BomNVRcrrnHZtS8+t9CXxSXR35VAu2ube44Tl+dQHIWz9XwLxtYFwIPSEdqPpoAu\n" +
--            "5XEVo7evwMHQoY/MQj6Ywbw6tYh6bHu6C/qrp4oSyYXbz2ZWlHkz1oEXvefi7a9Z\n" +
--            "6mKnnaY3UYHq5AI+k6ojazVFbSTenb/TO/Z247gdhG7Wssshd6pgyqcTEa+FZz+F\n" +
--            "5ZZdoiIl8UJsTCPPg0xP9Ab0WE3BjCCqTPt+Czbd3cgBxiBS7KTQs/DnQRFuPCjC\n" +
--            "khbDtHsCN4aUoLM9OOw94/ZcoU0G5cg9mSvONBxUv9W7SIpJreXXMPXixcBKULoJ\n" +
--            "focui3s0yzGqTA9tSzQ4nmA9aXBCAAxrABlY/hk10ImeBa1SPjocRb/vuCaGp74T\n" +
--            "n8oADP42XudDnp8wlOKWxFJulhNi960Rev+5vZOPF/LGfS78GI6yzBjR49VJGhOP\n" +
--            "EJK8NSNmK3FNblQfOyFM7VE0uOGHOUwpMGVM2A==\n" +
--            "-----END CERTIFICATE-----";
--
--    // Owner: CN=test, OU=test, O=test, L=test, ST=test, C=IN
--    // Issuer: CN=emSign CS CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--    // Serial number: 7c9ade672c0ad1b6
--    // Valid from: Wed Aug 30 05:39:25 PDT 2023 until: Sat Aug 30 05:39:25 PDT 2025
--    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
--            "MIIGNjCCBB6gAwIBAgIIfJreZywK0bYwDQYJKoZIhvcNAQEMBQAwZTELMAkGA1UE\n" +
--            "BhMCSU4xEzARBgNVBAsTCmVtU2lnbiBQS0kxJTAjBgNVBAoTHGVNdWRocmEgVGVj\n" +
--            "aG5vbG9naWVzIExpbWl0ZWQxGjAYBgNVBAMTEWVtU2lnbiBDUyBDQSAtIEcyMB4X\n" +
--            "DTIzMDgzMDEyMzkyNVoXDTI1MDgzMDEyMzkyNVowWDELMAkGA1UEBhMCSU4xDTAL\n" +
--            "BgNVBAgTBHRlc3QxDTALBgNVBAcTBHRlc3QxDTALBgNVBAoMBHRlc3QxDTALBgNV\n" +
--            "BAsTBHRlc3QxDTALBgNVBAMTBHRlc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAw\n" +
--            "ggGKAoIBgQC04pOiSFbl7Bd4wFYXzzyukKh+EmwIq8xRGQDkuYH+C6Zao36VAV+k\n" +
--            "xGw7lmM3rf4YUcArgZYHfrxgPJNBbGrCi/YnEPYQTNwSrBAePUx1tt13LVBxHfNu\n" +
--            "cQQT+kqE7064WsYfmfr/uzJZemqVH7lG82DN23+8E/235AIh3lz/pn7T9ByLj7TV\n" +
--            "zWP40oT0UfQXQvWUpFevPONu/RksRP+NiKV3ji6/wYpvrfodzkrGxw2DPfOh4Iam\n" +
--            "j6bBH2rkTMToH853plsQGr2ji8OndePfvDdk+5c33Jz1knCNPZSlYQIIp8scyz4z\n" +
--            "jaUGdoC140FjEA1SMA2WzpRJoE7xjAidLv7jiV596/bTwrIM+IZhzBc8SKRmkdZ6\n" +
--            "lYjPYJHPqRosRtfxcQne3pY6F4s1aOUtuGJaQS/AJkkykZoOx27plWM5SjtmlrL+\n" +
--            "7g2/ihWT9CEagYuo44tqk9Tmp3P37+ADAmiXxP0zUxYIv77DSabdArrZ+AB5XUol\n" +
--            "V8sxE1V6h0UCAwEAAaOCAXUwggFxMB8GA1UdIwQYMBaAFBWGyrZ0lhdIWDSCLM3S\n" +
--            "4XWer0S3MB0GA1UdDgQWBBQ2k0TE2p46sYwI5M/a1XJ8M5Oc8DAOBgNVHQ8BAf8E\n" +
--            "BAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwNwYDVR0fBDAwLjAsoCqgKIYmaHR0\n" +
--            "cDovL2NybC5lbXNpZ24uY29tP2VtU2lnbkNTQ0FHMi5jcmwwTgYDVR0gBEcwRTA5\n" +
--            "BgsrBgEEAYOOIQEAATAqMCgGCCsGAQUFBwIBFhxodHRwOi8vcmVwb3NpdG9yeS5l\n" +
--            "bVNpZ24uY29tMAgGBmeBDAEEATBzBggrBgEFBQcBAQRnMGUwIgYIKwYBBQUHMAGG\n" +
--            "Fmh0dHA6Ly9vY3NwLmVtU2lnbi5jb20wPwYIKwYBBQUHMAKGM2h0dHA6Ly9yZXBv\n" +
--            "c2l0b3J5LmVtc2lnbi5jb20vY2VydHMvZW1TaWduQ1NDQUcyLmNydDAMBgNVHRMB\n" +
--            "Af8EAjAAMA0GCSqGSIb3DQEBDAUAA4ICAQBKLa7j8fNpcnWNv7NegrMKTRy7gycI\n" +
--            "qrMK848wISX6jl2wg6b275sWQHzQRxA6rbB76bF2HXLFcpITJPaz+vjetYOVQd4v\n" +
--            "l8iZN52OpN6Pwrheiz7JhdLiHisN+2NKMmF899bH7w1l2Sr/FQl5vqk41gwwWMen\n" +
--            "99Waf4Bp6p3lvBArK2BbabTs8+16xvmkHEK3d3l3Bu6qTEbQRgUI5XsVXmXXn8Pg\n" +
--            "IANliTEsbsN9CMWrJ56ciEujU7w2L+IBfvKhl10N1AQNHwpQzwfFyz2BUbACN75o\n" +
--            "feIUBarM3ssNzpnt7idgkCTwWVrdEL1NHyW967aEMWyVwaRrtkjFOW/0xuSr2rEI\n" +
--            "jBpPj5RPdP6ZEaqnmg5PIgSrJ8FBjx6JmvVgZH/XEl5MZ7PsvJFfIMun6RxXtGn7\n" +
--            "QP0+ipkRrI6USNFS84H53Q0WJhQWZUgd3cdm37wpFGvxOVEskIgJNW9SbOgiT9sB\n" +
--            "zTIy3ceOK2onmUkDM2Q2+Hbc7A4BmNIlW4fpYXvZlM7IXSl9U3Voks92Hi45azgz\n" +
--            "StWZv9+Ronmmp+b7JKCe7MZXIBHfj0JhAVNJiYTZ9BqkY2VRvuQPVUdKxske9fQ6\n" +
--            "ciFJ5a6RDOhce6pFloaQu39ci2XCY1N4mIR3vFzpmBNkttlEXviK07XNTv9cnQt6\n" +
--            "3CW5aMAsfTbmOw==\n" +
--            "-----END CERTIFICATE-----";
--
--    // Owner: CN=test, OU=test, O=test, L=test, ST=test, C=IN
--    // Issuer: CN=emSign CS CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
--    // Serial number: cf02dedd03d2f509
--    // Valid from: Thu Oct 05 22:38:51 PDT 2023 until: Sun Oct 05 22:38:51 PDT 2025
--    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
--            "MIIGNzCCBB+gAwIBAgIJAM8C3t0D0vUJMA0GCSqGSIb3DQEBDAUAMGUxCzAJBgNV\n" +
--            "BAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRl\n" +
--            "Y2hub2xvZ2llcyBMaW1pdGVkMRowGAYDVQQDExFlbVNpZ24gQ1MgQ0EgLSBHMjAe\n" +
--            "Fw0yMzEwMDYwNTM4NTFaFw0yNTEwMDYwNTM4NTFaMFgxCzAJBgNVBAYTAklOMQ0w\n" +
--            "CwYDVQQIEwR0ZXN0MQ0wCwYDVQQHEwR0ZXN0MQ0wCwYDVQQKDAR0ZXN0MQ0wCwYD\n" +
--            "VQQLEwR0ZXN0MQ0wCwYDVQQDEwR0ZXN0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8A\n" +
--            "MIIBigKCAYEAmUSghjvjUvVgYguH2PMLwW4TwtYsNDpAuGPqux53lI9v9S5u4oAv\n" +
--            "m1Sa3MW7CeEnhHNAIFu/AKvNXSfkvnJpTozWstZMjd93DcNacteBG0fBKTkIq+5k\n" +
--            "A8qIBiXWk8NORlbjV5bXnoW2pO7wbrALDK3FGf2JAQjuYWXE1mlVk0+SJewUSN+F\n" +
--            "XTl63V3tcaqjxhoViY8/dCWc7pNTPgQ/f+Rmnm1bpE0hxVPpQ29+60lyoNtKiOWj\n" +
--            "InKRKBV8jYkR/xI13bKWguaxZnswpf2MrophQTvO9ivPHADWhZlNYYjYYEMl4tbi\n" +
--            "rG2EquJ7g8Jdo+aL3BggLv5gFkpfoEcaveNuUWy7ggUl7MNhvgDdWdoi6VY7R8Fi\n" +
--            "F52+JqPByGpHkZKi0wPa3BaI7guGGyCn3TMe66kNTMS4ADxHktqQlpNSaYYl/84G\n" +
--            "lnr2WxQt/W+sXoorlKc/Kh0ubbm6eDzPE8kkIDV2uIxUEgSL7SJQ95yf5XgRihoH\n" +
--            "KoBA45iR5vCtAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQVhsq2dJYXSFg0gizN\n" +
--            "0uF1nq9EtzAdBgNVHQ4EFgQUDs5dk74eElzdEKdxIlkzISoWSFkwDgYDVR0PAQH/\n" +
--            "BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMDcGA1UdHwQwMC4wLKAqoCiGJmh0\n" +
--            "dHA6Ly9jcmwuZW1zaWduLmNvbT9lbVNpZ25DU0NBRzIuY3JsME4GA1UdIARHMEUw\n" +
--            "OQYLKwYBBAGDjiEBAAEwKjAoBggrBgEFBQcCARYcaHR0cDovL3JlcG9zaXRvcnku\n" +
--            "ZW1TaWduLmNvbTAIBgZngQwBBAEwcwYIKwYBBQUHAQEEZzBlMCIGCCsGAQUFBzAB\n" +
--            "hhZodHRwOi8vb2NzcC5lbVNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw\n" +
--            "b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL2VtU2lnbkNTQ0FHMi5jcnQwDAYDVR0T\n" +
--            "AQH/BAIwADANBgkqhkiG9w0BAQwFAAOCAgEAGa2XSoRkoIkHHHGXrdzTBCf/+KgK\n" +
--            "FlHhqlBOk5rwLDX1sfNlmsaz10I69phE90Ac8Coa/xCrBaFrTYqRvmkY9gU19jkn\n" +
--            "FdVcwQEHNku7Ro/Z/mbyi+aTBzHMTy0Vl4HqVnQInjV891n64SerUuAB7wNVOOho\n" +
--            "GoBfpf6lzDzzuEmetFokHYv1tWGQqPF/dHLARQraUlQpWjsnOx0QcZ5cM79REONE\n" +
--            "y6uzXT2vaatT3ns8Mtx8zooq+t8pnZlXJqlrwNTcnPad9gSsVu6vfsnWhLhz0VLG\n" +
--            "sYPXcWIssLbBQW3v5z0l1Isj7vy2UFfbn8AmZ0PanPo3v3C2sk19DK+Zlc9xBAXc\n" +
--            "KKwc4m8le6QkP/EB2wUA7ey5Cf29hjNDJpZznquEaWl9aKbBRdJDKsK88IBJjzK0\n" +
--            "Gbpw9fYJ3txuGA7Q27gyaZAeGAIrFvOtRY0XFbr20qSh2GBBYN57+lBPh4UKqgy8\n" +
--            "Z2Kk/2jK9k+nm41JYCmwVZHg3Va9RRfW8FkeE95gAUFPDWjeV+GvcimCbcB3DwaZ\n" +
--            "9fy1qfV4xsduhC3ei6f7Ask8LbAEWaEIXmgK10YbIfhzomCyCzlA+E+gwkq/bmkv\n" +
--            "B8hh27KWA6IRt7URI51MZlh0e8fULyXlOZcoJA/IPX9RdePa2RHFuPSypBHjoN7z\n" +
--            "6bCML1XZ2xnHIAg=\n" +
--            "-----END CERTIFICATE-----";
--
--    public static void main(String[] args) throws Exception {
--
--        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
--
--        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
--            pathValidator.enableCRLCheck();
--        } else {
--            // OCSP check by default
--            pathValidator.enableOCSPCheck();
--        }
--
--        // Validate valid
--        pathValidator.validate(new String[]{VALID, INT},
--                ValidatePathWithParams.Status.GOOD, null, System.out);
--
--        // Validate Revoked
--        pathValidator.validate(new String[]{REVOKED, INT},
--                ValidatePathWithParams.Status.REVOKED,
--                "Thu Oct 05 22:51:36 PDT 2023", System.out);
--    }
--}
-diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
-index 82b6a6c257e..5bb064ed131 100644
---- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
-+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
-@@ -29,6 +29,7 @@
-  *      8243559 8225072 8258630 8259312 8256421 8225081 8225082 8225083 8245654
-  *      8305975 8304760 8307134 8295894 8314960 8317373 8317374 8318759 8319187
-  *      8321408 8316138 8341057 8303770 8350498 8359170 8361212 8372351 8387123
-+ *      8395690
-  * @summary Check root CA entries in cacerts file
-  */
- import java.io.ByteArrayInputStream;
-@@ -47,12 +48,12 @@ public class VerifyCACerts {
-             + File.separator + "security" + File.separator + "cacerts";
- 
-     // The numbers of certs now.
--    private static final int COUNT = 110;
-+    private static final int COUNT = 106;
- 
-     // SHA-256 of cacerts, can be generated with
-     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
-     private static final String CHECKSUM
--            = "AA:C2:64:41:28:06:1F:83:92:54:7C:DD:95:82:61:4C:8F:FA:09:7B:17:64:A7:A8:7C:A9:F6:27:25:95:2D:BB";
-+            = "C4:EA:62:8E:D2:49:7E:E7:97:3D:C6:42:C3:62:D2:33:E5:0A:6F:9D:45:57:4B:B5:A2:C6:19:62:87:21:D5:34";
- 
-     // Hex formatter to upper case with ":" delimiter
-     private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
-@@ -77,8 +78,6 @@ public class VerifyCACerts {
-                     "C0:A6:F4:DC:63:A2:4B:FD:CF:54:EF:2A:6A:08:2A:0A:72:DE:35:80:3E:2F:F5:FF:52:7A:E5:D8:72:06:DF:D5");
-             put("comodorsaca [jdk]",
-                     "52:F0:E1:C4:E5:8E:C6:29:29:1B:60:31:7F:07:46:71:B8:5D:7E:A8:0D:5B:07:27:34:63:53:4B:32:B4:02:34");
--            put("comodoaaaca [jdk]",
--                    "D7:A7:A0:FB:5D:7E:27:31:D7:71:E9:48:4E:BC:DE:F7:1D:5F:0C:3E:0A:29:48:78:2B:C8:3E:E0:EA:69:9E:F4");
-             put("comodoeccca [jdk]",
-                     "17:93:92:7A:06:14:54:97:89:AD:CE:2F:8F:34:F7:F0:B6:6D:0F:3A:E3:A3:B8:4D:21:EC:15:DB:BA:4F:AD:C7");
-             put("usertrustrsaca [jdk]",
-@@ -251,12 +250,6 @@ public class VerifyCACerts {
-                     "D4:8D:3D:23:EE:DB:50:A4:59:E5:51:97:60:1C:27:77:4B:9D:7B:18:C9:4D:5A:05:95:11:A1:02:50:B9:31:68");
-             put("teliarootcav2 [jdk]",
-                     "24:2B:69:74:2F:CB:1E:5B:2A:BF:98:89:8B:94:57:21:87:54:4E:5B:4D:99:11:78:65:73:62:1F:6A:74:B8:2C");
--            put("emsignrootcag1 [jdk]",
--                    "40:F6:AF:03:46:A9:9A:A1:CD:1D:55:5A:4E:9C:CE:62:C7:F9:63:46:03:EE:40:66:15:83:3D:C8:C8:D0:03:67");
--            put("emsigneccrootcag3 [jdk]",
--                    "86:A1:EC:BA:08:9C:4A:8D:3B:BE:27:34:C6:12:BA:34:1D:81:3E:04:3C:F9:E8:A8:62:CD:5C:57:A3:6B:BE:6B");
--            put("emsignrootcag2 [jdk]",
--                    "1A:A0:C2:70:9E:83:1B:D6:E3:B5:12:9A:00:BA:41:F7:EE:EF:02:08:72:F1:E6:50:4B:F0:F6:C3:F2:4F:3A:F3");
-             put("certainlyrootr1 [jdk]",
-                     "77:B8:2C:D8:64:4C:43:05:F7:AC:C5:CB:15:6B:45:67:50:04:03:3D:51:C6:0C:62:02:A8:E0:C3:34:67:D3:A0");
-             put("certainlyroote1 [jdk]",
--- 
-2.55.0
-

diff --git a/scripts/generate_source_tarball.sh b/scripts/generate_source_tarball.sh
index dd0f7fc..c541178 100755
--- a/scripts/generate_source_tarball.sh
+++ b/scripts/generate_source_tarball.sh
@@ -48,8 +48,7 @@
 # This will check out the same version as example 1, but from the
 # upstream repository:
 #
-# $ VERSION=jdk-21.0.11+10 PROJECT_NAME=openjdk REPO_NAME=jdk21u \
-#   BOOT_JDK=/usr/lib/jvm/java-21-openjdk ./generate_source_tarball.sh
+# $ VERSION=jdk-21.0.13.1+2 PROJECT_NAME=openjdk REPO_NAME=jdk21u BOOT_JDK=/usr/lib/jvm/java-21-openjdk ./generate_source_tarball.sh
 #
 # Example 3:
 # This will read the OpenJDK feature version from the spec file, then create a

diff --git a/sources b/sources
index 4a69d88..cde0b8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-21.0.13+9.tar.xz) = 22df1a545ed03e492fb1bfe202e0d5ac2474e35fd29bf694670c1abf15a155dbd5884f4cdb389e97a173e169deee9c2763f0eb7dd50ed40c039a51e9340b31ae
+SHA512 (openjdk-21.0.13.1+2.tar.xz) = fd5f78a60b5a383b28eef947bdd36080e7737e968843f941cd25372d215951b424886d47e33c93347f48e0d92f08151cb74e92545afe6882e2d6a0ea3af73a0a

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-20 15:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-20 15:17 [rpms/java-21-openjdk-portable] f43: Oracle CPUI 2026-11 Jiri Vanek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox