Skip to content

Remove forgotten dead code from #13 and #14 #21

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

Merged
merged 1 commit into from
Nov 23, 2022
Merged

Remove forgotten dead code from #13 and #14 #21

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
1 change: 0 additions & 1 deletion src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
import javax.net.ssl.*;
import jdk.internal.access.SharedSecrets;
import sun.security.action.GetPropertyAction;
import sun.security.provider.certpath.AlgorithmChecker;
import sun.security.validator.Validator;
Expand Down
6 changes: 1 addition & 5 deletions src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ final class FIPSKeyImporter {
private static volatile Provider sunECProvider = null;
private static final ReentrantLock sunECProviderLock = new ReentrantLock();

private static volatile KeyFactory DHKF = null;
private static final ReentrantLock DHKFLock = new ReentrantLock();

static Long importKey(SunPKCS11 sunPKCS11, long hSession, CK_ATTRIBUTE[] attributes)
throws PKCS11Exception {
long keyID = -1;
Expand Down Expand Up @@ -319,8 +316,7 @@ private static void exportPrivateKey(
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
);
RSAUtil.KeyType.RSA, "PKCS#8", plainExportedKey);
CK_ATTRIBUTE attr;
if ((attr = sensitiveAttrs.get(CKA_PRIVATE_EXPONENT)) != null) {
attr.pValue = rsaPKey.getPrivateExponent().toByteArray();
Expand Down