diff options
Diffstat (limited to 'security/libbeid/files/patch-cardlayer')
| -rw-r--r-- | security/libbeid/files/patch-cardlayer | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/security/libbeid/files/patch-cardlayer b/security/libbeid/files/patch-cardlayer index 673e2c14db19..551d8c68035f 100644 --- a/security/libbeid/files/patch-cardlayer +++ b/security/libbeid/files/patch-cardlayer @@ -1,7 +1,5 @@ -Index: cardlayer/src/cache.cpp -=================================================================== ---- cardlayer/src/cache.cpp (revision 1614) -+++ cardlayer/src/cache.cpp (working copy) +--- cardcomm/pkcs11/src/cardlayer/cache.cpp.orig 2015-02-19 13:59:02 UTC ++++ cardcomm/pkcs11/src/cardlayer/cache.cpp @@ -203,10 +203,8 @@ void CCache::DiskStoreFile(const std::st ; // TODO: log else @@ -15,10 +13,8 @@ Index: cardlayer/src/cache.cpp fclose(f); } } -Index: cardlayer/src/card.cpp -=================================================================== ---- cardlayer/src/card.cpp (revision 1614) -+++ cardlayer/src/card.cpp (working copy) +--- cardcomm/pkcs11/src/cardlayer/card.cpp.orig 2015-02-19 13:59:02 UTC ++++ cardcomm/pkcs11/src/cardlayer/card.cpp @@ -301,7 +301,7 @@ tCacheInfo CCard::GetCacheInfo(const std { // By default no caching, card must implement this method @@ -28,10 +24,8 @@ Index: cardlayer/src/card.cpp return dontCache; } -Index: cardlayer/src/pkcs15.cpp -=================================================================== ---- cardlayer/src/pkcs15.cpp (revision 1614) -+++ cardlayer/src/pkcs15.cpp (working copy) +--- cardcomm/pkcs11/src/cardlayer/pkcs15.cpp.orig 2015-02-19 13:59:02 UTC ++++ cardcomm/pkcs11/src/cardlayer/pkcs15.cpp @@ -27,7 +27,7 @@ namespace eIDMW { @@ -56,10 +50,8 @@ Index: cardlayer/src/pkcs15.cpp m_poParser(NULL) { Clear(); -Index: cardlayer/src/pkcs15.h -=================================================================== ---- cardlayer/src/pkcs15.h (revision 1614) -+++ cardlayer/src/pkcs15.h (working copy) +--- cardcomm/pkcs11/src/cardlayer/pkcs15.h.orig 2015-02-19 13:59:02 UTC ++++ cardcomm/pkcs11/src/cardlayer/pkcs15.h @@ -90,7 +90,6 @@ namespace eIDMW private: @@ -68,11 +60,9 @@ Index: cardlayer/src/pkcs15.h PKCS15Parser *m_poParser; #ifdef WIN32 -Index: cardlayer/src/reader.cpp -=================================================================== ---- cardlayer/src/reader.cpp (revision 1614) -+++ cardlayer/src/reader.cpp (working copy) -@@ -280,8 +280,7 @@ std::string CReader::GetSerialNr() +--- cardcomm/pkcs11/src/cardlayer/reader.cpp.orig 2015-02-19 13:59:02 UTC ++++ cardcomm/pkcs11/src/cardlayer/reader.cpp +@@ -284,8 +284,7 @@ std::string CReader::GetSerialNr() } catch(CMWException &e) { @@ -82,11 +72,9 @@ Index: cardlayer/src/reader.cpp return m_oPKCS15.GetSerialNr(); } } -Index: cardlayer/src/threadpool.cpp -=================================================================== ---- cardlayer/src/threadpool.cpp (revision 1614) -+++ cardlayer/src/threadpool.cpp (working copy) -@@ -79,7 +79,7 @@ void CEventCallbackThread::Run() +--- cardcomm/pkcs11/src/cardlayer/threadpool.cpp.orig 2015-02-19 13:59:02 UTC ++++ cardcomm/pkcs11/src/cardlayer/threadpool.cpp +@@ -81,7 +81,7 @@ void CEventCallbackThread::Run() m_bRunning = false; } @@ -95,10 +83,8 @@ Index: cardlayer/src/threadpool.cpp { m_bStop = true; } -Index: cardlayer/src/threadpool.h -=================================================================== ---- cardlayer/src/threadpool.h (revision 1614) -+++ cardlayer/src/threadpool.h (working copy) +--- cardcomm/pkcs11/src/cardlayer/threadpool.h.orig 2015-02-19 13:59:02 UTC ++++ cardcomm/pkcs11/src/cardlayer/threadpool.h @@ -42,7 +42,7 @@ public: void Run(); |