stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8328785: IOException: Symbol not found: C_GetInterface for PKCS11 interface prior to V3.0

Browse Source 
Reviewed-by: djelinski, weijun
This commit is contained in:
Valerie Peng 2024-04-09 21:51:51 +00:00
parent 316361b95c
commit 6276789fb5
1 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
*/ */
/* Copyright (c) 2002 Graz University of Technology. All rights reserved. /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
@ -103,7 +103,6 @@ JNIEXPORT jobject JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
/* /*
* Load the PKCS #11 DLL * Load the PKCS #11 DLL
*/ */
dlerror(); /* clear any old error message not fetched */
#ifdef DEBUG #ifdef DEBUG
hModule = dlopen(libraryNameStr, RTLD_NOW); hModule = dlopen(libraryNameStr, RTLD_NOW);
#else #else
@ -124,9 +123,6 @@ JNIEXPORT jobject JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
goto cleanup; goto cleanup;
} }
// clear any old error message not fetched
dlerror();
#ifdef DEBUG #ifdef DEBUG
C_GetInterfaceList = (CK_C_GetInterfaceList) dlsym(hModule, C_GetInterfaceList = (CK_C_GetInterfaceList) dlsym(hModule,
"C_GetInterfaceList"); "C_GetInterfaceList");
@ -158,47 +154,42 @@ JNIEXPORT jobject JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
} }
#endif #endif
if (jGetFunctionList != NULL) { // if none specified, then we try 3.0 API first before trying 2.40
if (jGetFunctionList == NULL) {
C_GetInterface = (CK_C_GetInterface) dlsym(hModule, "C_GetInterface");
if (C_GetInterface != NULL) {
TRACE0("Connect: Found C_GetInterface func\n");
rv = (C_GetInterface)(NULL, NULL, &interface, 0L);
// don't use ckAssertReturnValueOK as we want to continue trying
// C_GetFunctionList() or method named by "getFunctionListStr"
if (rv == CKR_OK) {
goto setModuleData;
}
}
getFunctionListStr = "C_GetFunctionList";
} else {
getFunctionListStr = (*env)->GetStringUTFChars(env, getFunctionListStr = (*env)->GetStringUTFChars(env,
jGetFunctionList, 0); jGetFunctionList, 0);
if (getFunctionListStr == NULL) { if (getFunctionListStr == NULL) {
goto cleanup; goto cleanup;
} }
C_GetFunctionList = (CK_C_GetFunctionList) dlsym(hModule, }
dlerror(); // clear any old error message not fetched
C_GetFunctionList = (CK_C_GetFunctionList) dlsym(hModule,
getFunctionListStr); getFunctionListStr);
if (C_GetFunctionList == NULL) {
if ((systemErrorMessage = dlerror()) != NULL){ if ((systemErrorMessage = dlerror()) != NULL){
TRACE2("Connect: error finding %s func: %s\n", getFunctionListStr,
systemErrorMessage);
p11ThrowIOException(env, systemErrorMessage); p11ThrowIOException(env, systemErrorMessage);
goto cleanup; } else {
}
if (C_GetFunctionList == NULL) {
TRACE1("Connect: No %s func\n", getFunctionListStr); TRACE1("Connect: No %s func\n", getFunctionListStr);
p11ThrowIOException(env, "ERROR: C_GetFunctionList == NULL"); p11ThrowIOException(env, "ERROR: C_GetFunctionList == NULL");
goto cleanup;
} }
TRACE1("Connect: Found %s func\n", getFunctionListStr); goto cleanup;
} else {
// if none specified, then we try 3.0 API first before trying 2.40
C_GetInterface = (CK_C_GetInterface) dlsym(hModule, "C_GetInterface");
if ((C_GetInterface != NULL) && (dlerror() == NULL)) {
TRACE0("Connect: Found C_GetInterface func\n");
rv = (C_GetInterface)(NULL, NULL, &interface, 0L);
if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) {
goto setModuleData;
}
}
C_GetFunctionList = (CK_C_GetFunctionList) dlsym(hModule,
"C_GetFunctionList");
if ((systemErrorMessage = dlerror()) != NULL){
p11ThrowIOException(env, systemErrorMessage);
goto cleanup;
}
if (C_GetFunctionList == NULL) {
TRACE0("Connect: No C_GetFunctionList func\n");
p11ThrowIOException(env, "ERROR: C_GetFunctionList == NULL");
goto cleanup;
}
TRACE0("Connect: Found C_GetFunctionList func\n");
} }
TRACE1("Connect: Found %s func\n", getFunctionListStr);
setModuleData: setModuleData:
/* /*