Changeset 202

Timestamp:

12/14/11 10:46:45 (5 months ago)

Author:

alonbl

Message:

Remove ltdl usage

Use native POSIX/Windows

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.mak (modified) (2 diffs)
• src/libpkcs11.c (modified) (4 diffs)

trunk/configure.ac

@@ -181 +181 @@
 fi
 
-AC_ARG_VAR([LTLIB_CFLAGS], [C compiler flags for libltdl])
-AC_ARG_VAR([LTLIB_LIBS], [linker flags for libltdl])
-if test -z "${LTLIB_LIBS}"; then
+if test "${WIN32}" != "yes"; then
         AC_CHECK_LIB(
-                [ltdl],
-                [lt_dlopen],
-                [LTLIB_LIBS="-lltdl"],
-                [AC_MSG_ERROR([ltdl not found, please install libltdl and/or libtool])]
+                [dl],
+                [dlopen],
+                ,
+                [AC_MSG_ERROR([libdl required])]
         )
-
-fi
-saved_CFLAGS="${CFLAGS}"
-CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
-AC_CHECK_HEADER(
-        [ltdl.h],
-        ,
-        [AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool])]
-)
-CFLAGS="${saved_CFLAGS}"
+fi
 
 PKG_CHECK_MODULES(
@@ -274 +263 @@
 Libraries:               ${LIBS}
 
-LTLIB_CFLAGS:            ${LTLIB_CFLAGS}
-LTLIB_LIBS:              ${LTLIB_LIBS}
 OPENSSL_CFLAGS:          ${OPENSSL_CFLAGS}
 OPENSSL_LIBS:            ${OPENSSL_LIBS}

trunk/src/Makefile.am

@@ -17 +17 @@
 dist_noinst_DATA = versioninfo.rc
 endif
-libp11_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS) $(LTLIB_CFLAGS)
-libp11_la_LIBADD = $(OPENSSL_LIBS) $(LTLIB_LIBS)
+libp11_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS)
+libp11_la_LIBADD = $(OPENSSL_LIBS)
 libp11_la_LDFLAGS = $(AM_LDFLAGS) \
         -version-info @LIBP11_LT_CURRENT@:@LIBP11_LT_REVISION@:@LIBP11_LT_AGE@ \

trunk/src/Makefile.mak

@@ -1 @@
-LIBLTDL_INC =    # E.g. /IC:\libtool-1.5.8-lib\include
-LIBLTDL_LIB =     # E.g. C:\libtool-1.5.8-lib\lib\libltdl.lib
-
 OPENSSL_INC = /IC:\openssl\include
 OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
 
-COPTS = /Zi /MD /nologo /I..\ /I. $(OPENSSL_INC) $(LIBLTDL_INC) /D_WIN32_WINNT=0x0400 /DWIN32 /DWIN32_LEAN_AND_MEAN
+COPTS = /Zi /MD /nologo /I..\ /I. $(OPENSSL_INC) /D_WIN32_WINNT=0x0400 /DWIN32 /DWIN32_LEAN_AND_MEAN
 LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
 
@@ -29 +26 @@
         type $*.exports >> $*.def
         link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) \
-                $(OBJECTS) $(OPENSSL_LIB) $(LIBLTDL_LIB) versioninfo.res
+                $(OBJECTS) $(OPENSSL_LIB) versioninfo.res
         if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2
 

trunk/src/libpkcs11.c

@@ -28 +28 @@
 #include <stdio.h>
 #include <string.h>
-#include <ltdl.h>
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <dlfcn.h>
+#endif
 #include "libp11-int.h"
 
@@ -35 +39 @@
 struct sc_pkcs11_module {
         unsigned int _magic;
-        lt_dlhandle handle;
+        void *handle;
 };
 typedef struct sc_pkcs11_module sc_pkcs11_module_t;
@@ -53 +57 @@
                 return NULL;
 
-        if (lt_dlinit() != 0)
-                return NULL;
-
         mod = (sc_pkcs11_module_t *) calloc(1, sizeof(*mod));
         mod->_magic = MAGIC;
 
-        mod->handle = lt_dlopen(mspec);
+#ifdef WIN32
+        mod->handle = LoadLibraryA(mspec);
+#else
+        mod->handle = dlopen(mspec, RTLD_NOW);
+#endif
+
         if (mod->handle == NULL)
                 goto failed;
 
-        /* Get the list of function pointers */
-        c_get_function_list = (CK_RV (*)(CK_FUNCTION_LIST_PTR_PTR))
-                                lt_dlsym(mod->handle, "C_GetFunctionList");
+#ifdef WIN32
+        c_get_function_list = (CK_C_GetFunctionList)GetProcAddress (
+                mod->handle,
+                "C_GetFunctionList"
+        );
+#else
+        {
+                /*
+                 * Make compiler happy!
+                 */
+                void *p = dlsym(
+                        mod->handle,
+                        "C_GetFunctionList"
+                );
+                memmove(
+                        &c_get_function_list, 
+                        &p,
+                        sizeof(void *)
+                );
+        }
+#endif
+
         if (!c_get_function_list)
                 goto failed;
@@ -90 +115 @@
                 return CKR_ARGUMENTS_BAD;
 
-        if (lt_dlclose(mod->handle) < 0)
-                return CKR_FUNCTION_FAILED;
+#ifdef WIN32
+        FreeLibrary(mod->handle);
+#else
+        dlclose(mod->handle);
+#endif
 
         memset(mod, 0, sizeof(*mod));
         free(mod);
 
-        lt_dlexit();
-
         return CKR_OK;
 }