Use LoadLibraryEx instead of LoadLibrary (#24)

Author: jariq

build/linux/Makefile

@@ -8,14 +8,17 @@ ARCH_FLAGS= -m32
 CFLAGS= $(ARCH_FLAGS) -Wall -Wextra -Werror -O2 -I$(SRC_DIR)
 LIBNAME=pkcs11-logger-x86.so
 
-all: init.o lock.o log.o pkcs11-logger.o translate.o utils.o
+all: dl.o init.o lock.o log.o pkcs11-logger.o translate.o utils.o
 	$(CC) $(ARCH_FLAGS) -shared -o $(LIBNAME) \
 	-Wl,-soname,$(LIBNAME) \
 	-Wl,--version-script,pkcs11-logger.version \
-	init.o lock.o log.o pkcs11-logger.o translate.o utils.o \
+	dl.o init.o lock.o log.o pkcs11-logger.o translate.o utils.o \
 	-lc -ldl -lpthread
 	strip --strip-all $(LIBNAME)
 
+dl.o: $(SRC_DIR)/dl.c $(SRC_DIR)/*.h
+	$(CC) $(CFLAGS) -fPIC -c $(SRC_DIR)/dl.c
+
 init.o: $(SRC_DIR)/init.c $(SRC_DIR)/*.h
 	$(CC) $(CFLAGS) -fPIC -c $(SRC_DIR)/init.c
 

build/macos/Makefile

@@ -8,13 +8,16 @@ ARCH_FLAGS= -target arm64-apple-macos11
 CFLAGS= $(ARCH_FLAGS) -Wall -Wextra -Werror -O2 -I$(SRC_DIR)
 LIBNAME=pkcs11-logger-arm64.dylib
 
-all: init.o lock.o log.o pkcs11-logger.o translate.o utils.o
+all: dl.o init.o lock.o log.o pkcs11-logger.o translate.o utils.o
 	$(CC) $(ARCH_FLAGS) -dynamiclib -o $(LIBNAME) \
 	-Wl,-exported_symbols_list,pkcs11-logger.symbols \
-	init.o lock.o log.o pkcs11-logger.o translate.o utils.o \
+	dl.o init.o lock.o log.o pkcs11-logger.o translate.o utils.o \
 	-lc -ldl -lpthread
 	strip -x $(LIBNAME)
 
+dl.o: $(SRC_DIR)/dl.c $(SRC_DIR)/*.h
+	$(CC) $(CFLAGS) -fPIC -c $(SRC_DIR)/dl.c
+
 init.o: $(SRC_DIR)/init.c $(SRC_DIR)/*.h
 	$(CC) $(CFLAGS) -fPIC -c $(SRC_DIR)/init.c
 

build/windows/pkcs11-logger/pkcs11-logger.vcxproj

@@ -19,6 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\src\dl.c" />
     <ClCompile Include="..\..\..\src\init.c" />
     <ClCompile Include="..\..\..\src\lock.c" />
     <ClCompile Include="..\..\..\src\log.c" />

build/windows/pkcs11-logger/pkcs11-logger.vcxproj.filters

@@ -33,6 +33,9 @@
     <ClCompile Include="..\..\..\src\utils.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\dl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\pkcs11-logger.h">

src/dl.c

@@ -0,0 +1,61 @@
+/*
+ *  Copyright 2011-2024 The Pkcs11Interop Project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*
+ *  Written for the Pkcs11Interop project by:
+ *  Jaroslav IMRICH <jimrich@jimrich.sk>
+ */
+
+
+#include "pkcs11-logger.h"
+
+
+ // Platform dependend function that loads dynamic library
+DLHANDLE pkcs11_logger_dl_open(const char* library)
+{
+#ifdef _WIN32
+    DWORD flags = 0;
+    
+    if (CK_TRUE == pkcs11_logger_utils_path_is_absolute(library))
+        flags = LOAD_WITH_ALTERED_SEARCH_PATH;
+
+    return LoadLibraryExA(library, NULL, flags);
+#else
+    return dlopen(library, RTLD_NOW | RTLD_LOCAL);
+#endif
+}
+
+
+// Platform dependend function that gets function pointer from dynamic library
+void *pkcs11_logger_dl_sym(DLHANDLE library, const char *function)
+{
+#ifdef _WIN32
+    return (void*) GetProcAddress(library, function);
+#else
+    return dlsym(library, function);
+#endif
+}
+
+
+// Platform dependend function that unloads dynamic library
+int pkcs11_logger_dl_close(DLHANDLE library)
+{
+#ifdef _WIN32
+    return FreeLibrary(library);
+#else
+    return dlclose(library);
+#endif
+}

src/init.c

@@ -105,19 +105,19 @@ int pkcs11_logger_init_orig_lib(void)
     pkcs11_logger_log_separator();
 
     // Load PKCS#11 library
-    pkcs11_logger_globals.orig_lib_handle = DLOPEN((const char *)pkcs11_logger_globals.env_var_library_path);
+    pkcs11_logger_globals.orig_lib_handle = pkcs11_logger_dl_open((const char *)pkcs11_logger_globals.env_var_library_path);
     if (NULL == pkcs11_logger_globals.orig_lib_handle)
     {
         pkcs11_logger_log("Unable to load %s", pkcs11_logger_globals.env_var_library_path);
         return PKCS11_LOGGER_RV_ERROR;
     }
 
     // Get pointer to C_GetFunctionList()
-    GetFunctionListPointer = (CK_C_GetFunctionList) DLSYM(pkcs11_logger_globals.orig_lib_handle, "C_GetFunctionList");
+    GetFunctionListPointer = (CK_C_GetFunctionList) pkcs11_logger_dl_sym(pkcs11_logger_globals.orig_lib_handle, "C_GetFunctionList");
     if (NULL == GetFunctionListPointer)
     {
         pkcs11_logger_log("Unable to find C_GetFunctionList() in %s", pkcs11_logger_globals.env_var_library_path);
-        CALL_N_CLEAR(DLCLOSE, pkcs11_logger_globals.orig_lib_handle);
+        CALL_N_CLEAR(pkcs11_logger_dl_close, pkcs11_logger_globals.orig_lib_handle);
         return PKCS11_LOGGER_RV_ERROR;
     }
 
@@ -126,7 +126,7 @@ int pkcs11_logger_init_orig_lib(void)
     if (CKR_OK != rv)
     {
         pkcs11_logger_log("Unable to call C_GetFunctionList() from %s", pkcs11_logger_globals.env_var_library_path);
-        CALL_N_CLEAR(DLCLOSE, pkcs11_logger_globals.orig_lib_handle);
+        CALL_N_CLEAR(pkcs11_logger_dl_close, pkcs11_logger_globals.orig_lib_handle);
         return PKCS11_LOGGER_RV_ERROR;
     }
 

src/pkcs11-logger.h

@@ -61,13 +61,7 @@
 #pragma pack(pop, cryptoki)
 
 // Platform dependend type for dynamically loaded library handle
-typedef HINSTANCE DLHANDLE;
-// Platform dependend function that loads dynamic library
-#define DLOPEN(lib) LoadLibraryA((lib))
-// Platform dependend function that gets function pointer from dynamic library
-#define DLSYM(lib, func) GetProcAddress((lib), (func))
-// Platform dependend function that unloads dynamic library
-#define DLCLOSE FreeLibrary
+typedef HMODULE DLHANDLE;
 
 
 #else // #ifdef _WIN32
@@ -95,12 +89,6 @@ typedef HINSTANCE DLHANDLE;
 
 // Platform dependend type for dynamically loaded library handle
 typedef void* DLHANDLE;
-// Platform dependend function that loads dynamic library
-#define DLOPEN(lib) dlopen((lib), RTLD_NOW | RTLD_LOCAL);
-// Platform dependend function that gets function pointer from dynamic library
-#define DLSYM(lib, func) dlsym((lib), (func))
-// Platform dependend function that unloads dynamic library
-#define DLCLOSE dlclose
 
 
 #endif // #ifdef _WIN32
@@ -172,6 +160,11 @@ PKCS11_LOGGER_GLOBALS;
 // Macro that removes unused argument warning
 #define IGNORE_ARG(P) (void)(P)
 
+// dl.c - declaration of functions
+DLHANDLE pkcs11_logger_dl_open(const char* library);
+void* pkcs11_logger_dl_sym(DLHANDLE library, const char* function);
+int pkcs11_logger_dl_close(DLHANDLE library);
+
 // init.c - declaration of functions
 #ifdef _WIN32
 BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved);
@@ -215,3 +208,4 @@ int pkcs11_logger_utils_str_to_long(const char *str, unsigned long *val);
 void pkcs11_logger_utils_get_current_time_str(char* buff, int buff_len);
 unsigned long pkcs11_logger_utils_get_thread_id(void);
 int pkcs11_logger_utils_get_process_id(void);
+CK_BBOOL pkcs11_logger_utils_path_is_absolute(const char* path);

src/utils.c

@@ -98,3 +98,36 @@ int pkcs11_logger_utils_get_process_id(void)
     return getpid();
 #endif
 }
+
+
+// Determines whether the path is absolute
+CK_BBOOL pkcs11_logger_utils_path_is_absolute(const char* path)
+{
+#ifdef _WIN32
+    if ((NULL == path) || (strlen(path) < 3))
+        return CK_FALSE;
+
+    char char1 = path[0];
+    char char2 = path[1];
+    char char3 = path[2];
+
+    // First character must be valid drive character
+    if ((char1 < 'A' || char1 > 'Z') && (char1 < 'a' || char1 > 'z'))
+        return CK_FALSE;
+
+    // Second character must be valid volume separator character
+    if (char2 != ':')
+        return CK_FALSE;
+
+    // Third character must be valid directory separator character
+    if (char3 != '\\' && char3 != '/')
+        return CK_FALSE;
+
+    return CK_TRUE;
+#else
+    if ((NULL == path) || (strlen(path) < 1))
+        return CK_FALSE;
+
+    return (path[0] == '/') ? CK_TRUE : CK_FALSE;
+#endif
+}