Changeset 44cf3d0 in OpenSC

Timestamp:

04/12/11 07:40:12 (14 months ago)

Author:

martin <martin@…>

Branches:

master, staging

Children:

7c17247

Parents:

577ccdbf

git-author:

martin <martin@…> (04/12/11 07:40:12)

git-committer:

martin <martin@…> (04/12/11 07:40:12)

Message:

MiniDriver: rename cardmod to minidriver in source.
Also change some grammar, whitespace (reported by git) and wording (Opensc->OpenSC) issues.
Add some comments here and there.

See  http://www.opensc-project.org/pipermail/opensc-devel/2011-April/016261.html

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

Files:

• configure.ac (modified) (6 diffs)
• etc/opensc.conf.in (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.mak (modified) (1 diff)
• src/cardmod/Makefile.am (deleted)
• src/libopensc/ctx.c (modified) (2 diffs)
• src/libopensc/opensc.h (modified) (1 diff)
• src/libopensc/reader-pcsc.c (modified) (1 diff)
• src/minidriver/Makefile.am (added)
• src/minidriver/Makefile.mak (moved) (moved from src/cardmod/Makefile.mak) (2 diffs)
• src/minidriver/minidriver-westcos.reg (moved) (moved from src/cardmod/cardmod-westcos.reg) (1 diff)
• src/minidriver/minidriver.c (moved) (moved from src/cardmod/cardmod.c) (119 diffs)
• src/minidriver/minidriver.exports (moved) (moved from src/cardmod/cardmod.exports)
• src/minidriver/opensc-minidriver.inf.in (moved) (moved from src/cardmod/cardmod.inf.in) (1 diff)
• win32/Make.rules.mak (modified) (1 diff)
• win32/OpenSC.wxs.in (modified) (1 diff)

configure.ac

@@ -129 +129 @@
 
 AC_ARG_ENABLE(
-        [cardmod],
-        [AS_HELP_STRING([--enable-cardmod],[enable cardmod module on Windows @<:@disabled@:>@])],
-        ,
-        [enable_cardmod="no"]
+        [minidriver],
+        [AS_HELP_STRING([--enable-minidriver],[enable minidriver on Windows @<:@disabled@:>@])],
+        ,
+        [enable_minidriver="no"]
 )
 
@@ -294 +294 @@
 fi
 
-if test "${enable_cardmod}" = "yes"; then
+if test "${enable_minidriver}" = "yes"; then
         dnl win32 special test for minidriver
         AC_CHECK_HEADER(
                 [cardmod.h],
                 ,
-                [AC_MSG_ERROR([cardmod.h is not found and required for cardmod])]
+                [AC_MSG_ERROR([cardmod.h is not found and required for minidriver])]
         )
-        AC_DEFINE([ENABLE_CARDMOD], [1], [Enable cardmod support])
+        AC_DEFINE([ENABLE_MINIDRIVER], [1], [Enable minidriver support])
 fi
 
@@ -523 +523 @@
 if test "${enable_ctapi}" = "yes"; then
         OPENSC_FEATURES="${OPENSC_FEATURES} ctapi"
-fi
-if test "${enable_cardmod}" = "yes"; then
-        OPENSC_FEATURES="${OPENSC_FEATURES} cardmod"
 fi
 
@@ -565 +562 @@
 AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
 AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"])
-AM_CONDITIONAL([ENABLE_CARDMOD], [test "${enable_cardmod}" = "yes"])
+AM_CONDITIONAL([ENABLE_MINIDRIVER], [test "${enable_minidriver}" = "yes"])
 
 if test "${enable_pedantic}" = "yes"; then
@@ -593 +590 @@
         src/tests/regression/Makefile
         src/tools/Makefile
-        src/cardmod/Makefile
-        src/cardmod/cardmod.inf
+        src/minidriver/Makefile
+        src/minidriver/opensc-minidriver.inf
         win32/Makefile
         win32/versioninfo.rc
@@ -621 +618 @@
 OpenCT support:          ${enable_openct}
 CT-API support:          ${enable_ctapi}
-cardmod support:         ${enable_cardmod}
+minidriver support:      ${enable_minidriver}
 
 PC/SC default provider:  ${DEFAULT_PCSC_PROVIDER}

etc/opensc.conf.in

@@ -448 +448 @@
 }
 
+# XXX: remove cardmod pseudodriver
 app cardmod {
         # cardmod app name use special pcsc reader subset 
@@ -458 +459 @@
         }
 }
-

src/Makefile.am

@@ -4 +4 @@
 # Order IS important
 SUBDIRS = common scconf pkcs15init libopensc pkcs11 \
-        tools tests cardmod
+        tools tests minidriver

src/Makefile.mak

@@ -5 +5 @@
 SUBDIRS = common scconf pkcs15init libopensc pkcs11 tools tests
 
-!IF "$(MINIDRIVER_DEF)" == "/DENABLE_CARDMOD"
-SUBDIRS = $(SUBDIRS) cardmod
-!ENDIF
-
-!IF "$(WIX_MSI_DEF)" == "/DBUILD_MSI"
-SUBDIRS = $(SUBDIRS) "$(TOPDIR)\etc"
-SUBDIRS = $(SUBDIRS) "$(TOPDIR)\win32\opensc-msi"
+!IF "$(MINIDRIVER_DEF)" == "/DENABLE_MINIDRIVER"
+SUBDIRS = $(SUBDIRS) minidriver
 !ENDIF
 

src/libopensc/ctx.c

@@ -655 +655 @@
 #ifdef ENABLE_PCSC
         ctx->reader_driver = sc_get_pcsc_driver();
-        #ifdef ENABLE_CARDMOD
+/* XXX: remove cardmod pseudoreader driver */
+#ifdef ENABLE_MINIDRIVER
         if(strcmp(ctx->app_name, "cardmod") == 0) {
                 ctx->reader_driver = sc_get_cardmod_driver();
         }
-        #endif
+#endif
 #elif ENABLE_CTAPI
         ctx->reader_driver = sc_get_ctapi_driver();
@@ -682 +683 @@
 }
 
-/* use by cardmod to pass in provided handles to reader-pcsc */
-int sc_ctx_use_reader(sc_context_t *ctx, void * pcsc_context_handle, void * pcsc_card_handle)
+/* Used by minidriver to pass in provided handles to reader-pcsc */
+int sc_ctx_use_reader(sc_context_t *ctx, void *pcsc_context_handle, void *pcsc_card_handle)
 {
         SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_NORMAL);

src/libopensc/opensc.h

@@ -389 +389 @@
         /* Reset a reader */
         int (*reset)(struct sc_reader *, int);
-        /* used to pass in reader handles in cardmod mode */
-        int (*use_reader)(struct sc_context *ctx, void * pcsc_context_handle, void * pcsc_card_handle);
+        /* Used to pass in PC/SC handles to minidriver */
+        int (*use_reader)(struct sc_context *ctx, void *pcsc_context_handle, void *pcsc_card_handle);
 };
 

src/libopensc/reader-pcsc.c

@@ -1552 +1552 @@
 }
 
-#ifdef ENABLE_CARDMOD
+#ifdef ENABLE_MINIDRIVER
 
 #define SCARD_CLASS_SYSTEM     0x7fff 

src/minidriver/Makefile.mak

@@ -1 +1 @@
 TOPDIR = ..\..
 
-TARGET = opensc-cardmod.dll
-OBJECTS = cardmod.obj 
+TARGET = opensc-minidriver.dll
+OBJECTS = opensc-minidriver.obj
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
@@ -11 +11 @@
         echo LIBRARY $* > $*.def
         echo EXPORTS >> $*.def
-        type cardmod.exports >> $*.def
+        type minidriver.exports >> $*.def
         link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) ..\libopensc\opensc_a.lib $(ZLIB_LIB) $(OPENSSL_LIB) ..\common\libscdl.lib ws2_32.lib gdi32.lib advapi32.lib winscard.lib Crypt32.lib User32.lib
         if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2

src/minidriver/minidriver-westcos.reg

@@ -1 @@
-Windows Registry Editor Version 5.00
+Windows Registry Editor Version 5.00
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Cryptography\Calais\SmartCards\CEV WESTCOS]
-"80000001"="opensc-cardmod.dll"
+"80000001"="opensc-minidriver.dll"
 "ATR"=hex:3f,69,00,00,00,64,01,00,00,00,80,90,00
 "ATRMask"=hex:ff,ff,ff,ff,ff,ff,ff,00,00,00,f0,ff,ff
 "Crypto Provider"="Microsoft Base Smart Card Crypto Provider"
-

src/minidriver/minidriver.c

@@ -1 +1 @@
 /*
- * cardmod.c: card module support for opensc
+ * minidriver.c: OpenSC minidriver
  *
- * Copyright (C) 2009,2010 francois.leblanc@cev-sa.com 
+ * Copyright (C) 2009,2010 francois.leblanc@cev-sa.com
  *
  * This library is free software; you can redistribute it and/or
@@ -20 +20 @@
 
 /*
- * This module require "cardmod.h" from CNG SDK or plattform SDK to
- * be build. 
+ * This module requires "cardmod.h" from CNG SDK or platform SDK to build.
  */
+
+#include "config.h"
+#ifdef ENABLE_MINIDRIVER
 
 #ifdef _MANAGED
 #pragma managed(push, off)
 #endif
-
-#include "config.h"
 
 #include <stdio.h>
@@ -64 +64 @@
 {
         char *pin;
-        
+
         sc_pkcs15_object_t *cert_objs[32];
         int cert_count;
@@ -71 +71 @@
         sc_pkcs15_object_t *pin_objs[8];
         int pin_count;
-        
+
         sc_context_t *ctx;
         sc_reader_t *reader;
@@ -86 +86 @@
         SCARDCONTEXT hSCardCtx;
         SCARDHANDLE hScard;
-        
+
 }VENDOR_SPECIFIC;
 
@@ -98 +98 @@
 /* #define CARDMOD_LOW_LEVEL_DEBUG 1 */
 #ifdef CARDMOD_LOW_LEVEL_DEBUG
-/* Use a simplied log to get all messages including messages 
+/* Use a simplied log to get all messages including messages
  * before opensc is loaded. The file must be modifiable by all
- * users as we maybe called under lsa or user. Note data from 
+ * users as we maybe called under lsa or user. Note data from
  * multiple process and threads may get intermingled.
  * flush to get last message before ann crash
@@ -119 +119 @@
         return;
         }
-#endif   
+#endif
 
         va_start(arg, format);
@@ -140 +140 @@
         }
         va_end(arg);
-} 
+}
 
 static void loghex(PCARD_DATA pCardData, int level, PBYTE data, int len)
@@ -148 +148 @@
         int i, a;
         unsigned char * p;
-        
+
         logprintf(pCardData, level, "--- %p:%d\n", data, len);
 
@@ -176 +176 @@
         if (i%32 != 0)
                 logprintf(pCardData, level, " %04X  %s\n", a, line);
-}  
+}
+
 static void print_werror(PCARD_DATA pCardData, char *str)
 {
@@ -191 +192 @@
 
 /*
- * check if the card has been removed, or the 
+ * check if the card has been removed, or the
  * caller has changed the handles.
  * if so, then free up all previous card info
@@ -205 +206 @@
         if(!pCardData)
                 return SCARD_E_INVALID_PARAMETER;
-        
+
         vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
         if(!vs)
@@ -212 +213 @@
         logprintf(pCardData, 7, "pCardData->hSCardCtx:0x%08X hScard:0x%08X\n",
                         pCardData->hSCardCtx, pCardData->hScard);
-                        
-        
-        if (pCardData->hSCardCtx != vs->hSCardCtx 
+
+        if (pCardData->hSCardCtx != vs->hSCardCtx
                                 || pCardData->hScard != vs->hScard) {
-                        logprintf (pCardData, 1, "HANDLES CHANGED from 0x%08X 0x%08X\n", vs->hSCardCtx, vs->hScard);  
+                        logprintf (pCardData, 1, "HANDLES CHANGED from 0x%08X 0x%08X\n", vs->hSCardCtx, vs->hScard);
 
                          r = disassociate_card(pCardData);
@@ -222 +222 @@
                          r = associate_card(pCardData); /* need to check return codes */
                          logprintf(pCardData, 1, "associate_card r = 0x%08X\n");
-                
         } else
 
@@ -229 +228 @@
                 r = sc_detect_card_presence(vs->reader);
                 logprintf(pCardData, 2, "check_reader_status r=%d flags 0x%08X\n",
-                        r, vs->reader->flags); 
+                        r, vs->reader->flags);
         }
         return SCARD_S_SUCCESS;
@@ -256 +255 @@
         int i;
 
-        if (!pCardData) 
+        if (!pCardData)
                 return SCARD_E_INVALID_PARAMETER;
 
@@ -328 +327 @@
                 loghex(pCardData, 5, prkey_info->subject.value, prkey_info->subject.len);
         }
-                
+
         for(i = 0; i < vs->cert_count; i++)
         {
@@ -337 +336 @@
                 sc_pkcs15_free_certificate(cert);
         }
-                
+
         for(i = 0; i < vs->pin_count; i++)
         {
-                const char *pin_flags[] = 
+                const char *pin_flags[] =
                 {
                         "case-sensitive", "local", "change-disabled",
@@ -349 +348 @@
                 };
                 const char *pin_types[] = {"bcd", "ascii-numeric", "UTF-8",
-                        "halfnibble bcd", "iso 9664-1"}; 
+                        "halfnibble bcd", "iso 9664-1"};
                 const struct sc_pkcs15_object *obj = vs->pin_objs[i];
                 const struct sc_pkcs15_pin_info *pin = (const struct sc_pkcs15_pin_info *) (obj->data);
@@ -391 +390 @@
 
         vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
-        
+
         if(!vs)
                 return SCARD_E_INVALID_PARAMETER;
 
         disassociate_card(pCardData);
-        
+
         if(vs->ctx)
         {
@@ -413 +412 @@
 }
 
-DWORD WINAPI CardQueryCapabilities(__in PCARD_DATA pCardData, 
+DWORD WINAPI CardQueryCapabilities(__in PCARD_DATA pCardData,
         __in PCARD_CAPABILITIES  pCardCapabilities)
 {
@@ -426 +425 @@
                 && pCardCapabilities->dwVersion != 0)
                         return ERROR_REVISION_MISMATCH;
-        
+
         pCardCapabilities->dwVersion = CARD_CAPABILITIES_CURRENT_VERSION;
         pCardCapabilities->fCertificateCompression = TRUE;
@@ -470 +469 @@
         sc_pkcs15_cert_t *cert = NULL;
         VENDOR_SPECIFIC *vs = NULL;
-        
+
         PUBKEYSTRUCT_BASE *oh = NULL;
         PUBKEYSTRUCT_BASE *oh2 = NULL;
@@ -479 +478 @@
         DWORD ret;
         sc_pkcs15_pubkey_t *pubkey = NULL;
-        
+
         logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
         logprintf(pCardData, 1, "CardGetContainerInfo bContainerIndex=%u, dwFlags=0x%08X, " \
@@ -489 +488 @@
         if (!pContainerInfo) SCARD_E_INVALID_PARAMETER;
         if (dwFlags) return SCARD_E_INVALID_PARAMETER;
-        if (pContainerInfo->dwVersion < 0 
-                || pContainerInfo->dwVersion >  CONTAINER_INFO_CURRENT_VERSION) 
+        if (pContainerInfo->dwVersion < 0
+                || pContainerInfo->dwVersion >  CONTAINER_INFO_CURRENT_VERSION)
                         return ERROR_REVISION_MISMATCH;
 
         vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
-        
+
         check_reader_status(pCardData);
 
         if(bContainerIndex>=vs->cert_count)
                 return SCARD_E_INVALID_PARAMETER;
-        
+
         r = sc_pkcs15_read_certificate(vs->p15card, \
                 (struct sc_pkcs15_cert_info *)(vs->cert_objs[bContainerIndex]->data), \
@@ -514 +513 @@
         {
                 int modulus = compute_keybits(&(pubkey->u.rsa.modulus));
-                
+
                 PCCERT_CONTEXT cer = CertCreateCertificateContext(X509_ASN_ENCODING \
                         | PKCS_7_ASN_ENCODING, cert->data, cert->data_len);
@@ -524 +523 @@
                 RSA_CSP_PUBLICKEYBLOB, pinf->PublicKey.pbData, \
                 pinf->PublicKey.cbData , 0, oh, &sz);
-                sz2 = sz; 
+                sz2 = sz;
 
                 oh = (PUBKEYSTRUCT_BASE*)pCardData->pfnCspAlloc(sz);
@@ -533 +532 @@
                                 RSA_CSP_PUBLICKEYBLOB, pinf->PublicKey.pbData, \
                                 pinf->PublicKey.cbData , 0, oh, &sz);
-                
+
                         oh->publickeystruc.aiKeyAlg = CALG_RSA_SIGN;
                         pContainerInfo->cbSigPublicKey = sz;
@@ -577 +576 @@
 
         if(!pCardData) return SCARD_E_INVALID_PARAMETER;
-        
+
         vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
 
@@ -594 +593 @@
         if (cbPin < 4 || cbPin > 12) return SCARD_W_WRONG_CHV;
 
-        if (wcscmp(wszCARD_USER_ADMIN,pwszUserId) == 0) 
+        if (wcscmp(wszCARD_USER_ADMIN,pwszUserId) == 0)
         {
                 return SCARD_W_WRONG_CHV;
         }
-        
+
         wcstombs(type, pwszUserId, 100);
         type[10] = 0;
-        
+
         logprintf(pCardData, 1, "CardAuthenticatePin %.20s, %d, %d\n", NULLSTR(type), \
                 cbPin, (pcAttemptsRemaining==NULL?-2:*pcAttemptsRemaining));
-        
+
         pin_obj = vs->pin_objs[0];
         r = sc_pkcs15_verify_pin(vs->p15card, pin_obj, (const u8 *) pbPin, cbPin);
-        if (r) 
+        if (r)
         {
                 logprintf(pCardData, 1, "PIN code verification failed: %s\n", sc_strerror(r));
-                
-                if(pcAttemptsRemaining) 
+
+                if(pcAttemptsRemaining)
                 {
                         (*pcAttemptsRemaining) = -1;
@@ -617 +616 @@
                 return SCARD_W_WRONG_CHV;
         }
-        
+
         logprintf(pCardData, 3, "Pin code correct.\n");
-        
+
         SET_PIN(vs->cardFiles.file_cardcf.bPinsFreshness, ROLE_USER);
         logprintf(pCardData, 3, "PinsFreshness = %d\n",
                 vs->cardFiles.file_cardcf.bPinsFreshness);
-        
-        return SCARD_S_SUCCESS; 
+
+        return SCARD_S_SUCCESS;
 }
 
@@ -684 +683 @@
         logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
         logprintf(pCardData, 1, "CardDeauthenticate%S %d\n", NULLWSTR(pwszUserId),
-                        dwFlags); 
+                        dwFlags);
 
         if(!pCardData) return SCARD_E_INVALID_PARAMETER;
@@ -763 +762 @@
         if(pszDirectoryName == NULL)
         {
-                if(strcmp(pszFileName, "cardid") == 0) 
+                if(strcmp(pszFileName, "cardid") == 0)
                 {
                         *pcbData = strlen(vs->p15card->tokeninfo->serial_number) + 10;
@@ -771 +770 @@
                                 return SCARD_E_NO_MEMORY;
                         }
-                        
+
                         strcpy(*ppbData, vs->p15card->tokeninfo->serial_number);
-                        
+
                         logprintf(pCardData, 7, "return cardid ");
                         loghex(pCardData, 7, *ppbData, *pcbData);
@@ -780 +779 @@
                 }
 
-                if(strcmp(pszFileName, "cardcf") == 0) 
+                if(strcmp(pszFileName, "cardcf") == 0)
                 {
                         *pcbData = sizeof(vs->cardFiles.file_cardcf);
@@ -788 +787 @@
                                 return SCARD_E_NO_MEMORY;
                         }
-                        
+
                         memcpy(*ppbData, &(vs->cardFiles.file_cardcf), *pcbData);
 
@@ -798 +797 @@
 
         }
-        
+
         if(pszDirectoryName != NULL && strcmp(pszDirectoryName, "mscp") == 0)
         {
@@ -804 +803 @@
                 sc_pkcs15_cert_t *cert = NULL;
 
-                if(strcmp(pszFileName, "cmapfile") == 0) 
+                if(strcmp(pszFileName, "cmapfile") == 0)
                 {
                         PCONTAINER_MAP_RECORD p;
                         sc_pkcs15_pubkey_t *pubkey = NULL;
-                        
+
                         *pcbData = 32*sizeof(CONTAINER_MAP_RECORD);
                         *ppbData = pCardData->pfnCspAlloc(*pcbData);
@@ -815 +814 @@
                                 return SCARD_E_NO_MEMORY;
                         }
-                        
+
                         memset(*ppbData, 0, *pcbData);
-                        
+
                         for(i = 0, p = (PCONTAINER_MAP_RECORD)*ppbData; \
                                 i < vs->cert_count; i++,p++)
@@ -823 +822 @@
                                 struct sc_pkcs15_cert_info *cert_info = (sc_pkcs15_cert_info_t *)vs->cert_objs[i]->data;
                                 sc_pkcs15_cert_t *cert = NULL;
-                                
+
                                 r = sc_pkcs15_read_certificate(vs->p15card, cert_info, &cert);
                                 logprintf(pCardData, 2, "sc_pkcs15_read_certificate return %d\n", r);
@@ -835 +834 @@
                                         struct sc_card *card = vs->p15card->card;
                                         char guid[MAX_CONTAINER_NAME_LEN + 1];
-        
+
                                         r = sc_pkcs15_get_guid(vs->p15card, vs->cert_objs[i], guid, sizeof(guid));
                                         if (r)
@@ -841 +840 @@
 
                                         logprintf(pCardData, 7, "Guid=%s\n", guid);
-                                        
+
                                         mbstowcs(p->wszGuid, guid, MAX_CONTAINER_NAME_LEN + 1);
-                                        
+
                                         p->bFlags += CONTAINER_MAP_VALID_CONTAINER;
                                         if(i == 0)
@@ -865 +864 @@
                         return SCARD_S_SUCCESS;
                 }
-                
+
                 if(sscanf(pszFileName, "ksc%d", &n) <= 0)
                 {
@@ -873 +872 @@
                         }
                 }
-                
+
                 logprintf(pCardData, 7, "n = %d\n", n);
-                
+
                 if(n>=0 && n<vs->cert_count)
                 {
                         sc_pkcs15_cert_t *cert = NULL;
-                        
+
                         r = sc_pkcs15_read_certificate(vs->p15card, \
                                 (struct sc_pkcs15_cert_info *)(vs->cert_objs[n]->data), \
@@ -888 +887 @@
                                 return SCARD_E_FILE_NOT_FOUND;
                         }
-                        
+
                         *pcbData = cert->data_len;
                         *ppbData = pCardData->pfnCspAlloc(*pcbData);
-                        
+
                         if(*ppbData == NULL)
                         {
@@ -897 +896 @@
                                 return SCARD_E_NO_MEMORY;
                         }
-                        
+
                         CopyMemory(*ppbData, cert->data, *pcbData);
 
@@ -907 +906 @@
 
                         sc_pkcs15_free_certificate(cert);
-                        
+
                         return SCARD_S_SUCCESS;
                 }
         }
-        
+
         logprintf(pCardData, 5, "File not found\n");
         return SCARD_E_FILE_NOT_FOUND;
@@ -928 +927 @@
         if(!pCardData)
                 return SCARD_E_INVALID_PARAMETER;
-                
+
         if(pszDirectoryName == NULL)
         {
-                if(strcmp(pszFileName, "cardcf") == 0) 
+                if(strcmp(pszFileName, "cardcf") == 0)
                 {
                         logprintf(pCardData, 2, "write cardcf ok.\n");
@@ -938 +937 @@
                 }
         }
-        
+
         return SCARD_E_FILE_NOT_FOUND;
 }
@@ -960 +959 @@
         const char root_files[] = "cardapps\0cardcf\0cardid\0\0";
         const char mscp_files[] = "kxc00\0kxc01\0cmapfile\0\0";
-        
+
         logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
         logprintf(pCardData, 1, "CardEnumFiles\n");
-        
+
         if (!pCardData) return SCARD_E_INVALID_PARAMETER;
         if (!pmszFileNames) return SCARD_E_INVALID_PARAMETER;
@@ -969 +968 @@
         if (dwFlags) return SCARD_E_INVALID_PARAMETER;
 
-        if (!pszDirectoryName || !strlen(pszDirectoryName)) 
+        if (!pszDirectoryName || !strlen(pszDirectoryName))
         {
                 DWORD sz = sizeof(root_files) - 1;
@@ -979 +978 @@
                 return SCARD_S_SUCCESS;
         }
-        if (strcmpi(pszDirectoryName,"mscp") == 0) 
+        if (strcmpi(pszDirectoryName,"mscp") == 0)
         {
                 DWORD sz = sizeof(mscp_files) - 1;
@@ -989 +988 @@
                 return SCARD_S_SUCCESS;
         }
-        
+
         return SCARD_E_FILE_NOT_FOUND;
 }
@@ -1008 +1007 @@
 {
         VENDOR_SPECIFIC *vs;
-        
+
         logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
         logprintf(pCardData, 1, "CardQueryFreeSpace %X, dwFlags=%X, version=%X\n", \
@@ -1022 +1021 @@
         pCardFreeSpaceInfo->dwBytesAvailable = -1;
         pCardFreeSpaceInfo->dwMaxKeyContainers = vs->cert_count;
- 
+
         pCardFreeSpaceInfo->dwKeyContainersAvailable = vs->cert_count; /*TODO should this be 0 */
 
@@ -1040 +1039 @@
         if (!pCardData) return SCARD_E_INVALID_PARAMETER;
         if (!pKeySizes) return SCARD_E_INVALID_PARAMETER;
-        
+
         pKeySizes->dwVersion = CARD_KEY_SIZES_CURRENT_VERSION;
         pKeySizes->dwMinimumBitlen = 512;
@@ -1084 +1083 @@
 
         if (!(pInfo->bContainerIndex < vs->cert_count))
-    {    
+    {
         return SCARD_E_INVALID_PARAMETER;
     }
@@ -1091 +1090 @@
         cert_info = (struct sc_pkcs15_cert_info *) \
         (vs->cert_objs[pInfo->bContainerIndex]->data);
-    
+
     for(i = 0; i < vs->prkey_count; i++)
-    {    
+    {
         sc_pkcs15_object_t *obj = (sc_pkcs15_object_t *)vs->prkey_objs[i];
         if(sc_pkcs15_compare_id(&((struct sc_pkcs15_prkey_info *) obj->data)->id, &(cert_info->id)))
@@ -1107 +1106 @@
         return SCARD_E_INVALID_PARAMETER;
     }
-   
+
     prkey_info = (sc_pkcs15_prkey_info_t*)(vs->pkey->data);
 
-        
+
         /* input and output buffers are always the same size */
         pbuf = pCardData->pfnCspAlloc(pInfo->cbData);
@@ -1125 +1124 @@
         for(ui = 0; ui < pInfo->cbData; ui++) pbuf[ui] = pInfo->pbData[pInfo->cbData-ui-1];
 
-        r = sc_pkcs15_decipher(vs->p15card, vs->pkey, 
+        r = sc_pkcs15_decipher(vs->p15card, vs->pkey,
                 opt_crypt_flags, pbuf, pInfo->cbData, pbuf2, pInfo->cbData);
         logprintf(pCardData, 2, "sc_pkcs15_decipher return %d\n", r);
@@ -1132 +1131 @@
                         sc_strerror(r));
         }
-        
+
         /*inversion donnees */
         for(ui = 0; ui < pInfo->cbData; ui++) pInfo->pbData[ui] = pbuf2[pInfo->cbData-ui-1];
@@ -1152 +1151 @@
         int r, opt_crypt_flags = 0, opt_hash_flags = 0;
         size_t dataToSignLen = sizeof(dataToSign);
-        
+
         logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
         logprintf(pCardData, 1, "CardSignData\n");
@@ -1163 +1162 @@
                 pInfo->dwVersion,pInfo->bContainerIndex ,pInfo->dwKeySpec, \
                 pInfo->dwSigningFlags, pInfo->aiHashAlg);
-                
+
         logprintf(pCardData, 7, "pInfo->pbData(%i) ", pInfo->cbData);
         loghex(pCardData, 7, pInfo->pbData, pInfo->cbData);
@@ -1174 +1173 @@
 
         vs->pkey = NULL;
-        
+
         logprintf(pCardData, 2, "pInfo->dwVersion = %d\n", pInfo->dwVersion);
 
@@ -1181 +1180 @@
         dataToSignLen = pInfo->cbData;
 
-        if (CARD_PADDING_INFO_PRESENT & pInfo->dwSigningFlags) 
+        if (CARD_PADDING_INFO_PRESENT & pInfo->dwSigningFlags)
         {
                 BCRYPT_PKCS1_PADDING_INFO *pinf = (BCRYPT_PKCS1_PADDING_INFO *)pInfo->pPaddingInfo;
-                if (CARD_PADDING_PKCS1 != pInfo->dwPaddingType) 
+                if (CARD_PADDING_PKCS1 != pInfo->dwPaddingType)
                 {
                         logprintf(pCardData, 0, "unsupported paddingtype\n");
                         return SCARD_E_UNSUPPORTED_FEATURE;
                 }
-                if (!pinf->pszAlgId) 
+                if (!pinf->pszAlgId)
                 {
                         /* hashAlg = CALG_SSL3_SHAMD5; */
@@ -1195 +1194 @@
                         opt_hash_flags = SC_ALGORITHM_RSA_HASH_MD5_SHA1;
                 }
-                else 
-                {
-                        
+                else
+                {
+
                         if (wcscmp(pinf->pszAlgId, L"MD5") == 0)  opt_hash_flags = SC_ALGORITHM_RSA_HASH_MD5;
                         else if (wcscmp(pinf->pszAlgId, L"SHA1") == 0)  opt_hash_flags = SC_ALGORITHM_RSA_HASH_SHA1;
                         else if (wcscmp(pinf->pszAlgId, L"SHAMD5") == 0) opt_hash_flags = SC_ALGORITHM_RSA_HASH_MD5_SHA1;
-                        else 
+                        else
                                 logprintf(pCardData, 0,"unknown AlgId %S\n",NULLWSTR(pinf->pszAlgId));
                 }
@@ -1208 +1207 @@
         {
                 logprintf(pCardData, 3, "CARD_PADDING_INFO_PRESENT not set\n");
-                
-                if (GET_ALG_CLASS(hashAlg) != ALG_CLASS_HASH) 
+
+                if (GET_ALG_CLASS(hashAlg) != ALG_CLASS_HASH)
                 {
                         logprintf(pCardData, 0, "bogus aiHashAlg\n");
@@ -1215 +1214 @@
                 }
 
-                if (hashAlg == CALG_MD5) 
+                if (hashAlg == CALG_MD5)
                         opt_hash_flags = SC_ALGORITHM_RSA_HASH_MD5;
-                else if (hashAlg == CALG_SHA1) 
+                else if (hashAlg == CALG_SHA1)
                         opt_hash_flags = SC_ALGORITHM_RSA_HASH_SHA1;
                 else if (hashAlg == CALG_SSL3_SHAMD5)
@@ -1226 +1225 @@
 
         /* From sc-minidriver_specs_v7.docx pp.76:
-         * 'The Base CSP/KSP performs the hashing operation on the data before passing it 
+         * 'The Base CSP/KSP performs the hashing operation on the data before passing it
          *      to CardSignData for signature.'
-         * So, the SC_ALGORITHM_RSA_HASH_* flags should not be passed to pkcs15 library 
+         * So, the SC_ALGORITHM_RSA_HASH_* flags should not be passed to pkcs15 library
          *      when calculating the signature .
          *
          * From sc-minidriver_specs_v7.docx pp.76:
-         * 'If the aiHashAlg member is nonzero, it specifies the hash algorithm’s object identifier (OID) 
+         * 'If the aiHashAlg member is nonzero, it specifies the hash algorithm’s object identifier (OID)
          *  that is encoded in the PKCS padding.'
          * So, the digest info has be included into the data to be signed.
@@ -1247 +1246 @@
         }
         opt_crypt_flags = SC_ALGORITHM_RSA_PAD_PKCS1 | SC_ALGORITHM_RSA_HASH_NONE;
-        
+
         if(!(pInfo->bContainerIndex < vs->cert_count))
         {
                 return SCARD_E_INVALID_PARAMETER;
         }
-                
+
         cert_info = (struct sc_pkcs15_cert_info *) \
                 (vs->cert_objs[pInfo->bContainerIndex]->data);
@@ -1264 +1263 @@
         pInfo->cbSignedData = prkey_info->modulus_length / 8;
         logprintf(pCardData, 3, "pInfo->cbSignedData = %d\n", pInfo->cbSignedData);
-        
+
         if(!(pInfo->dwSigningFlags&CARD_BUFFER_SIZE_ONLY))
         {
@@ -1270 +1269 @@
                 BYTE *pbuf = NULL;
                 DWORD lg;
-                
+
                 lg = pInfo->cbSignedData;
                 logprintf(pCardData, 3, "lg = %d\n", lg);
                 pbuf = pCardData->pfnCspAlloc(lg);
-                if (!pbuf) 
+                if (!pbuf)
                 {
                         return SCARD_E_NO_MEMORY;
                 }
-                
+
                 logprintf(pCardData, 7, "Data to sign: ");
                 loghex(pCardData, 7, dataToSign, dataToSignLen);
 
                 pInfo->pbSignedData = pCardData->pfnCspAlloc(pInfo->cbSignedData);
-                if (!pInfo->pbSignedData) 
+                if (!pInfo->pbSignedData)
                 {
                         pCardData->pfnCspFree(pbuf);
                         return SCARD_E_NO_MEMORY;
                 }
-                
+
                 r = sc_pkcs15_compute_signature(vs->p15card, vs->pkey, \
                         opt_crypt_flags, dataToSign, dataToSignLen, pbuf, lg);
@@ -1299 +1298 @@
 
                 pInfo->cbSignedData = r;
-                
+
                 /*inversion donnees*/
                 for(i = 0; i < r; i++) pInfo->pbSignedData[i] = pbuf[r-i-1];
@@ -1310 +1309 @@
                 logprintf(pCardData, 7, "pInfo->pbSignedData ");
                 loghex(pCardData, 7, pInfo->pbSignedData, pInfo->cbSignedData);
-                
-        }
-        
+
+        }
+
         logprintf(pCardData, 3, "CardSignData, dwVersion=%u, name=%S, hScard=0x%08X," \
                 "hSCardCtx=0x%08X\n", pCardData->dwVersion, \
@@ -1382 +1381 @@
         logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
         logprintf(pCardData, 1, "CardAuthenticateEx\n");
-        
+
         if (!pCardData) return SCARD_E_INVALID_PARAMETER;
-        
+
         logprintf(pCardData, 2, "CardAuthenticateEx: PinId=%u, dwFlags=0x%08X, cbPinData=%u, Attempts %s\n",
                 PinId,dwFlags,cbPinData,pcAttemptsRemaining ? "YES" : "NO");
@@ -1395 +1394 @@
                 dwFlags == CARD_AUTHENTICATE_SESSION_PIN)
                         return SCARD_E_UNSUPPORTED_FEATURE;
-        if (dwFlags && dwFlags != CARD_PIN_SILENT_CONTEXT) 
+        if (dwFlags && dwFlags != CARD_PIN_SILENT_CONTEXT)
                 return SCARD_E_INVALID_PARAMETER;
 
         if (NULL == pbPinData) return SCARD_E_INVALID_PARAMETER;
-        
+
         if (PinId != ROLE_USER) return SCARD_E_INVALID_PARAMETER;
-        
+
         r = get_pin_by_role(pCardData, ROLE_USER, &pin_obj);
         if (r != SCARD_S_SUCCESS)
@@ -1410 +1409 @@
 
         r = sc_pkcs15_verify_pin(vs->p15card, pin_obj, (const u8 *) pbPinData, cbPinData);
-        if (r) 
+        if (r)
         {
                 logprintf(pCardData, 2, "PIN code verification failed: %s\n", sc_strerror(r));
-                
-                if(pcAttemptsRemaining) 
+
+                if(pcAttemptsRemaining)
                 {
                         (*pcAttemptsRemaining) = -1;
@@ -1420 +1419 @@
                 return SCARD_W_WRONG_CHV;
         }
-        
+
         logprintf(pCardData, 2, "Pin code correct.\n");
-        
+
         SET_PIN(vs->cardFiles.file_cardcf.bPinsFreshness, ROLE_USER);
         logprintf(pCardData, 7, "PinsFreshness = %d\n",
@@ -1454 +1453 @@
         logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
         logprintf(pCardData, 1, "CardDeauthenticateEx PinId=%d dwFlags=0x%08X\n",PinId, dwFlags);
-        
+
         if (!pCardData) return SCARD_E_INVALID_PARAMETER;
-        
+
         vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
 
@@ -1481 +1480 @@
 
         check_reader_status(pCardData);
-        
+
         if (!pCardData) return SCARD_E_INVALID_PARAMETER;
         logprintf(pCardData, 2, "CardGetContainerProperty bContainerIndex=%u, wszProperty=%S," \
@@ -1495 +1494 @@
                 if (pdwDataLen) *pdwDataLen = sizeof(*p);
                 if (cbData >= sizeof(DWORD))
-                        if (p->dwVersion != CONTAINER_INFO_CURRENT_VERSION && 
+                        if (p->dwVersion != CONTAINER_INFO_CURRENT_VERSION &&
                                 p->dwVersion != 0 ) return ERROR_REVISION_MISMATCH;
                 if (cbData < sizeof(*p)) return ERROR_INSUFFICIENT_BUFFER;
                 return CardGetContainerInfo(pCardData,bContainerIndex,0,p);
         }
-        
-        if (wcscmp(CCP_PIN_IDENTIFIER,wszProperty) == 0) 
+
+        if (wcscmp(CCP_PIN_IDENTIFIER,wszProperty) == 0)
         {
                 PPIN_ID p = (PPIN_ID) pbData;
@@ -1510 +1509 @@
                 return SCARD_S_SUCCESS;
         }
-        
+
         return SCARD_E_INVALID_PARAMETER;
 }
@@ -1543 +1542 @@
         if (!pbData) return SCARD_E_INVALID_PARAMETER;
         if (!pdwDataLen) return SCARD_E_INVALID_PARAMETER;
-        
+
         vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
 
@@ -1553 +1552 @@
                 if (pdwDataLen) *pdwDataLen = sizeof(*pCardFreeSpaceInfo);
                 if (cbData < sizeof(*pCardFreeSpaceInfo)) return SCARD_E_NO_MEMORY;
-                if (pCardFreeSpaceInfo->dwVersion > CARD_FREE_SPACE_INFO_CURRENT_VERSION ) 
+                if (pCardFreeSpaceInfo->dwVersion > CARD_FREE_SPACE_INFO_CURRENT_VERSION )
                         return ERROR_REVISION_MISMATCH;
 
@@ -1573 +1572 @@
                 if (pCardCapabilities->dwVersion != CARD_CAPABILITIES_CURRENT_VERSION &&
                         pCardCapabilities->dwVersion != 0) return ERROR_REVISION_MISMATCH;
-                
+
                 pCardCapabilities->dwVersion = CARD_CAPABILITIES_CURRENT_VERSION;
                 pCardCapabilities->fCertificateCompression = TRUE;
@@ -1590 +1589 @@
                 if (pKeySizes->dwVersion != CARD_KEY_SIZES_CURRENT_VERSION &&
                         pKeySizes->dwVersion != 0) return ERROR_REVISION_MISMATCH;
-                
+
                 pKeySizes->dwVersion = CARD_KEY_SIZES_CURRENT_VERSION;
                 pKeySizes->dwMinimumBitlen = 512;
@@ -1596 +1595 @@
                 pKeySizes->dwMaximumBitlen = 16384;
                 pKeySizes->dwIncrementalBitlen = 64;
-        
+
                 logprintf(pCardData, 7, "pKeySizes ");
                 loghex(pCardData, 7, pbData, *pdwDataLen);
-                
+
                 return SCARD_S_SUCCESS;
         }
@@ -1635 +1634 @@
                 return SCARD_S_SUCCESS;
         }
-        if (wcscmp(CP_CARD_GUID,wszProperty) == 0) 
+        if (wcscmp(CP_CARD_GUID,wszProperty) == 0)
         {
                 if (pdwDataLen) *pdwDataLen = sizeof(vs->cardFiles.file_cardid);
@@ -1652 +1651 @@
 
                 CopyMemory(pbData,vs->p15card->tokeninfo->serial_number,sizeof(vs->p15card->tokeninfo->serial_number));
-                
+
                 logprintf(pCardData, 7, "SerialNumber ");
                 loghex(pCardData, 7, pbData, *pdwDataLen);
@@ -1665 +1664 @@
                 p->PinType = AlphaNumericPinType;
                 p->dwFlags = 0;
-                switch (dwFlags) 
+                switch (dwFlags)
                 {
                         case ROLE_USER:
@@ -1674 +1673 @@
                                 p->PinCachePolicy.PinCachePolicyType = PinCacheNormal;
                                 p->dwChangePermission = 0;
-                                p->dwUnblockPermission = 0; 
+                                p->dwUnblockPermission = 0;
                                 break;
                         default:
@@ -1683 +1682 @@
                 loghex(pCardData, 7, pbData, *pdwDataLen);
 
-                
+
                 return SCARD_S_SUCCESS;
         }
@@ -1694 +1693 @@
                 logprintf(pCardData, 7, "CARD_LIST_PINS ");
                 loghex(pCardData, 7, pbData, *pdwDataLen);
-                
+
                 return SCARD_S_SUCCESS;
         }
@@ -1739 +1738 @@
         logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
         logprintf(pCardData, 1, "CardSetProperty\n");
-        
+
         if (!pCardData) return SCARD_E_INVALID_PARAMETER;
-        
+
         logprintf(pCardData, 2, "CardSetProperty wszProperty=%S, cbDataLen=%u, dwFlags=%u",\
                 NULLWSTR(wszProperty),cbDataLen,dwFlags);
@@ -1755 +1754 @@
                 return SCARD_S_SUCCESS;
 
-        if (wcscmp(CP_CARD_CACHE_MODE, wszProperty) == 0 || 
+        if (wcscmp(CP_CARD_CACHE_MODE, wszProperty) == 0 ||
                 wcscmp(CP_SUPPORTS_WIN_X509_ENROLLMENT, wszProperty) == 0 ||
                 wcscmp(CP_CARD_GUID, wszProperty) == 0 ||
@@ -1766 +1765 @@
 
         if (wcscmp(CP_PARENT_WINDOW, wszProperty) == 0) {
-                if (cbDataLen != sizeof(DWORD)) 
+                if (cbDataLen != sizeof(DWORD))
                         return SCARD_E_INVALID_PARAMETER;
                 else
@@ -1788 +1787 @@
         DWORD suppliedVersion = 0;
         u8 challenge[8];
-        
-        if (!pCardData) 
+
+        if (!pCardData)
                 return SCARD_E_INVALID_PARAMETER;
-        if (dwFlags) 
+        if (dwFlags)
                 return SCARD_E_INVALID_PARAMETER;
-        
+
         suppliedVersion = pCardData->dwVersion;
 
@@ -1812 +1811 @@
         vs->hScard = pCardData->hScard;
         vs->hSCardCtx = pCardData->hSCardCtx;
-        
+
         /* The lowest supported version is 4. */
         if (pCardData->dwVersion < MINIMUM_VERSION_SUPPORTED)
@@ -1818 +1817 @@
                 return (DWORD) ERROR_REVISION_MISMATCH;
         }
- 
+
         if( pCardData->hScard == 0)
         {
@@ -1824 +1823 @@
                 return SCARD_E_INVALID_HANDLE;
         }
-        
+
         logprintf(pCardData, 2, "request version pCardData->dwVersion = %d\n", pCardData->dwVersion);
 
@@ -1835 +1834 @@
                 int r;
                 sc_context_param_t ctx_param;
-                
+
                 vs->ctx = NULL;
-                
+
                 logprintf(pCardData, 3, "create ctx\n");
-                
+
                 memset(&ctx_param, 0, sizeof(ctx_param));
                 ctx_param.ver = 1;
                 ctx_param.app_name = "cardmod";
-                
+
                 r = sc_context_create(&(vs->ctx), &ctx_param);
                 logprintf(pCardData, 3, "sc_context_create passed r = %d\n", r);
-                if (r) 
+                if (r)
                 {
                         logprintf(pCardData, 0, "Failed to establish context: %s\n", \
@@ -1853 +1852 @@
                 }
         }
-        
+
         pCardData->pfnCardDeleteContext = CardDeleteContext;
         pCardData->pfnCardQueryCapabilities = CardQueryCapabilities;
@@ -1880 +1879 @@
         pCardData->pfnCardRSADecrypt = CardRSADecrypt;
         pCardData->pfnCardConstructDHAgreement = CardConstructDHAgreement;
-        
+
         associate_card(pCardData);
-        
-        logprintf(pCardData, 1, "Opensc init done.\n");
+
+        logprintf(pCardData, 1, "OpenSC init done.\n");
 
         if(sc_get_challenge(vs->p15card->card, challenge, sizeof(challenge)))
@@ -1895 +1894 @@
                 vs->cardFiles.file_cardcf.wFilesFreshness = challenge[3]*256+challenge[4];
         }
-                
+
         if (suppliedVersion > 4) {
-                pCardData->pfnCardDeriveKey = CardDeriveKey; 
-                pCardData->pfnCardDestroyDHAgreement = CardDestroyDHAgreement; 
-                pCardData->pfnCspGetDHAgreement = CspGetDHAgreement; 
-                
+                pCardData->pfnCardDeriveKey = CardDeriveKey;
+                pCardData->pfnCardDestroyDHAgreement = CardDestroyDHAgreement;
+                pCardData->pfnCspGetDHAgreement = CspGetDHAgreement;
+
                 if (suppliedVersion > 5 ) {
                         pCardData->pfnCardGetChallengeEx = CardGetChallengeEx;
@@ -1923 +1922 @@
         BYTE empty_cardcf[6]={0,0,0,0,0,0};
         BYTE empty_cardid[16]={0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
-        
+
         logprintf(pCardData, 1, "associate_card\n");
-        vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
+        vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
         /*
          * set the addresses of the reader and card handles
-         * Our cardmod pcsc code will use these  when we call sc_ctx_use_reader 
+         * Our cardmod pcsc code will use these  when we call sc_ctx_use_reader
          * We use the address of the handles as provided in the pCardData
          */
@@ -1941 +1940 @@
         logprintf(pCardData, 5, "cardmod_use_handles %d\n", \
         sc_ctx_use_reader(vs->ctx, &vs->hSCardCtx, &vs->hScard));
-        
+
         /* should be only one reader */
         logprintf(pCardData, 5, "sc_ctx_get_reader_count(ctx): %d\n", \
@@ -1950 +1949 @@
         {
                 logprintf(pCardData, 3, "%s\n", NULLSTR(vs->reader->name));
-                        
+
                 r = sc_connect_card(vs->reader, &(vs->card));
                 logprintf(pCardData, 2, "sc_connect_card result = %d, %s\n", \
@@ -1970 +1969 @@
         /*
          * We want a 16 byte unique serial number
-         * PKCS15 gives us a char string, that 
+         * PKCS15 gives us a char string, that
          * appears to have been formated with %02x or %02X
-         * so as to make it printable. 
+         * so as to make it printable.
          * So for now we will try and convert back to bin,
          * and use the last 32 bytes of the vs-p15card->tokeninfo->serial_number
@@ -1981 +1980 @@
                 size_t len1, len2;
                 char * cserial;
-                
+
                 len1 = strlen(vs->p15card->tokeninfo->serial_number);
                 cserial = vs->p15card->tokeninfo->serial_number;
                 len2 = sizeof(vs->cardFiles.file_cardid) * 2;
                 if ( len1 > len2) {
-                        cserial += len1 - len2; 
+                        cserial += len1 - len2;
                         len1 = len2;
                 }
@@ -1994 +1993 @@
                 loghex(pCardData, 7, vs->cardFiles.file_cardid, sizeof(vs->cardFiles.file_cardid));
         }
-        
-                
+
+
         r = sc_pkcs15_get_objects(vs->p15card, SC_PKCS15_TYPE_CERT_X509, \
                 vs->cert_objs, 32);
-        if (r < 0) 
+        if (r < 0)
         {
                 logprintf(pCardData, 0, "Certificate enumeration failed: %s\n", \
@@ -2004 +2003 @@
                 return SCARD_F_UNKNOWN_ERROR;
         }
-        
+
         vs->cert_count = r;
         logprintf(pCardData, 2, "Found %d certificat(s) in the card.\n", \
                 vs->cert_count);
-        
+
         r = sc_pkcs15_get_objects(vs->p15card, SC_PKCS15_TYPE_PRKEY_RSA, \
                 vs->prkey_objs, 32);
-        if (r < 0) 
+        if (r < 0)
         {
                 logprintf(pCardData, 0, "Private key enumeration failed: %s\n", \
@@ -2017 +2016 @@
                 return SCARD_F_UNKNOWN_ERROR;
         }
-        
+
         vs->prkey_count = r;
         logprintf(pCardData, 2, "Found %d private key(s) in the card.\n", \
@@ -2024 +2023 @@
         r = sc_pkcs15_get_objects(vs->p15card, SC_PKCS15_TYPE_AUTH_PIN, \
                 vs->pin_objs, 8);
-        if (r < 0) 
+        if (r < 0)
         {
                 logprintf(pCardData, 2, "Pin object enumeration failed: %s\n", \
@@ -2030 +2029 @@
                 return SCARD_F_UNKNOWN_ERROR;
         }
-        
+
         vs->pin_count = r;
         logprintf(pCardData, 2, "Found %d pin(s) in the card.\n", \
                 vs->pin_count);
 
-#if 1   
+#if 1
         dump_objects(pCardData);
 #endif
@@ -2045 +2044 @@
 static int disassociate_card(PCARD_DATA pCardData)
 {
-        
+
     VENDOR_SPECIFIC *vs;
         int i;
@@ -2051 +2050 @@
         vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
         logprintf(pCardData, 1, "disassociate_card\n");
-        
+
         if(vs->pin != NULL)
-        {       
+        {
                 free(vs->pin);
                 vs->pin = NULL;
@@ -2062 +2061 @@
         }
         vs->cert_count = 0;
-        
+
         for (i = 0; i < vs->prkey_count; i++) {
                 vs->prkey_objs[i] = NULL;
         }
         vs->prkey_count = 0;
-        
+
         for (i = 0; i < vs->pin_count; i++) {
                 vs->pin_objs[i] = NULL;
         }
         vs->pin_count = 0;
-        
+
 
         if(vs->p15card)
@@ -2106 +2105 @@
                 hModule, ul_reason_for_call, lpReserved, GetCurrentProcessId(), GetCurrentThreadId());
 #endif
-        switch (ul_reason_for_call) 
+        switch (ul_reason_for_call)
         {
                 case DLL_PROCESS_ATTACH:
@@ -2129 +2128 @@
 #pragma managed(pop)
 #endif
+#endif

src/minidriver/opensc-minidriver.inf.in

@@ -141 +141 @@
 
 [Strings]
-ProviderName ="Opensc"
-MediaDescription="Opensc Smart Card Minidriver Installation Disk"
-CardDeviceName="Opensc Minidriver for Smart Card"
+ProviderName ="OpenSC"
+MediaDescription="OpenSC Smart Card Minidriver Installation Disk"
+CardDeviceName="OpenSC Minidriver"
 SmartCardName="SOFTWARE\Microsoft\Cryptography\Calais\SmartCards\Cev Westcos"
 SmartCardNameWOW64="SOFTWARE\Wow6432Node\Microsoft\Cryptography\Calais\SmartCards\Cev Westcos"
-SmartCardCardModule="opensc-cardmod32.dll"
-SmartCardCardModule64="opensc-cardmod64.dll"
+SmartCardCardModule="opensc-minidriver.dll"

win32/Make.rules.mak

@@ -1 +1 @@
 OPENSC_FEATURES = pcsc
 
-#Include support of minidriver 'cardmod'
-MINIDRIVER_DEF = /DENABLE_CARDMOD
+#Include support for minidriver
+MINIDRIVER_DEF = /DENABLE_MINIDRIVER
 
 #Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.6

win32/OpenSC.wxs.in

@@ -32 +32 @@
         </Component>
         <Component Id="opensc_minidriver.dll" Guid="*">
-          <File Source="$(var.SOURCE_DIR)\src\cardmod\opensc-cardmod.dll" Vital="yes"/>
+          <File Source="$(var.SOURCE_DIR)\src\minidriver\opensc-minidriver.dll" Vital="yes"/>
         </Component>
       </Directory>