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

8206295: More reliable p11 transactions

Browse Source 
Reviewed-by: valeriep, mschoene, rhalade
This commit is contained in:
Jamil Nimeh 2018-08-15 09:36:32 -07:00
parent e67dff3af5
commit b798d67da6
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2018, 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.
@ -75,18 +75,20 @@
* Signature: (Ljava/lang/String;)V * Signature: (Ljava/lang/String;)V
*/ */
JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
(JNIEnv *env, jobject obj, jstring jPkcs11ModulePath, jstring jGetFunctionList) (JNIEnv *env, jobject obj, jstring jPkcs11ModulePath,
jstring jGetFunctionList)
{ {
HINSTANCE hModule; HINSTANCE hModule;
CK_C_GetFunctionList C_GetFunctionList; CK_C_GetFunctionList C_GetFunctionList;
CK_RV rv; CK_RV rv = CK_ASSERT_OK;
ModuleData *moduleData; ModuleData *moduleData;
jobject globalPKCS11ImplementationReference; jobject globalPKCS11ImplementationReference;
LPVOID lpMsgBuf; LPVOID lpMsgBuf = NULL;
char *exceptionMessage; char *exceptionMessage = NULL;
const char *getFunctionListStr; const char *getFunctionListStr;
const char *libraryNameStr = (*env)->GetStringUTFChars(env, jPkcs11ModulePath, 0); const char *libraryNameStr = (*env)->GetStringUTFChars(env,
jPkcs11ModulePath, 0);
TRACE1("DEBUG: connect to PKCS#11 module: %s ... ", libraryNameStr); TRACE1("DEBUG: connect to PKCS#11 module: %s ... ", libraryNameStr);
@ -106,21 +108,24 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
0, 0,
NULL NULL
); );
exceptionMessage = (char *) malloc(sizeof(char) * (strlen((LPTSTR) lpMsgBuf) + strlen(libraryNameStr) + 1)); exceptionMessage = (char *) malloc(sizeof(char) *
(strlen((LPTSTR) lpMsgBuf) + strlen(libraryNameStr) + 1));
if (exceptionMessage == NULL) {
throwOutOfMemoryError(env, 0);
goto cleanup;
}
strcpy(exceptionMessage, (LPTSTR) lpMsgBuf); strcpy(exceptionMessage, (LPTSTR) lpMsgBuf);
strcat(exceptionMessage, libraryNameStr); strcat(exceptionMessage, libraryNameStr);
throwIOException(env, (LPTSTR) exceptionMessage); throwIOException(env, (LPTSTR) exceptionMessage);
/* Free the buffer. */ goto cleanup;
free(exceptionMessage);
LocalFree(lpMsgBuf);
return;
} }
/* /*
* Get function pointer to C_GetFunctionList * Get function pointer to C_GetFunctionList
*/ */
getFunctionListStr = (*env)->GetStringUTFChars(env, jGetFunctionList, 0); getFunctionListStr = (*env)->GetStringUTFChars(env, jGetFunctionList, 0);
C_GetFunctionList = (CK_C_GetFunctionList) GetProcAddress(hModule, getFunctionListStr); C_GetFunctionList = (CK_C_GetFunctionList) GetProcAddress(hModule,
getFunctionListStr);
(*env)->ReleaseStringUTFChars(env, jGetFunctionList, getFunctionListStr); (*env)->ReleaseStringUTFChars(env, jGetFunctionList, getFunctionListStr);
if (C_GetFunctionList == NULL) { if (C_GetFunctionList == NULL) {
FormatMessage( FormatMessage(
@ -135,24 +140,37 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
NULL NULL
); );
throwIOException(env, (LPTSTR) lpMsgBuf); throwIOException(env, (LPTSTR) lpMsgBuf);
/* Free the buffer. */ goto cleanup;
LocalFree( lpMsgBuf );
return;
} }
/* /*
* Get function pointers to all PKCS #11 functions * Get function pointers to all PKCS #11 functions
*/ */
moduleData = (ModuleData *) malloc(sizeof(ModuleData)); moduleData = (ModuleData *) malloc(sizeof(ModuleData));
if (moduleData == NULL) {
throwOutOfMemoryError(env, 0);
goto cleanup;
}
moduleData->hModule = hModule; moduleData->hModule = hModule;
moduleData->applicationMutexHandler = NULL; moduleData->applicationMutexHandler = NULL;
rv = (C_GetFunctionList)(&(moduleData->ckFunctionListPtr)); rv = (C_GetFunctionList)(&(moduleData->ckFunctionListPtr));
globalPKCS11ImplementationReference = (*env)->NewGlobalRef(env, obj); globalPKCS11ImplementationReference = (*env)->NewGlobalRef(env, obj);
putModuleEntry(env, globalPKCS11ImplementationReference, moduleData); putModuleEntry(env, globalPKCS11ImplementationReference, moduleData);
(*env)->ReleaseStringUTFChars(env, jPkcs11ModulePath, libraryNameStr);
TRACE0("FINISHED\n"); TRACE0("FINISHED\n");
cleanup:
/* Free up allocated buffers we no longer need */
if (lpMsgBuf != NULL) {
LocalFree( lpMsgBuf );
}
if (libraryNameStr != NULL) {
(*env)->ReleaseStringUTFChars(env, jPkcs11ModulePath, libraryNameStr);
}
if (exceptionMessage != NULL) {
free(exceptionMessage);
}
if(ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; } if(ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }
} }