2009-10-08 Marcus Brinkmann <marcus@g10code.com>

	* src/p11-initialize.c (C_Initialize): Call WSAStartup.
	* src/p11-finalize.c (CK_DEFINE_FUNCTION): Call WSACleanup.

ChangeLog

@@ -1,3 +1,8 @@
+2009-10-08  Marcus Brinkmann  <marcus@g10code.com>
+
+	* src/p11-initialize.c (C_Initialize): Call WSAStartup.
+	* src/p11-finalize.c (CK_DEFINE_FUNCTION): Call WSACleanup.
+
 2009-10-06  Marcus Brinkmann  <marcus@g10code.com>
 
 	* src/pkcs11.h: Add support for GOST.  By Andreas Jellinghaus.

src/p11-finalize.c

@@ -30,6 +30,10 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+#ifdef HAVE_W32_SYSTEM
+#define __USE_W32_SOCKETS 1
+#include <windows.h>
+#endif
 
 #include "cryptoki.h"
 
@@ -50,5 +54,9 @@ CK_DEFINE_FUNCTION(CK_RV, C_Finalize)(CK_VOID_PTR pReserved)
   scute_agent_finalize ();
   scute_locking_finalize ();
 
+#ifdef HAVE_W32_SYSTEM
+  WSACleanup ();
+#endif
+
   return CKR_OK;
 }

src/p11-initialize.c

@@ -33,6 +33,11 @@
 
 #include <stdbool.h>
 
+#ifdef HAVE_W32_SYSTEM
+#define __USE_W32_SOCKETS 1
+#include <windows.h>
+#endif
+
 #include <assuan.h>
 #include <gpg-error.h>
 
@@ -49,6 +54,11 @@
 CK_DEFINE_FUNCTION(CK_RV, C_Initialize) (CK_VOID_PTR pInitArgs)
 {
   CK_RV err;
+  WSADATA wsadat;
+	
+#ifdef HAVE_W32_SYSTEM
+  WSAStartup (0x202, &wsadat);
+#endif
 
   /* This is one of the few functions which do not need to take the
      global lock.  */