--- old/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c 2016-12-13 21:44:39.000000000 -0800 +++ /dev/null 2016-12-13 21:44:39.000000000 -0800 @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#include -#include -#include - -#include - -#include - -#include "j2secmod.h" -#include "pkcs11wrapper.h" - -void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) { - void *hModule = (void*)jlong_to_ptr(jHandle); - void *fAddress = dlsym(hModule, functionName); - if (fAddress == NULL) { - char errorMessage[256]; - snprintf(errorMessage, sizeof(errorMessage), "Symbol not found: %s", functionName); - throwNullPointerException(env, errorMessage); - return NULL; - } - return fAddress; -} - -JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmod_nssGetLibraryHandle - (JNIEnv *env, jclass thisClass, jstring jLibName) -{ - void *hModule; - const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); - if (libName == NULL) { - return 0L; - } - - // look up existing handle only, do not load -#if defined(AIX) - hModule = dlopen(libName, RTLD_LAZY); -#else - hModule = dlopen(libName, RTLD_NOLOAD); -#endif - dprintf2("-handle for %s: %u\n", libName, hModule); - (*env)->ReleaseStringUTFChars(env, jLibName, libName); - return ptr_to_jlong(hModule); -} - -JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmod_nssLoadLibrary - (JNIEnv *env, jclass thisClass, jstring jLibName) -{ - void *hModule; - const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); - if (libName == NULL) { - return 0L; - } - - dprintf1("-lib %s\n", libName); - hModule = dlopen(libName, RTLD_LAZY); - (*env)->ReleaseStringUTFChars(env, jLibName, libName); - dprintf2("-handle: %u (0X%X)\n", hModule, hModule); - - if (hModule == NULL) { - throwIOException(env, dlerror()); - return 0; - } - - return ptr_to_jlong(hModule); -} --- /dev/null 2016-12-13 21:44:39.000000000 -0800 +++ new/jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c 2016-12-13 21:44:39.000000000 -0800 @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include +#include +#include + +#include + +#include + +#include "j2secmod.h" +#include "pkcs11wrapper.h" + +void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) { + void *hModule = (void*)jlong_to_ptr(jHandle); + void *fAddress = dlsym(hModule, functionName); + if (fAddress == NULL) { + char errorMessage[256]; + snprintf(errorMessage, sizeof(errorMessage), "Symbol not found: %s", functionName); + throwNullPointerException(env, errorMessage); + return NULL; + } + return fAddress; +} + +JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmod_nssGetLibraryHandle + (JNIEnv *env, jclass thisClass, jstring jLibName) +{ + void *hModule; + const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); + if (libName == NULL) { + return 0L; + } + + // look up existing handle only, do not load +#if defined(AIX) + hModule = dlopen(libName, RTLD_LAZY); +#else + hModule = dlopen(libName, RTLD_NOLOAD); +#endif + dprintf2("-handle for %s: %u\n", libName, hModule); + (*env)->ReleaseStringUTFChars(env, jLibName, libName); + return ptr_to_jlong(hModule); +} + +JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmod_nssLoadLibrary + (JNIEnv *env, jclass thisClass, jstring jLibName) +{ + void *hModule; + const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); + if (libName == NULL) { + return 0L; + } + + dprintf1("-lib %s\n", libName); + hModule = dlopen(libName, RTLD_LAZY); + (*env)->ReleaseStringUTFChars(env, jLibName, libName); + dprintf2("-handle: %u (0X%X)\n", hModule, hModule); + + if (hModule == NULL) { + throwIOException(env, dlerror()); + return 0; + } + + return ptr_to_jlong(hModule); +}