|
 |
35d9f7 |
commit 6e74f283739af0d867df01d20f82865f559a45ea
|
|
|
35d9f7 |
Author: Martin Balao <mbalao@redhat.com>
|
|
|
35d9f7 |
Date: Mon Feb 28 04:58:05 2022 +0000
|
|
|
35d9f7 |
|
|
|
35d9f7 |
RH2052070: Enable AlgorithmParameters and AlgorithmParameterGenerator services in FIPS mode
|
|
|
35d9f7 |
|
|
|
35d9f7 |
diff --git openjdk.orig/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java openjdk/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
|
|
|
35d9f7 |
index a020e1c15d8..6d459fdec01 100644
|
|
|
35d9f7 |
--- openjdk.orig/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
|
|
|
35d9f7 |
+++ openjdk/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
|
|
|
35d9f7 |
@@ -31,6 +31,7 @@ import java.security.SecureRandom;
|
|
|
35d9f7 |
import java.security.PrivilegedAction;
|
|
|
35d9f7 |
import java.util.HashMap;
|
|
|
35d9f7 |
import java.util.List;
|
|
|
35d9f7 |
+import jdk.internal.access.SharedSecrets;
|
|
|
35d9f7 |
import static sun.security.util.SecurityConstants.PROVIDER_VER;
|
|
|
35d9f7 |
import static sun.security.util.SecurityProviderConstants.*;
|
|
|
35d9f7 |
|
|
|
35d9f7 |
@@ -78,6 +79,10 @@ import static sun.security.util.SecurityProviderConstants.*;
|
|
|
35d9f7 |
|
|
|
35d9f7 |
public final class SunJCE extends Provider {
|
|
|
35d9f7 |
|
|
|
35d9f7 |
+ private static final boolean systemFipsEnabled =
|
|
|
35d9f7 |
+ SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
|
|
|
35d9f7 |
+ .isSystemFipsEnabled();
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
@java.io.Serial
|
|
|
35d9f7 |
private static final long serialVersionUID = 6812507587804302833L;
|
|
|
35d9f7 |
|
|
|
35d9f7 |
@@ -143,285 +148,287 @@ public final class SunJCE extends Provider {
|
|
|
35d9f7 |
void putEntries() {
|
|
|
35d9f7 |
// reuse attribute map and reset before each reuse
|
|
|
35d9f7 |
HashMap<String, String> attrs = new HashMap<>(3);
|
|
|
35d9f7 |
- attrs.put("SupportedModes", "ECB");
|
|
|
35d9f7 |
- attrs.put("SupportedPaddings", "NOPADDING|PKCS1PADDING|OAEPPADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHMD5ANDMGF1PADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHSHA1ANDMGF1PADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHSHA-1ANDMGF1PADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHSHA-224ANDMGF1PADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHSHA-256ANDMGF1PADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHSHA-384ANDMGF1PADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHSHA-512ANDMGF1PADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHSHA-512/224ANDMGF1PADDING"
|
|
|
35d9f7 |
- + "|OAEPWITHSHA-512/256ANDMGF1PADDING");
|
|
|
35d9f7 |
- attrs.put("SupportedKeyClasses",
|
|
|
35d9f7 |
- "java.security.interfaces.RSAPublicKey" +
|
|
|
35d9f7 |
- "|java.security.interfaces.RSAPrivateKey");
|
|
|
35d9f7 |
- ps("Cipher", "RSA",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.RSACipher", null, attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- // common block cipher modes, pads
|
|
|
35d9f7 |
- final String BLOCK_MODES = "ECB|CBC|PCBC|CTR|CTS|CFB|OFB" +
|
|
|
35d9f7 |
- "|CFB8|CFB16|CFB24|CFB32|CFB40|CFB48|CFB56|CFB64" +
|
|
|
35d9f7 |
- "|OFB8|OFB16|OFB24|OFB32|OFB40|OFB48|OFB56|OFB64";
|
|
|
35d9f7 |
- final String BLOCK_MODES128 = BLOCK_MODES +
|
|
|
35d9f7 |
- "|CFB72|CFB80|CFB88|CFB96|CFB104|CFB112|CFB120|CFB128" +
|
|
|
35d9f7 |
- "|OFB72|OFB80|OFB88|OFB96|OFB104|OFB112|OFB120|OFB128";
|
|
|
35d9f7 |
- final String BLOCK_PADS = "NOPADDING|PKCS5PADDING|ISO10126PADDING";
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedModes", BLOCK_MODES);
|
|
|
35d9f7 |
- attrs.put("SupportedPaddings", BLOCK_PADS);
|
|
|
35d9f7 |
- attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
- ps("Cipher", "DES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DESCipher", null, attrs);
|
|
|
35d9f7 |
- psA("Cipher", "DESede", "com.sun.crypto.provider.DESedeCipher",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- ps("Cipher", "Blowfish",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.BlowfishCipher", null, attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "RC2",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.RC2Cipher", null, attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedModes", BLOCK_MODES128);
|
|
|
35d9f7 |
- attrs.put("SupportedPaddings", BLOCK_PADS);
|
|
|
35d9f7 |
- attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
- psA("Cipher", "AES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$General", attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
- psA("Cipher", "AES/KW/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES_KW_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- ps("Cipher", "AES/KW/PKCS5Padding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES_KW_PKCS5Padding",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES/KWP/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES_KWP_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("Cipher", "AES_128/ECB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES128_ECB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_128/CBC/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES128_CBC_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_128/OFB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES128_OFB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_128/CFB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES128_CFB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_128/KW/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- ps("Cipher", "AES_128/KW/PKCS5Padding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_PKCS5Padding",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_128/KWP/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES128_KWP_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("Cipher", "AES_192/ECB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES192_ECB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_192/CBC/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES192_CBC_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_192/OFB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES192_OFB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_192/CFB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES192_CFB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_192/KW/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- ps("Cipher", "AES_192/KW/PKCS5Padding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_PKCS5Padding",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_192/KWP/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES192_KWP_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("Cipher", "AES_256/ECB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES256_ECB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_256/CBC/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES256_CBC_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_256/OFB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES256_OFB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_256/CFB/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESCipher$AES256_CFB_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_256/KW/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- ps("Cipher", "AES_256/KW/PKCS5Padding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_PKCS5Padding",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_256/KWP/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyWrapCipher$AES256_KWP_NoPadding",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedModes", "GCM");
|
|
|
35d9f7 |
- attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "AES/GCM/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.GaloisCounterMode$AESGCM", null,
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_128/GCM/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.GaloisCounterMode$AES128",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_192/GCM/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.GaloisCounterMode$AES192",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Cipher", "AES_256/GCM/NoPadding",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.GaloisCounterMode$AES256",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedModes", "CBC");
|
|
|
35d9f7 |
- attrs.put("SupportedPaddings", "NOPADDING");
|
|
|
35d9f7 |
- attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
- ps("Cipher", "DESedeWrap",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DESedeWrapCipher", null, attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedModes", "ECB");
|
|
|
35d9f7 |
- attrs.put("SupportedPaddings", "NOPADDING");
|
|
|
35d9f7 |
- attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
- psA("Cipher", "ARCFOUR",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.ARCFOURCipher", attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
- ps("Cipher", "ChaCha20",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Only",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- psA("Cipher", "ChaCha20-Poly1305",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- // PBES1
|
|
|
35d9f7 |
- psA("Cipher", "PBEWithMD5AndDES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEWithMD5AndDESCipher",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithMD5AndTripleDES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEWithMD5AndTripleDESCipher");
|
|
|
35d9f7 |
- psA("Cipher", "PBEWithSHA1AndDESede",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndDESede",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("Cipher", "PBEWithSHA1AndRC2_40",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_40",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("Cipher", "PBEWithSHA1AndRC2_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_128",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("Cipher", "PBEWithSHA1AndRC4_40",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_40",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("Cipher", "PBEWithSHA1AndRC4_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_128",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- // PBES2
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA1AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA224AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA256AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA384AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA512AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA1AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA224AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA256AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA384AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Cipher", "PBEWithHmacSHA512AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * Key(pair) Generator engines
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- ps("KeyGenerator", "DES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DESKeyGenerator");
|
|
|
35d9f7 |
- psA("KeyGenerator", "DESede",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DESedeKeyGenerator",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- ps("KeyGenerator", "Blowfish",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.BlowfishKeyGenerator");
|
|
|
35d9f7 |
- psA("KeyGenerator", "AES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.AESKeyGenerator",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- ps("KeyGenerator", "RC2",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$RC2KeyGenerator");
|
|
|
35d9f7 |
- psA("KeyGenerator", "ARCFOUR",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$ARCFOURKeyGenerator",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- ps("KeyGenerator", "ChaCha20",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$ChaCha20KeyGenerator");
|
|
|
35d9f7 |
- ps("KeyGenerator", "HmacMD5",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacMD5KeyGenerator");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA1",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacSHA1KeyGenerator", null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA224",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA256",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA384",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA384",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA512",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA512/224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_224",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA512/256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_256",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA3-224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_224",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA3-256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_256",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA3-384",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_384",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- psA("KeyGenerator", "HmacSHA3-512",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_512",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("KeyPairGenerator", "DiffieHellman",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DHKeyPairGenerator",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
+ if (!systemFipsEnabled) {
|
|
|
35d9f7 |
+ attrs.put("SupportedModes", "ECB");
|
|
|
35d9f7 |
+ attrs.put("SupportedPaddings", "NOPADDING|PKCS1PADDING|OAEPPADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHMD5ANDMGF1PADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHSHA1ANDMGF1PADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHSHA-1ANDMGF1PADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHSHA-224ANDMGF1PADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHSHA-256ANDMGF1PADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHSHA-384ANDMGF1PADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHSHA-512ANDMGF1PADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHSHA-512/224ANDMGF1PADDING"
|
|
|
35d9f7 |
+ + "|OAEPWITHSHA-512/256ANDMGF1PADDING");
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyClasses",
|
|
|
35d9f7 |
+ "java.security.interfaces.RSAPublicKey" +
|
|
|
35d9f7 |
+ "|java.security.interfaces.RSAPrivateKey");
|
|
|
35d9f7 |
+ ps("Cipher", "RSA",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.RSACipher", null, attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ // common block cipher modes, pads
|
|
|
35d9f7 |
+ final String BLOCK_MODES = "ECB|CBC|PCBC|CTR|CTS|CFB|OFB" +
|
|
|
35d9f7 |
+ "|CFB8|CFB16|CFB24|CFB32|CFB40|CFB48|CFB56|CFB64" +
|
|
|
35d9f7 |
+ "|OFB8|OFB16|OFB24|OFB32|OFB40|OFB48|OFB56|OFB64";
|
|
|
35d9f7 |
+ final String BLOCK_MODES128 = BLOCK_MODES +
|
|
|
35d9f7 |
+ "|CFB72|CFB80|CFB88|CFB96|CFB104|CFB112|CFB120|CFB128" +
|
|
|
35d9f7 |
+ "|OFB72|OFB80|OFB88|OFB96|OFB104|OFB112|OFB120|OFB128";
|
|
|
35d9f7 |
+ final String BLOCK_PADS = "NOPADDING|PKCS5PADDING|ISO10126PADDING";
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedModes", BLOCK_MODES);
|
|
|
35d9f7 |
+ attrs.put("SupportedPaddings", BLOCK_PADS);
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
+ ps("Cipher", "DES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DESCipher", null, attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "DESede", "com.sun.crypto.provider.DESedeCipher",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ ps("Cipher", "Blowfish",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.BlowfishCipher", null, attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "RC2",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.RC2Cipher", null, attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedModes", BLOCK_MODES128);
|
|
|
35d9f7 |
+ attrs.put("SupportedPaddings", BLOCK_PADS);
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
+ psA("Cipher", "AES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$General", attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
+ psA("Cipher", "AES/KW/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES_KW_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ ps("Cipher", "AES/KW/PKCS5Padding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES_KW_PKCS5Padding",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES/KWP/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES_KWP_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("Cipher", "AES_128/ECB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES128_ECB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_128/CBC/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES128_CBC_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_128/OFB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES128_OFB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_128/CFB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES128_CFB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_128/KW/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ ps("Cipher", "AES_128/KW/PKCS5Padding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES128_KW_PKCS5Padding",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_128/KWP/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES128_KWP_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("Cipher", "AES_192/ECB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES192_ECB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_192/CBC/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES192_CBC_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_192/OFB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES192_OFB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_192/CFB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES192_CFB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_192/KW/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ ps("Cipher", "AES_192/KW/PKCS5Padding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES192_KW_PKCS5Padding",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_192/KWP/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES192_KWP_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("Cipher", "AES_256/ECB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES256_ECB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_256/CBC/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES256_CBC_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_256/OFB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES256_OFB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_256/CFB/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESCipher$AES256_CFB_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_256/KW/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ ps("Cipher", "AES_256/KW/PKCS5Padding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES256_KW_PKCS5Padding",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_256/KWP/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyWrapCipher$AES256_KWP_NoPadding",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedModes", "GCM");
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "AES/GCM/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.GaloisCounterMode$AESGCM", null,
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_128/GCM/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.GaloisCounterMode$AES128",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_192/GCM/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.GaloisCounterMode$AES192",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "AES_256/GCM/NoPadding",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.GaloisCounterMode$AES256",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedModes", "CBC");
|
|
|
35d9f7 |
+ attrs.put("SupportedPaddings", "NOPADDING");
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
+ ps("Cipher", "DESedeWrap",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DESedeWrapCipher", null, attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedModes", "ECB");
|
|
|
35d9f7 |
+ attrs.put("SupportedPaddings", "NOPADDING");
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
+ psA("Cipher", "ARCFOUR",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.ARCFOURCipher", attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
+ ps("Cipher", "ChaCha20",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Only",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ psA("Cipher", "ChaCha20-Poly1305",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ // PBES1
|
|
|
35d9f7 |
+ psA("Cipher", "PBEWithMD5AndDES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEWithMD5AndDESCipher",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithMD5AndTripleDES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEWithMD5AndTripleDESCipher");
|
|
|
35d9f7 |
+ psA("Cipher", "PBEWithSHA1AndDESede",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndDESede",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("Cipher", "PBEWithSHA1AndRC2_40",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_40",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("Cipher", "PBEWithSHA1AndRC2_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC2_128",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("Cipher", "PBEWithSHA1AndRC4_40",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_40",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("Cipher", "PBEWithSHA1AndRC4_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PKCS12PBECipherCore$PBEWithSHA1AndRC4_128",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ // PBES2
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA1AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA224AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA256AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA384AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA512AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA1AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA1AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA224AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA224AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA256AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA256AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA384AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA384AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Cipher", "PBEWithHmacSHA512AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBES2Core$HmacSHA512AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * Key(pair) Generator engines
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ ps("KeyGenerator", "DES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DESKeyGenerator");
|
|
|
35d9f7 |
+ psA("KeyGenerator", "DESede",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DESedeKeyGenerator",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ ps("KeyGenerator", "Blowfish",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.BlowfishKeyGenerator");
|
|
|
35d9f7 |
+ psA("KeyGenerator", "AES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.AESKeyGenerator",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ ps("KeyGenerator", "RC2",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$RC2KeyGenerator");
|
|
|
35d9f7 |
+ psA("KeyGenerator", "ARCFOUR",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$ARCFOURKeyGenerator",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ ps("KeyGenerator", "ChaCha20",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$ChaCha20KeyGenerator");
|
|
|
35d9f7 |
+ ps("KeyGenerator", "HmacMD5",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacMD5KeyGenerator");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA1",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacSHA1KeyGenerator", null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA224",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA256",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA384",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA384",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA512",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA512/224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_224",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA512/256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA512_256",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA3-224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_224",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA3-256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_256",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA3-384",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_384",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ psA("KeyGenerator", "HmacSHA3-512",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.KeyGeneratorCore$HmacKG$SHA3_512",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("KeyPairGenerator", "DiffieHellman",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DHKeyPairGenerator",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ }
|
|
|
35d9f7 |
|
|
|
35d9f7 |
/*
|
|
|
35d9f7 |
* Algorithm parameter generation engines
|
|
|
35d9f7 |
@@ -430,15 +437,17 @@ public final class SunJCE extends Provider {
|
|
|
35d9f7 |
"DiffieHellman", "com.sun.crypto.provider.DHParameterGenerator",
|
|
|
35d9f7 |
null);
|
|
|
35d9f7 |
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * Key Agreement engines
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedKeyClasses", "javax.crypto.interfaces.DHPublicKey" +
|
|
|
35d9f7 |
- "|javax.crypto.interfaces.DHPrivateKey");
|
|
|
35d9f7 |
- psA("KeyAgreement", "DiffieHellman",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DHKeyAgreement",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
+ if (!systemFipsEnabled) {
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * Key Agreement engines
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyClasses", "javax.crypto.interfaces.DHPublicKey" +
|
|
|
35d9f7 |
+ "|javax.crypto.interfaces.DHPrivateKey");
|
|
|
35d9f7 |
+ psA("KeyAgreement", "DiffieHellman",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DHKeyAgreement",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ }
|
|
|
35d9f7 |
|
|
|
35d9f7 |
/*
|
|
|
35d9f7 |
* Algorithm Parameter engines
|
|
|
35d9f7 |
@@ -531,197 +540,199 @@ public final class SunJCE extends Provider {
|
|
|
35d9f7 |
psA("AlgorithmParameters", "ChaCha20-Poly1305",
|
|
|
35d9f7 |
"com.sun.crypto.provider.ChaCha20Poly1305Parameters", null);
|
|
|
35d9f7 |
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * Key factories
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- psA("KeyFactory", "DiffieHellman",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DHKeyFactory",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * Secret-key factories
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "DES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DESKeyFactory");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("SecretKeyFactory", "DESede",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.DESedeKeyFactory", null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("SecretKeyFactory", "PBEWithMD5AndDES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithMD5AndDES",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * Internal in-house crypto algorithm used for
|
|
|
35d9f7 |
- * the JCEKS keystore type. Since this was developed
|
|
|
35d9f7 |
- * internally, there isn't an OID corresponding to this
|
|
|
35d9f7 |
- * algorithm.
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithMD5AndTripleDES",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithMD5AndTripleDES");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("SecretKeyFactory", "PBEWithSHA1AndDESede",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndDESede",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("SecretKeyFactory", "PBEWithSHA1AndRC2_40",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndRC2_40",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("SecretKeyFactory", "PBEWithSHA1AndRC2_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndRC2_128",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("SecretKeyFactory", "PBEWithSHA1AndRC4_40",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndRC4_40",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- psA("SecretKeyFactory", "PBEWithSHA1AndRC4_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndRC4_128",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA1AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA1AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA224AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA224AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA256AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA256AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA384AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA384AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA512AndAES_128",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512AndAES_128");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA1AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA1AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA224AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA224AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA256AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA256AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA384AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA384AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBEWithHmacSHA512AndAES_256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512AndAES_256");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- // PBKDF2
|
|
|
35d9f7 |
- psA("SecretKeyFactory", "PBKDF2WithHmacSHA1",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBKDF2Core$HmacSHA1",
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBKDF2WithHmacSHA224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBKDF2Core$HmacSHA224");
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBKDF2WithHmacSHA256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBKDF2Core$HmacSHA256");
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBKDF2WithHmacSHA384",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBKDF2Core$HmacSHA384");
|
|
|
35d9f7 |
- ps("SecretKeyFactory", "PBKDF2WithHmacSHA512",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBKDF2Core$HmacSHA512");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * MAC
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- attrs.clear();
|
|
|
35d9f7 |
- attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
- ps("Mac", "HmacMD5", "com.sun.crypto.provider.HmacMD5", null, attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA1", "com.sun.crypto.provider.HmacSHA1",
|
|
|
35d9f7 |
- attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA224", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA256", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA384",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA384", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA512",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA512", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA512/224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA512_224", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA512/256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA512_256", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA3-224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA3_224", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA3-256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA3_256", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA3-384",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA3_384", attrs);
|
|
|
35d9f7 |
- psA("Mac", "HmacSHA3-512",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacCore$HmacSHA3_512", attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("Mac", "HmacPBESHA1",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "HmacPBESHA224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "HmacPBESHA256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "HmacPBESHA384",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "HmacPBESHA512",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "HmacPBESHA512/224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "HmacPBESHA512/256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256",
|
|
|
35d9f7 |
- null, attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- // PBMAC1
|
|
|
35d9f7 |
- ps("Mac", "PBEWithHmacSHA1",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBMAC1Core$HmacSHA1", null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "PBEWithHmacSHA224",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBMAC1Core$HmacSHA224", null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "PBEWithHmacSHA256",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBMAC1Core$HmacSHA256", null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "PBEWithHmacSHA384",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBMAC1Core$HmacSHA384", null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "PBEWithHmacSHA512",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.PBMAC1Core$HmacSHA512", null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "SslMacMD5",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.SslMacCore$SslMacMD5", null, attrs);
|
|
|
35d9f7 |
- ps("Mac", "SslMacSHA1",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.SslMacCore$SslMacSHA1", null, attrs);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * KeyStore
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- ps("KeyStore", "JCEKS",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.JceKeyStore");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * SSL/TLS mechanisms
|
|
|
35d9f7 |
- *
|
|
|
35d9f7 |
- * These are strictly internal implementations and may
|
|
|
35d9f7 |
- * be changed at any time. These names were chosen
|
|
|
35d9f7 |
- * because PKCS11/SunPKCS11 does not yet have TLS1.2
|
|
|
35d9f7 |
- * mechanisms, and it will cause calls to come here.
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- ps("KeyGenerator", "SunTlsPrf",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.TlsPrfGenerator$V10");
|
|
|
35d9f7 |
- ps("KeyGenerator", "SunTls12Prf",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.TlsPrfGenerator$V12");
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("KeyGenerator", "SunTlsMasterSecret",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.TlsMasterSecretGenerator",
|
|
|
35d9f7 |
- List.of("SunTls12MasterSecret", "SunTlsExtendedMasterSecret"),
|
|
|
35d9f7 |
- null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("KeyGenerator", "SunTlsKeyMaterial",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.TlsKeyMaterialGenerator",
|
|
|
35d9f7 |
- List.of("SunTls12KeyMaterial"), null);
|
|
|
35d9f7 |
-
|
|
|
35d9f7 |
- ps("KeyGenerator", "SunTlsRsaPremasterSecret",
|
|
|
35d9f7 |
- "com.sun.crypto.provider.TlsRsaPremasterSecretGenerator",
|
|
|
35d9f7 |
- List.of("SunTls12RsaPremasterSecret"), null);
|
|
|
35d9f7 |
+ if (!systemFipsEnabled) {
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * Key factories
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ psA("KeyFactory", "DiffieHellman",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DHKeyFactory",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * Secret-key factories
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "DES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DESKeyFactory");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("SecretKeyFactory", "DESede",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.DESedeKeyFactory", null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("SecretKeyFactory", "PBEWithMD5AndDES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithMD5AndDES",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * Internal in-house crypto algorithm used for
|
|
|
35d9f7 |
+ * the JCEKS keystore type. Since this was developed
|
|
|
35d9f7 |
+ * internally, there isn't an OID corresponding to this
|
|
|
35d9f7 |
+ * algorithm.
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithMD5AndTripleDES",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithMD5AndTripleDES");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("SecretKeyFactory", "PBEWithSHA1AndDESede",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndDESede",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("SecretKeyFactory", "PBEWithSHA1AndRC2_40",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndRC2_40",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("SecretKeyFactory", "PBEWithSHA1AndRC2_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndRC2_128",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("SecretKeyFactory", "PBEWithSHA1AndRC4_40",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndRC4_40",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ psA("SecretKeyFactory", "PBEWithSHA1AndRC4_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithSHA1AndRC4_128",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA1AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA1AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA224AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA224AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA256AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA256AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA384AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA384AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA512AndAES_128",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512AndAES_128");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA1AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA1AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA224AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA224AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA256AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA256AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA384AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA384AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBEWithHmacSHA512AndAES_256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBEKeyFactory$PBEWithHmacSHA512AndAES_256");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ // PBKDF2
|
|
|
35d9f7 |
+ psA("SecretKeyFactory", "PBKDF2WithHmacSHA1",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBKDF2Core$HmacSHA1",
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBKDF2WithHmacSHA224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBKDF2Core$HmacSHA224");
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBKDF2WithHmacSHA256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBKDF2Core$HmacSHA256");
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBKDF2WithHmacSHA384",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBKDF2Core$HmacSHA384");
|
|
|
35d9f7 |
+ ps("SecretKeyFactory", "PBKDF2WithHmacSHA512",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBKDF2Core$HmacSHA512");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * MAC
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ attrs.clear();
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyFormats", "RAW");
|
|
|
35d9f7 |
+ ps("Mac", "HmacMD5", "com.sun.crypto.provider.HmacMD5", null, attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA1", "com.sun.crypto.provider.HmacSHA1",
|
|
|
35d9f7 |
+ attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA224", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA256", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA384",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA384", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA512",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA512", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA512/224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA512_224", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA512/256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA512_256", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA3-224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA3_224", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA3-256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA3_256", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA3-384",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA3_384", attrs);
|
|
|
35d9f7 |
+ psA("Mac", "HmacSHA3-512",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacCore$HmacSHA3_512", attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("Mac", "HmacPBESHA1",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "HmacPBESHA224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "HmacPBESHA256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "HmacPBESHA384",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "HmacPBESHA512",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "HmacPBESHA512/224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "HmacPBESHA512/256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256",
|
|
|
35d9f7 |
+ null, attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ // PBMAC1
|
|
|
35d9f7 |
+ ps("Mac", "PBEWithHmacSHA1",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBMAC1Core$HmacSHA1", null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "PBEWithHmacSHA224",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBMAC1Core$HmacSHA224", null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "PBEWithHmacSHA256",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBMAC1Core$HmacSHA256", null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "PBEWithHmacSHA384",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBMAC1Core$HmacSHA384", null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "PBEWithHmacSHA512",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.PBMAC1Core$HmacSHA512", null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "SslMacMD5",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.SslMacCore$SslMacMD5", null, attrs);
|
|
|
35d9f7 |
+ ps("Mac", "SslMacSHA1",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.SslMacCore$SslMacSHA1", null, attrs);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * KeyStore
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ ps("KeyStore", "JCEKS",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.JceKeyStore");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * SSL/TLS mechanisms
|
|
|
35d9f7 |
+ *
|
|
|
35d9f7 |
+ * These are strictly internal implementations and may
|
|
|
35d9f7 |
+ * be changed at any time. These names were chosen
|
|
|
35d9f7 |
+ * because PKCS11/SunPKCS11 does not yet have TLS1.2
|
|
|
35d9f7 |
+ * mechanisms, and it will cause calls to come here.
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ ps("KeyGenerator", "SunTlsPrf",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.TlsPrfGenerator$V10");
|
|
|
35d9f7 |
+ ps("KeyGenerator", "SunTls12Prf",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.TlsPrfGenerator$V12");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("KeyGenerator", "SunTlsMasterSecret",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.TlsMasterSecretGenerator",
|
|
|
35d9f7 |
+ List.of("SunTls12MasterSecret", "SunTlsExtendedMasterSecret"),
|
|
|
35d9f7 |
+ null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("KeyGenerator", "SunTlsKeyMaterial",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.TlsKeyMaterialGenerator",
|
|
|
35d9f7 |
+ List.of("SunTls12KeyMaterial"), null);
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ ps("KeyGenerator", "SunTlsRsaPremasterSecret",
|
|
|
35d9f7 |
+ "com.sun.crypto.provider.TlsRsaPremasterSecretGenerator",
|
|
|
35d9f7 |
+ List.of("SunTls12RsaPremasterSecret"), null);
|
|
|
35d9f7 |
+ }
|
|
|
35d9f7 |
}
|
|
|
35d9f7 |
|
|
|
35d9f7 |
// Return the instance of this class or create one if needed.
|
|
|
35d9f7 |
diff --git openjdk.orig/src/java.base/share/classes/sun/security/provider/SunEntries.java openjdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
|
|
|
35d9f7 |
index 7cb5ebcde51..709d32912ca 100644
|
|
|
35d9f7 |
--- openjdk.orig/src/java.base/share/classes/sun/security/provider/SunEntries.java
|
|
|
35d9f7 |
+++ openjdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
|
|
|
35d9f7 |
@@ -193,20 +193,22 @@ public final class SunEntries {
|
|
|
35d9f7 |
String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
|
|
|
35d9f7 |
dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
|
|
|
35d9f7 |
addWithAlias(p, "KeyPairGenerator", "DSA", dsaKPGImplClass, attrs);
|
|
|
35d9f7 |
+ }
|
|
|
35d9f7 |
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * Algorithm Parameter Generator engines
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- addWithAlias(p, "AlgorithmParameterGenerator", "DSA",
|
|
|
35d9f7 |
- "sun.security.provider.DSAParameterGenerator", attrs);
|
|
|
35d9f7 |
- attrs.remove("KeySize");
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * Algorithm Parameter Generator engines
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ addWithAlias(p, "AlgorithmParameterGenerator", "DSA",
|
|
|
35d9f7 |
+ "sun.security.provider.DSAParameterGenerator", attrs);
|
|
|
35d9f7 |
+ attrs.remove("KeySize");
|
|
|
35d9f7 |
|
|
|
35d9f7 |
- /*
|
|
|
35d9f7 |
- * Algorithm Parameter engines
|
|
|
35d9f7 |
- */
|
|
|
35d9f7 |
- addWithAlias(p, "AlgorithmParameters", "DSA",
|
|
|
35d9f7 |
- "sun.security.provider.DSAParameters", attrs);
|
|
|
35d9f7 |
+ /*
|
|
|
35d9f7 |
+ * Algorithm Parameter engines
|
|
|
35d9f7 |
+ */
|
|
|
35d9f7 |
+ addWithAlias(p, "AlgorithmParameters", "DSA",
|
|
|
35d9f7 |
+ "sun.security.provider.DSAParameters", attrs);
|
|
|
35d9f7 |
|
|
|
35d9f7 |
+ if (!systemFipsEnabled) {
|
|
|
35d9f7 |
/*
|
|
|
35d9f7 |
* Key factories
|
|
|
35d9f7 |
*/
|
|
|
35d9f7 |
diff --git openjdk.orig/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java openjdk/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
|
|
|
35d9f7 |
index ca79f25cc44..16c5ad2e227 100644
|
|
|
35d9f7 |
--- openjdk.orig/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
|
|
|
35d9f7 |
+++ openjdk/src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java
|
|
|
35d9f7 |
@@ -27,6 +27,7 @@ package sun.security.rsa;
|
|
|
35d9f7 |
|
|
|
35d9f7 |
import java.util.*;
|
|
|
35d9f7 |
import java.security.Provider;
|
|
|
35d9f7 |
+import jdk.internal.access.SharedSecrets;
|
|
|
35d9f7 |
import static sun.security.util.SecurityProviderConstants.getAliases;
|
|
|
35d9f7 |
|
|
|
35d9f7 |
/**
|
|
|
35d9f7 |
@@ -36,6 +37,10 @@ import static sun.security.util.SecurityProviderConstants.getAliases;
|
|
|
35d9f7 |
*/
|
|
|
35d9f7 |
public final class SunRsaSignEntries {
|
|
|
35d9f7 |
|
|
|
35d9f7 |
+ private static final boolean systemFipsEnabled =
|
|
|
35d9f7 |
+ SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
|
|
|
35d9f7 |
+ .isSystemFipsEnabled();
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
private void add(Provider p, String type, String algo, String cn,
|
|
|
35d9f7 |
List<String> aliases, HashMap<String, String> attrs) {
|
|
|
35d9f7 |
services.add(new Provider.Service(p, type, algo, cn,
|
|
|
35d9f7 |
@@ -56,49 +61,52 @@ public final class SunRsaSignEntries {
|
|
|
35d9f7 |
// start populating content using the specified provider
|
|
|
35d9f7 |
// common attribute map
|
|
|
35d9f7 |
HashMap<String, String> attrs = new HashMap<>(3);
|
|
|
35d9f7 |
- attrs.put("SupportedKeyClasses",
|
|
|
35d9f7 |
- "java.security.interfaces.RSAPublicKey" +
|
|
|
35d9f7 |
- "|java.security.interfaces.RSAPrivateKey");
|
|
|
35d9f7 |
+ if (!systemFipsEnabled) {
|
|
|
35d9f7 |
+ attrs.put("SupportedKeyClasses",
|
|
|
35d9f7 |
+ "java.security.interfaces.RSAPublicKey" +
|
|
|
35d9f7 |
+ "|java.security.interfaces.RSAPrivateKey");
|
|
|
35d9f7 |
+
|
|
|
35d9f7 |
+ add(p, "KeyFactory", "RSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSAKeyFactory$Legacy",
|
|
|
35d9f7 |
+ getAliases("PKCS1"), null);
|
|
|
35d9f7 |
+ add(p, "KeyPairGenerator", "RSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSAKeyPairGenerator$Legacy",
|
|
|
35d9f7 |
+ getAliases("PKCS1"), null);
|
|
|
35d9f7 |
+ addA(p, "Signature", "MD2withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$MD2withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "MD5withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$MD5withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA1withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA1withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA224withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA224withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA256withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA256withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA384withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA384withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA512withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA512withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA512/224withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA512_224withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA512/256withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA512_256withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA3-224withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA3_224withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA3-256withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA3_256withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA3-384withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA3_384withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "SHA3-512withRSA",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSASignature$SHA3_512withRSA", attrs);
|
|
|
35d9f7 |
|
|
|
35d9f7 |
- add(p, "KeyFactory", "RSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSAKeyFactory$Legacy",
|
|
|
35d9f7 |
- getAliases("PKCS1"), null);
|
|
|
35d9f7 |
- add(p, "KeyPairGenerator", "RSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSAKeyPairGenerator$Legacy",
|
|
|
35d9f7 |
- getAliases("PKCS1"), null);
|
|
|
35d9f7 |
- addA(p, "Signature", "MD2withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$MD2withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "MD5withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$MD5withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA1withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA1withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA224withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA224withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA256withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA256withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA384withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA384withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA512withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA512withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA512/224withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA512_224withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA512/256withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA512_256withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA3-224withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA3_224withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA3-256withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA3_256withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA3-384withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA3_384withRSA", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "SHA3-512withRSA",
|
|
|
35d9f7 |
- "sun.security.rsa.RSASignature$SHA3_512withRSA", attrs);
|
|
|
35d9f7 |
+ addA(p, "KeyFactory", "RSASSA-PSS",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSAKeyFactory$PSS", attrs);
|
|
|
35d9f7 |
+ addA(p, "KeyPairGenerator", "RSASSA-PSS",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSAKeyPairGenerator$PSS", attrs);
|
|
|
35d9f7 |
+ addA(p, "Signature", "RSASSA-PSS",
|
|
|
35d9f7 |
+ "sun.security.rsa.RSAPSSSignature", attrs);
|
|
|
35d9f7 |
+ }
|
|
|
35d9f7 |
|
|
|
35d9f7 |
- addA(p, "KeyFactory", "RSASSA-PSS",
|
|
|
35d9f7 |
- "sun.security.rsa.RSAKeyFactory$PSS", attrs);
|
|
|
35d9f7 |
- addA(p, "KeyPairGenerator", "RSASSA-PSS",
|
|
|
35d9f7 |
- "sun.security.rsa.RSAKeyPairGenerator$PSS", attrs);
|
|
|
35d9f7 |
- addA(p, "Signature", "RSASSA-PSS",
|
|
|
35d9f7 |
- "sun.security.rsa.RSAPSSSignature", attrs);
|
|
|
35d9f7 |
addA(p, "AlgorithmParameters", "RSASSA-PSS",
|
|
|
35d9f7 |
"sun.security.rsa.PSSParameters", null);
|
|
|
35d9f7 |
}
|
|
|
35d9f7 |
diff --git openjdk.orig/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
|
|
|
35d9f7 |
index 3a322854204..5a355e70cae 100644
|
|
|
35d9f7 |
--- openjdk.orig/src/java.base/share/conf/security/java.security
|
|
|
35d9f7 |
+++ openjdk/src/java.base/share/conf/security/java.security
|
|
|
35d9f7 |
@@ -86,6 +86,8 @@ fips.provider.1=SunPKCS11 ${java.home}/conf/security/nss.fips.cfg
|
|
|
35d9f7 |
fips.provider.2=SUN
|
|
|
35d9f7 |
fips.provider.3=SunEC
|
|
|
35d9f7 |
fips.provider.4=SunJSSE
|
|
|
35d9f7 |
+fips.provider.5=SunJCE
|
|
|
35d9f7 |
+fips.provider.6=SunRsaSign
|
|
|
35d9f7 |
|
|
|
35d9f7 |
#
|
|
|
35d9f7 |
# A list of preferred providers for specific algorithms. These providers will
|