libwinpr-smartcard: remove unused (and useless) pcsc-lite static link option
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 21 Jan 2015 01:15:10 +0000 (20:15 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 21 Jan 2015 01:15:10 +0000 (20:15 -0500)
winpr/libwinpr/smartcard/CMakeLists.txt
winpr/libwinpr/smartcard/smartcard_link.c [deleted file]
winpr/libwinpr/smartcard/smartcard_pcsc.c

index 3f59e73..154e3e8 100644 (file)
@@ -28,7 +28,6 @@ endif()
 set(${MODULE_PREFIX}_SRCS
        smartcard.c
        smartcard.h
-       smartcard_link.c
        smartcard_pcsc.c
        smartcard_pcsc.h
        smartcard_inspect.c
diff --git a/winpr/libwinpr/smartcard/smartcard_link.c b/winpr/libwinpr/smartcard/smartcard_link.c
deleted file mode 100644 (file)
index 3678ea4..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * WinPR: Windows Portable Runtime
- * Smart Card API
- *
- * Copyright 2014 Marc-Andre Moreau <marcandre.moreau@gmail.com>
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifndef _WIN32
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define DISABLE_PCSC_WINPR
-
-/**
- * PCSC-WinPR (optional for Mac OS X):
- *
- * PCSC-WinPR is a static build of libpcsclite with
- * minor modifications meant to avoid an ABI conflict.
- *
- * At this point, it is only a work in progress, as I was not
- * yet able to make it work properly. However, if we could make it
- * work, we might be able to build against a version of pcsc-lite
- * that doesn't have issues present in Apple's SmartCard Services.
- *
- * Patch pcsc-lite/src/PCSC/wintypes.h:
- * Change "unsigned long" to "unsigned int" for
- *
- * typedef unsigned int ULONG;
- * typedef unsigned int DWORD;
- *
- * This is important as ULONG and DWORD are supposed to be 32-bit,
- * but unsigned long on 64-bit OS X is 64-bit, not 32-bit.
- * More importantly, Apple's SmartCard Services uses unsigned int,
- * while vanilla pcsc-lite still uses unsigned long.
- *
- * Patch pcsc-lite/src/PCSC/pcsclite.h.in:
- *
- * Add the WinPR_PCSC_* definitions that follow "#define WinPR_PCSC"
- * in this source file at the beginning of the pcsclite.h.in.
- *
- * Change "unsigned long" to "unsigned int" in the definition
- * of the SCARD_IO_REQUEST structure:
- *
- * unsigned int dwProtocol;
- * unsigned int cbPciLength;
- *
- * Configure pcsc-lite with the following options (Mac OS X):
- * 
- * ./configure --enable-static --prefix=/usr --program-suffix=winpr
- *     --enable-usbdropdir=/usr/libexec/SmartCardServices/drivers
- *     --enable-confdir=/etc --enable-ipcdir=/var/run
- *
- * Build pcsc-lite, and then copy libpcsclite.a to libpcsc-winpr.a:
- * 
- * make
- * cp ./src/.libs/libpcsclite.a libpcsc-winpr.a
- *
- * Validate that libpcsc-winpr.a has a modified ABI:
- *
- * nm libpcsc-winpr.a | grep " T " | grep WinPR
- *
- * If the ABI has been successfully modified, you should
- * see pcsc-lite functions prefixed with "WinPR_PCSC_".
- *
- * You can keep this custom pcsc-lite build for later.
- * To install the library, copy it to /usr/lib or /usr/local/lib.
- *
- * The FreeRDP build system will then automatically pick it up
- * as long as it is present on the system. To ensure PCSC-WinPR
- * is properly detected at cmake generation time, look for the
- * following debug output:
- *
- * -- Found PCSC-WinPR: /usr/lib/libpcsc-winpr.a
- */
-
-#if 0
-#define WinPR_PCSC
-
-#define SCardEstablishContext WinPR_PCSC_SCardEstablishContext
-#define SCardReleaseContext WinPR_PCSC_SCardReleaseContext
-#define SCardIsValidContext WinPR_PCSC_SCardIsValidContext
-#define SCardConnect WinPR_PCSC_SCardConnect
-#define SCardReconnect WinPR_PCSC_SCardReconnect
-#define SCardDisconnect WinPR_PCSC_SCardDisconnect
-#define SCardBeginTransaction WinPR_PCSC_SCardBeginTransaction
-#define SCardEndTransaction WinPR_PCSC_SCardEndTransaction
-#define SCardStatus WinPR_PCSC_SCardStatus
-#define SCardGetStatusChange WinPR_PCSC_SCardGetStatusChange
-#define SCardControl WinPR_PCSC_SCardControl
-#define SCardTransmit WinPR_PCSC_SCardTransmit
-#define SCardListReaderGroups WinPR_PCSC_SCardListReaderGroups
-#define SCardListReaders WinPR_PCSC_SCardListReaders
-#define SCardFreeMemory WinPR_PCSC_SCardFreeMemory
-#define SCardCancel WinPR_PCSC_SCardCancel
-#define SCardGetAttrib WinPR_PCSC_SCardGetAttrib
-#define SCardSetAttrib WinPR_PCSC_SCardSetAttrib
-
-#define g_rgSCardT0Pci WinPR_PCSC_g_rgSCardT0Pci
-#define g_rgSCardT1Pci WinPR_PCSC_g_rgSCardT1Pci
-#define g_rgSCardRawPci WinPR_PCSC_g_rgSCardRawPci
-#endif
-
-#ifdef WITH_WINPR_PCSC
-extern void* WinPR_PCSC_SCardEstablishContext();
-extern void* WinPR_PCSC_SCardReleaseContext();
-extern void* WinPR_PCSC_SCardIsValidContext();
-extern void* WinPR_PCSC_SCardConnect();
-extern void* WinPR_PCSC_SCardReconnect();
-extern void* WinPR_PCSC_SCardDisconnect();
-extern void* WinPR_PCSC_SCardBeginTransaction();
-extern void* WinPR_PCSC_SCardEndTransaction();
-extern void* WinPR_PCSC_SCardStatus();
-extern void* WinPR_PCSC_SCardGetStatusChange();
-extern void* WinPR_PCSC_SCardControl();
-extern void* WinPR_PCSC_SCardTransmit();
-extern void* WinPR_PCSC_SCardListReaderGroups();
-extern void* WinPR_PCSC_SCardListReaders();
-extern void* WinPR_PCSC_SCardFreeMemory();
-extern void* WinPR_PCSC_SCardCancel();
-extern void* WinPR_PCSC_SCardGetAttrib();
-extern void* WinPR_PCSC_SCardSetAttrib();
-#endif
-
-struct _PCSCFunctionTable
-{
-       void* pfnSCardEstablishContext;
-       void* pfnSCardReleaseContext;
-       void* pfnSCardIsValidContext;
-       void* pfnSCardConnect;
-       void* pfnSCardReconnect;
-       void* pfnSCardDisconnect;
-       void* pfnSCardBeginTransaction;
-       void* pfnSCardEndTransaction;
-       void* pfnSCardStatus;
-       void* pfnSCardGetStatusChange;
-       void* pfnSCardControl;
-       void* pfnSCardTransmit;
-       void* pfnSCardListReaderGroups;
-       void* pfnSCardListReaders;
-       void* pfnSCardFreeMemory;
-       void* pfnSCardCancel;
-       void* pfnSCardGetAttrib;
-       void* pfnSCardSetAttrib;
-};
-typedef struct _PCSCFunctionTable PCSCFunctionTable;
-
-PCSCFunctionTable g_PCSC_Link = { 0 };
-
-int PCSC_InitializeSCardApi_Link(void)
-{
-       int status = -1;
-       
-#ifdef DISABLE_PCSC_WINPR
-       return -1;
-#endif
-       
-#ifdef WITH_WINPR_PCSC
-       g_PCSC_Link.pfnSCardEstablishContext = (void*) WinPR_PCSC_SCardEstablishContext;
-       g_PCSC_Link.pfnSCardReleaseContext = (void*) WinPR_PCSC_SCardReleaseContext;
-       g_PCSC_Link.pfnSCardIsValidContext = (void*) WinPR_PCSC_SCardIsValidContext;
-       g_PCSC_Link.pfnSCardConnect = (void*) WinPR_PCSC_SCardConnect;
-       g_PCSC_Link.pfnSCardReconnect = (void*) WinPR_PCSC_SCardReconnect;
-       g_PCSC_Link.pfnSCardDisconnect = (void*) WinPR_PCSC_SCardDisconnect;
-       g_PCSC_Link.pfnSCardBeginTransaction = (void*) WinPR_PCSC_SCardBeginTransaction;
-       g_PCSC_Link.pfnSCardEndTransaction = (void*) WinPR_PCSC_SCardEndTransaction;
-       g_PCSC_Link.pfnSCardStatus = (void*) WinPR_PCSC_SCardStatus;
-       g_PCSC_Link.pfnSCardGetStatusChange = (void*) WinPR_PCSC_SCardGetStatusChange;
-       g_PCSC_Link.pfnSCardControl = (void*) WinPR_PCSC_SCardControl;
-       g_PCSC_Link.pfnSCardTransmit = (void*) WinPR_PCSC_SCardTransmit;
-       g_PCSC_Link.pfnSCardListReaderGroups = (void*) WinPR_PCSC_SCardListReaderGroups;
-       g_PCSC_Link.pfnSCardListReaders = (void*) WinPR_PCSC_SCardListReaders;
-       //g_PCSC_Link.pfnSCardFreeMemory = (void*) WinPR_PCSC_SCardFreeMemory;
-       g_PCSC_Link.pfnSCardFreeMemory = (void*) NULL;
-       g_PCSC_Link.pfnSCardCancel = (void*) WinPR_PCSC_SCardCancel;
-       g_PCSC_Link.pfnSCardGetAttrib = (void*) WinPR_PCSC_SCardGetAttrib;
-       g_PCSC_Link.pfnSCardSetAttrib = (void*) WinPR_PCSC_SCardSetAttrib;
-       
-       status = 1;
-#endif
-       
-       return status;
-}
-
-#endif
index 9d50ac0..0fb7ac7 100644 (file)
@@ -2806,9 +2806,6 @@ PSCardApiFunctionTable PCSC_GetSCardApiFunctionTable(void)
        return &PCSC_SCardApiFunctionTable;
 }
 
-extern PCSCFunctionTable g_PCSC_Link;
-extern int PCSC_InitializeSCardApi_Link(void);
-
 int PCSC_InitializeSCardApi(void)
 {
        DWORD nSize;
@@ -2832,41 +2829,14 @@ int PCSC_InitializeSCardApi(void)
        /* Disable pcsc-lite's (poor) blocking so we can handle it ourselves */
        SetEnvironmentVariableA("PCSCLITE_NO_BLOCKING", "1");
 
-#ifndef DISABLE_PCSC_LINK
-
-       if (PCSC_InitializeSCardApi_Link() >= 0)
-       {
-               g_PCSC.pfnSCardEstablishContext = g_PCSC_Link.pfnSCardEstablishContext;
-               g_PCSC.pfnSCardReleaseContext = g_PCSC_Link.pfnSCardReleaseContext;
-               g_PCSC.pfnSCardIsValidContext = g_PCSC_Link.pfnSCardIsValidContext;
-               g_PCSC.pfnSCardConnect = g_PCSC_Link.pfnSCardConnect;
-               g_PCSC.pfnSCardReconnect = g_PCSC_Link.pfnSCardReconnect;
-               g_PCSC.pfnSCardDisconnect = g_PCSC_Link.pfnSCardDisconnect;
-               g_PCSC.pfnSCardBeginTransaction = g_PCSC_Link.pfnSCardBeginTransaction;
-               g_PCSC.pfnSCardEndTransaction = g_PCSC_Link.pfnSCardEndTransaction;
-               g_PCSC.pfnSCardStatus = g_PCSC_Link.pfnSCardStatus;
-               g_PCSC.pfnSCardGetStatusChange = g_PCSC_Link.pfnSCardGetStatusChange;
-               g_PCSC.pfnSCardControl = g_PCSC_Link.pfnSCardControl;
-               g_PCSC.pfnSCardTransmit = g_PCSC_Link.pfnSCardTransmit;
-               g_PCSC.pfnSCardListReaderGroups = g_PCSC_Link.pfnSCardListReaderGroups;
-               g_PCSC.pfnSCardListReaders = g_PCSC_Link.pfnSCardListReaders;
-               g_PCSC.pfnSCardFreeMemory = g_PCSC_Link.pfnSCardFreeMemory;
-               g_PCSC.pfnSCardCancel = g_PCSC_Link.pfnSCardCancel;
-               g_PCSC.pfnSCardGetAttrib = g_PCSC_Link.pfnSCardGetAttrib;
-               g_PCSC.pfnSCardSetAttrib = g_PCSC_Link.pfnSCardSetAttrib;
-               return 1;
-       }
-
-#endif
 #ifdef __MACOSX__
        g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
-    OSXVersion = determineMacOSXVersion();
+       OSXVersion = determineMacOSXVersion();
 #else
        g_PCSCModule = LoadLibraryA("libpcsclite.so.1");
 
        if (!g_PCSCModule)
                g_PCSCModule = LoadLibraryA("libpcsclite.so");
-
 #endif
 
        if (!g_PCSCModule)
@@ -2882,6 +2852,7 @@ int PCSC_InitializeSCardApi(void)
        g_PCSC.pfnSCardEndTransaction = (void*) GetProcAddress(g_PCSCModule, "SCardEndTransaction");
        g_PCSC.pfnSCardStatus = (void*) GetProcAddress(g_PCSCModule, "SCardStatus");
        g_PCSC.pfnSCardGetStatusChange = (void*) GetProcAddress(g_PCSCModule, "SCardGetStatusChange");
+
 #ifdef __MACOSX__
        if (OSXVersion >= 0x10050600)
                g_PCSC.pfnSCardControl = (void*) GetProcAddress(g_PCSCModule, "SCardControl132");
@@ -2890,12 +2861,14 @@ int PCSC_InitializeSCardApi(void)
 #else
        g_PCSC.pfnSCardControl = (void*) GetProcAddress(g_PCSCModule, "SCardControl");
 #endif
+
        g_PCSC.pfnSCardTransmit = (void*) GetProcAddress(g_PCSCModule, "SCardTransmit");
        g_PCSC.pfnSCardListReaderGroups = (void*) GetProcAddress(g_PCSCModule, "SCardListReaderGroups");
        g_PCSC.pfnSCardListReaders = (void*) GetProcAddress(g_PCSCModule, "SCardListReaders");
        g_PCSC.pfnSCardCancel = (void*) GetProcAddress(g_PCSCModule, "SCardCancel");
        g_PCSC.pfnSCardGetAttrib = (void*) GetProcAddress(g_PCSCModule, "SCardGetAttrib");
        g_PCSC.pfnSCardSetAttrib = (void*) GetProcAddress(g_PCSCModule, "SCardSetAttrib");
+
        g_PCSC.pfnSCardFreeMemory = NULL;
 #ifndef __APPLE__
        g_PCSC.pfnSCardFreeMemory = (void*) GetProcAddress(g_PCSCModule, "SCardFreeMemory");
@@ -2908,9 +2881,11 @@ int PCSC_InitializeSCardApi(void)
        g_PCSC.pfnSCardFreeMemory = NULL;
        g_SCardAutoAllocate = FALSE;
 #endif
+
 #ifdef __APPLE__
        g_PnP_Notification = FALSE;
 #endif
+
        return 1;
 }