Skip to content

Commit 0cb2359

Browse files
committed
Import required enum and remove unused variables
Import PKCS11Exception return values enum, to adapt code for the local backport of openjdk/jdk@7ab6dc8 Remove unused variables forgotten in rh-openjdk/jdk#14 (see rh-openjdk/jdk#21)
1 parent c9c517a commit 0cb2359

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import sun.security.pkcs11.wrapper.CK_ATTRIBUTE;
4646
import sun.security.pkcs11.wrapper.CK_MECHANISM;
4747
import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
48+
import static sun.security.pkcs11.wrapper.PKCS11Exception.*;
4849
import sun.security.pkcs11.wrapper.PKCS11Exception;
4950
import sun.security.rsa.RSAPrivateCrtKeyImpl;
5051
import sun.security.rsa.RSAUtil;
@@ -71,9 +72,6 @@ final class FIPSKeyImporter {
7172
private static volatile Provider sunECProvider = null;
7273
private static final ReentrantLock sunECProviderLock = new ReentrantLock();
7374

74-
private static volatile KeyFactory DHKF = null;
75-
private static final ReentrantLock DHKFLock = new ReentrantLock();
76-
7775
static Long importKey(SunPKCS11 sunPKCS11, long hSession, CK_ATTRIBUTE[] attributes)
7876
throws PKCS11Exception {
7977
long keyID = -1;

0 commit comments

Comments
 (0)