Skip to content

Remove TLS support #1006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sabrinajlee wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −1,111
Open

Remove TLS support #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,6 @@ 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 | kda-hkdf-with-sha1 | |X | |
KeyGenerator | kda-hkdf-with-sha224 |X |X | |
KeyGenerator | kda-hkdf-with-sha256 |X |X | |
Expand Down
33 changes: 0 additions & 33 deletions src/main/java/com/ibm/crypto/plus/provider/OpenJCEPlus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
32 changes: 0 additions & 32 deletions src/main/java/com/ibm/crypto/plus/provider/OpenJCEPlusFIPS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/* =======================================================================
Expand Down
Loading