Adjust code between 17u and 11u

franferrax · franferrax · commit 833d9b39acea · 2022-11-03T20:13:40.000-03:00
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
@@ -37,7 +37,7 @@
 import javax.crypto.interfaces.*;
 import javax.crypto.spec.*;
 
-import jdk.internal.access.SharedSecrets;
+import jdk.internal.misc.SharedSecrets;
 
 import sun.security.rsa.RSAUtil.KeyType;
 import sun.security.rsa.RSAPublicKeyImpl;
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
@@ -160,7 +160,7 @@ public static synchronized PKCS11 getInstance(String pkcs11ModulePath,
            String functionList, CK_C_INITIALIZE_ARGS pInitArgs,
            boolean omitInitialize) throws IOException, PKCS11Exception {
         return getInstance(pkcs11ModulePath, functionList,
-                           pInitArgs, omitInitialize, null);
+                           pInitArgs, omitInitialize, null, null);
     }
 
     public static synchronized PKCS11 getInstance(String pkcs11ModulePath,

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public static synchronized PKCS11 getInstance(String pkcs11ModulePath,`
`160`	`160`	`String functionList, CK_C_INITIALIZE_ARGS pInitArgs,`
`161`	`161`	`boolean omitInitialize) throws IOException, PKCS11Exception {`
`162`	`162`	`return getInstance(pkcs11ModulePath, functionList,`
`163`		`- pInitArgs, omitInitialize, null);`
	`163`	`+ pInitArgs, omitInitialize, null, null);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`public static synchronized PKCS11 getInstance(String pkcs11ModulePath,`