diff options
author | Alon Bar-Lev <alonbl@gentoo.org> | 2014-02-19 19:40:09 +0000 |
---|---|---|
committer | Alon Bar-Lev <alonbl@gentoo.org> | 2014-02-19 19:40:09 +0000 |
commit | 0a8f77701cc2c81a2c08e12fadc93f2724e8454f (patch) | |
tree | 1083a714227d98964633098c33490ffe7f82ae01 /dev-libs/opensc/files | |
parent | Fix USE -ssl (diff) | |
download | historical-0a8f77701cc2c81a2c08e12fadc93f2724e8454f.tar.gz historical-0a8f77701cc2c81a2c08e12fadc93f2724e8454f.tar.bz2 historical-0a8f77701cc2c81a2c08e12fadc93f2724e8454f.zip |
Cleanup old ebuilds
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51
Diffstat (limited to 'dev-libs/opensc/files')
-rw-r--r-- | dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch | 64 | ||||
-rw-r--r-- | dev-libs/opensc/files/opensc-0.11.13-overflows.patch | 71 |
2 files changed, 0 insertions, 135 deletions
diff --git a/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch b/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch deleted file mode 100644 index 1cac75e8a15d..000000000000 --- a/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: opensc-0.11.13/src/libopensc/internal-winscard.h -=================================================================== ---- opensc-0.11.13.orig/src/libopensc/internal-winscard.h -+++ opensc-0.11.13/src/libopensc/internal-winscard.h -@@ -77,7 +77,7 @@ typedef struct - unsigned long cbAtr; - unsigned char rgbAtr[MAX_ATR_SIZE]; - } --SCARD_READERSTATE_A; -+SCARD_READERSTATE; - - typedef struct _SCARD_IO_REQUEST - { -@@ -87,8 +87,8 @@ typedef struct _SCARD_IO_REQUEST - SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; - - typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; --typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A, -- *LPSCARD_READERSTATE_A; -+typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE, -+ *SCARD_READERSTATE; - - #endif /* HAVE_SCARD_H */ - -@@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact - typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen, - LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen); - typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout, -- LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders); -+ SCARD_READERSTATE *rgReaderStates, DWORD cReaders); - typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength, - LPVOID pbRecvBuffer, LPDWORD lpBytesReturned); - typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer, -Index: opensc-0.11.13/src/libopensc/reader-pcsc.c -=================================================================== ---- opensc-0.11.13.orig/src/libopensc/reader-pcsc.c -+++ opensc-0.11.13/src/libopensc/reader-pcsc.c -@@ -80,7 +80,7 @@ struct pcsc_private_data { - - struct pcsc_slot_data { - SCARDHANDLE pcsc_card; -- SCARD_READERSTATE_A reader_state; -+ SCARD_READERSTATE reader_state; - DWORD verify_ioctl; - DWORD verify_ioctl_start; - DWORD verify_ioctl_finish; -@@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader - sc_context_t *ctx; - SCARDCONTEXT pcsc_ctx; - LONG ret; -- SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS]; -+ SCARD_READERSTATE rgReaderStates[SC_MAX_READERS]; - unsigned long on_bits, off_bits; - time_t end_time, now, delta; - size_t i; -@@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader - /* Wait for a status change and return if it's a card insert/removal - */ - for( ; ; ) { -- SCARD_READERSTATE_A *rsp; -+ SCARD_READERSTATE *rsp; - - /* Scan the current state of all readers to see if they - * match any of the events we're polling for */ diff --git a/dev-libs/opensc/files/opensc-0.11.13-overflows.patch b/dev-libs/opensc/files/opensc-0.11.13-overflows.patch deleted file mode 100644 index 3b83e2d45f37..000000000000 --- a/dev-libs/opensc/files/opensc-0.11.13-overflows.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/src/libopensc/internal.h -+++ b/src/libopensc/internal.h -@@ -49,6 +49,13 @@ extern "C" { - #define sleep(t) Sleep((t) * 1000) - #endif - -+#ifndef MAX -+#define MAX(x, y) (((x) > (y)) ? (x) : (y)) -+#endif -+#ifndef MIN -+#define MIN(x, y) (((x) < (y)) ? (x) : (y)) -+#endif -+ - struct sc_atr_table { - /* The atr fields are required to - * be in aa:bb:cc hex format. */ ---- a/src/libopensc/muscle.c -+++ b/src/libopensc/muscle.c -@@ -31,13 +31,6 @@ - #define MSC_DSA_PUBLIC 0x04 - #define MSC_DSA_PRIVATE 0x05 - --#ifndef MAX --#define MAX(x, y) (((x) > (y)) ? (x) : (y)) --#endif --#ifndef MIN --#define MIN(x, y) (((x) < (y)) ? (x) : (y)) --#endif -- - static msc_id inputId = { { 0xFF, 0xFF, 0xFF, 0xFF } }; - static msc_id outputId = { { 0xFF, 0xFF, 0xFF, 0xFE } }; - ---- a/src/libopensc/card-acos5.c -+++ b/src/libopensc/card-acos5.c -@@ -138,8 +138,8 @@ static int acos5_get_serialnr(sc_card_t * card, sc_serial_number_t * serial) - /* - * Cache serial number. - */ -- memcpy(card->serialnr.value, apdu.resp, apdu.resplen); -- card->serialnr.len = apdu.resplen; -+ memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR)); -+ card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR); - - /* - * Copy and return serial number. ---- a/src/libopensc/card-atrust-acos.c -+++ b/src/libopensc/card-atrust-acos.c -@@ -842,8 +842,8 @@ static int acos_get_serialnr(sc_card_t *card, sc_serial_number_t *serial) - if (apdu.sw1 != 0x90 || apdu.sw2 != 0x00) - return SC_ERROR_INTERNAL; - /* cache serial number */ -- memcpy(card->serialnr.value, apdu.resp, apdu.resplen); -- card->serialnr.len = apdu.resplen; -+ memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR)); -+ card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR); - /* copy and return serial number */ - memcpy(serial, &card->serialnr, sizeof(*serial)); - return SC_SUCCESS; ---- a/src/libopensc/card-starcos.c -+++ b/src/libopensc/card-starcos.c -@@ -1279,8 +1279,8 @@ static int starcos_get_serialnr(sc_card_t *card, sc_serial_number_t *serial) - if (apdu.sw1 != 0x90 || apdu.sw2 != 0x00) - return SC_ERROR_INTERNAL; - /* cache serial number */ -- memcpy(card->serialnr.value, apdu.resp, apdu.resplen); -- card->serialnr.len = apdu.resplen; -+ memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR)); -+ card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR); - /* copy and return serial number */ - memcpy(serial, &card->serialnr, sizeof(*serial)); - return SC_SUCCESS; |