- More win32 fixes from Stef

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@785 c6295689-39f2-0310-b995-f0e70906c6a9

src/pkcs11/Makefile.mak

@@ -3,8 +3,8 @@ TOPDIR = ..\..
 HEADERS			= pkcs11.h
 HEADERSDIRFROM2		= rsaref
 
-HEADERSDIR		= $(TOPDIR)/src\include\opensc
-HEADERSDIR2		= $(TOPDIR)/src\include\opensc\rsaref
+HEADERSDIR		= $(TOPDIR)\src\include\opensc
+HEADERSDIR2		= $(TOPDIR)\src\include\opensc\rsaref
 
 TARGET                  = opensc-pkcs11.dll
 TARGET2			= libpkcs11.lib
@@ -13,7 +13,7 @@ OBJECTS			= pkcs11-global.obj pkcs11-session.obj pkcs11-object.obj misc.obj slot
 			  secretkey.obj framework-pkcs15.obj framework-pkcs15init.obj mechanism.obj
 OBJECTS2		= libpkcs11.obj
 
-all: install-headers install-headers-dir $(TARGET)
+all: install-headers install-headers-dir $(TARGET) $(TARGET2)
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 

src/pkcs11/libpkcs11.c

@@ -143,6 +143,9 @@ sys_dlsym(sc_pkcs11_module_t *mod, const char *name)
 int
 sys_dlopen(struct sc_pkcs11_module *mod, const char *name)
 {
+	if (name == NULL)
+		name = "opensc-pkcs11";
+
 	mod->_dl_handle = LoadLibrary(name);
 
 	return (mod->_dl_handle? 0 : GetLastError());

win32/readme.txt

@@ -1,4 +1,6 @@
-How to compile src\tools\pkcs15-init.c:
+How to add openssl for extended functionality
+(e.g. hash mechanisms, the pkcs15-init tool, more signature
+mechanism)
 
 - download and compile the openssl sources from
   http://www.openssl.org/source/
@@ -13,4 +15,15 @@ How to compile src\tools\pkcs15-init.c:
   - uncomment pkcs15-init.exe in the "TARGETS" line
   - Add libeay32.lib to the "link" line
 
+- In src/libopensc/Makefile.mak
+  - Add libeay32.lib to the "link" line
 
+- In src/pkcs11/Makefile.mak
+  - Add libeay32.lib to the "link" line
+  - Add openssl.obj to the "OBJECTS" line
+
+- In src/pkcs15init/Makefile.mak
+  - Add libeay32.lib to the "lib" line
+
+- In Make.rules.mak
+  - Add /DHAVE_OPENSSL to the "COPTS" line