Remove TLS support

Removes support for TLS key generation in OpenJCEPlus and
OpenJCEPlusFIPS profiles. The internal parameter specs for these classes
have been deprecated.

Signed-off-by: Sabrina Lee <[email protected]>

Author: sabrinajlee

README.md

@@ -370,10 +370,10 @@ KeyGenerator                | SunTls12KeyMaterial             |X
 KeyGenerator                | SunTls12MasterSecret            |X                |X             |              |
 KeyGenerator                | SunTls12Prf                     |X                |X             |              |
 KeyGenerator                | SunTls12RsaPremasterSecret      |X                |X             |              |
-KeyGenerator                | SunTlsKeyMaterial               |X                |X             |              |
-KeyGenerator                | SunTlsMasterSecret              |X                |X             |              |
-KeyGenerator                | SunTlsPrf                       |X                |X             |              |
-KeyGenerator                | SunTlsRsaPremasterSecret        |X                |X             |              |
+KeyGenerator                | SunTlsKeyMaterial               |                 |              |              |
+KeyGenerator                | SunTlsMasterSecret              |                 |              |              |
+KeyGenerator                | SunTlsPrf                       |                 |              |              |
+KeyGenerator                | SunTlsRsaPremasterSecret        |                 |              |              |
 KeyGenerator                | kda-hkdf-with-sha1              |                 |X             |              |
 KeyGenerator                | kda-hkdf-with-sha224            |X                |X             |              |
 KeyGenerator                | kda-hkdf-with-sha256            |X                |X             |              |

src/main/java/com/ibm/crypto/plus/provider/OpenJCEPlus.java

@@ -541,39 +541,6 @@ private void registerAlgorithms(Provider jce) {
         putService(new OpenJCEPlusService(jce, "KeyGenerator", "HmacSHA3-512",
                 "com.ibm.crypto.plus.provider.HmacKeyGenerator$HmacSHA3_512", aliases));
 
-        aliases = new String[] {"TlsPrf"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTlsPrf",
-                "com.ibm.crypto.plus.provider.TlsPrfGenerator$V10", aliases));
-
-        aliases = new String[] {"Tls12Prf"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTls12Prf",
-                "com.ibm.crypto.plus.provider.TlsPrfGenerator$V12", aliases));
-
-        aliases = new String[] {"TlsRsaPremasterSecret"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTlsRsaPremasterSecret",
-                "com.ibm.crypto.plus.provider.TlsRsaPremasterSecretGenerator", aliases));
-
-        aliases = new String[] {"Tls12RsaPremasterSecret"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTls12RsaPremasterSecret",
-                "com.ibm.crypto.plus.provider.TlsRsaPremasterSecretGenerator", aliases));
-
-        aliases = new String[] {"TlsMasterSecret", "TlsExtendedMasterSecret",
-                "SunTlsExtendedMasterSecret"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTlsMasterSecret",
-                "com.ibm.crypto.plus.provider.TlsMasterSecretGenerator", aliases));
-
-        aliases = new String[] {"Tls12MasterSecret"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTls12MasterSecret",
-                "com.ibm.crypto.plus.provider.TlsMasterSecretGenerator", aliases));
-
-        aliases = new String[] {"TlsKeyMaterial"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTlsKeyMaterial",
-                "com.ibm.crypto.plus.provider.TlsKeyMaterialGenerator", aliases));
-
-        aliases = new String[] {"Tls12KeyMaterial"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTls12KeyMaterial",
-                "com.ibm.crypto.plus.provider.TlsKeyMaterialGenerator", aliases));
-
         // Used for both ChaCha20 and ChaCha20-Poly1305 ciphers
         aliases = null;
         putService(new OpenJCEPlusService(jce, "KeyGenerator", "ChaCha20",

src/main/java/com/ibm/crypto/plus/provider/OpenJCEPlusFIPS.java

@@ -343,38 +343,6 @@ private void registerAlgorithms(Provider jce) {
         putService(new OpenJCEPlusService(jce, "KeyGenerator", "HmacSHA3-512",
                 "com.ibm.crypto.plus.provider.HmacKeyGenerator$HmacSHA3_512", aliases));
 
-        aliases = new String[] {"TlsPrf"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTlsPrf",
-                "com.ibm.crypto.plus.provider.TlsPrfGenerator$V10", aliases));
-
-        aliases = new String[] {"Tls12Prf"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTls12Prf",
-                "com.ibm.crypto.plus.provider.TlsPrfGenerator$V12", aliases));
-
-        aliases = new String[] {"TlsRsaPremasterSecret"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTlsRsaPremasterSecret",
-                "com.ibm.crypto.plus.provider.TlsRsaPremasterSecretGenerator", aliases));
-
-        aliases = new String[] {"Tls12RsaPremasterSecret"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTls12RsaPremasterSecret",
-                "com.ibm.crypto.plus.provider.TlsRsaPremasterSecretGenerator", aliases));
-
-        aliases = new String[] {"TlsMasterSecret", "TlsExtendedMasterSecret",
-                "SunTlsExtendedMasterSecret"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTlsMasterSecret",
-                "com.ibm.crypto.plus.provider.TlsMasterSecretGenerator", aliases));
-
-        aliases = new String[] {"Tls12MasterSecret"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTls12MasterSecret",
-                "com.ibm.crypto.plus.provider.TlsMasterSecretGenerator", aliases));
-
-        aliases = new String[] {"TlsKeyMaterial"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTlsKeyMaterial",
-                "com.ibm.crypto.plus.provider.TlsKeyMaterialGenerator", aliases));
-
-        aliases = new String[] {"Tls12KeyMaterial"};
-        putService(new OpenJCEPlusService(jce, "KeyGenerator", "SunTls12KeyMaterial",
-                "com.ibm.crypto.plus.provider.TlsKeyMaterialGenerator", aliases));
         // Not supported in FIPS mode yet - Used for both ChaCha20 and ChaCha20-Poly1305 ciphers
 
         /* =======================================================================