r3084 - in trunk/libmcrypto: . include/libmcrypto source

[mikma at minisip.org]

Author: mikma
Date: 2007-01-04 10:15:02 +0100 (Thu, 04 Jan 2007)
New Revision: 3084

Modified:
   trunk/libmcrypto/include/libmcrypto/SmartCard.h
   trunk/libmcrypto/libmcrypto.pc.in
   trunk/libmcrypto/source/SipSimSmartCardGD.cxx
   trunk/libmcrypto/source/SmartCard.cxx
Log:
* Avoid exposing pcsc lite header(s) in libmcrypto API. Dependency of pcsc lite should be
  private to libmcrypto only, by using pcsc lite internal only.
* Remove "using namespace" from API header.


Modified: trunk/libmcrypto/include/libmcrypto/SmartCard.h
===================================================================
--- trunk/libmcrypto/include/libmcrypto/SmartCard.h	2007-01-03 23:22:12 UTC (rev 3083)
+++ trunk/libmcrypto/include/libmcrypto/SmartCard.h	2007-01-04 09:15:02 UTC (rev 3084)
@@ -27,13 +27,14 @@
 
 #include <libmcrypto/config.h>
 
-#include <PCSC/winscard.h>
 #include <libmutil/MemObject.h>
 #include <map>
 
-using namespace std;
+typedef long SCARDCONTEXT;
+typedef long SCARDHANDLE;
+typedef struct _SCARD_IO_REQUEST SCARD_IO_REQUEST;
 
-class SmartCard : public virtual MObject {
+class LIBMCRYPTO_API SmartCard : public virtual MObject {
 public:
 	/* constructor is called to connect to the smart card */
 	SmartCard();
@@ -71,7 +72,7 @@
 	char * readerNamesPtr;
 
 /* This map is used to store the index and reader names: map<int index, char * readerNames> */
-	map <int,char *> readerMap;
+	std::map <int,char *> readerMap;
 
 /* The resource manager handler */
 	SCARDCONTEXT hContext;

Modified: trunk/libmcrypto/libmcrypto.pc.in
===================================================================
--- trunk/libmcrypto/libmcrypto.pc.in	2007-01-03 23:22:12 UTC (rev 3083)
+++ trunk/libmcrypto/libmcrypto.pc.in	2007-01-04 09:15:02 UTC (rev 3084)
@@ -9,6 +9,6 @@
 Description: Minisip Cryptography Library (AES, base64, HMAC, X509)
 Version: @VERSION@
 Requires: libmutil >= 0.3.1, libmnetutil >= 0.3.1
-Libs: -L${libdir} -lmcrypto @SCSIM_LIBS@
-Libs.private: @MINISIP_LIBS@ @OPENSSL_LIBS@ @GNUTLS_LIBS@ @LIBS@
+Libs: -L${libdir} -lmcrypto
+Libs.private: @MINISIP_LIBS@ @OPENSSL_LIBS@ @GNUTLS_LIBS@ @SCSIM_LIBS@ @LIBS@
 Cflags: -I${includedir}

Modified: trunk/libmcrypto/source/SipSimSmartCardGD.cxx
===================================================================
--- trunk/libmcrypto/source/SipSimSmartCardGD.cxx	2007-01-03 23:22:12 UTC (rev 3083)
+++ trunk/libmcrypto/source/SipSimSmartCardGD.cxx	2007-01-04 09:15:02 UTC (rev 3084)
@@ -24,6 +24,8 @@
 #include <libmcrypto/SipSimSmartCardGD.h>
 #include <libmcrypto/SmartCardException.h>
 
+using namespace std;
+
 SipSimSmartCardGD::SipSimSmartCardGD():SmartCard() {
 	cerr << "XXXXXXXXXXXXXX SipSimSmartCardGD::SipSimSmartCardGD() running XXXXXXXXXXXXXXXXXXXx"<<endl;
 	

Modified: trunk/libmcrypto/source/SmartCard.cxx
===================================================================
--- trunk/libmcrypto/source/SmartCard.cxx	2007-01-03 23:22:12 UTC (rev 3083)
+++ trunk/libmcrypto/source/SmartCard.cxx	2007-01-04 09:15:02 UTC (rev 3084)
@@ -27,6 +27,10 @@
 #include <libmcrypto/SmartCardException.h>
 #include <libmutil/stringutils.h>
 
+#include <winscard.h>
+
+using namespace std;
+
 SmartCard::SmartCard(){
 	this -> userPinCode = NULL;
 	this -> adminPinCode = NULL;