[Pyscard-devel] SF.net SVN: pyscard:[381] trunk/pyscard/src/smartcard/scard/scard.i

[<lu...@us...>]

Revision: 381
          http://pyscard.svn.sourceforge.net/pyscard/?rev=381&view=rev
Author:   ludov
Date:     2010-03-11 09:22:34 +0000 (Thu, 11 Mar 2010)

Log Message:
-----------
Use MAX_BUFFER_SIZE_EXTENDED (64k) instead of 1024 for the receiving
buffer of SCardControl() and SCardTransmit()

Fixes "SCardTransmit with ISO7816 extended case APDU - ID: 2914636"
https://sourceforge.net/tracker/?func=detail&aid=2914636&group_id=196342&atid=957072

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/scard.i

Modified: trunk/pyscard/src/smartcard/scard/scard.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/scard.i	2010-03-10 12:46:10 UTC (rev 380)
+++ trunk/pyscard/src/smartcard/scard/scard.i	2010-03-11 09:22:34 UTC (rev 381)
@@ -182,6 +182,8 @@
 // SCARD_CTL_CODE defined in WinSmCrd.h included by Win32 winscard.h
 #endif //PCSCLITE
 
+#define MAX_BUFFER_SIZE_EXTENDED (1<<16)
+
 #include "pcsctypes.h"
 #include "helpers.h"
 #include "memlog.h"
@@ -439,8 +441,8 @@
         SCARDRETCODE lRet;
         winscard_init();
     
-        pblRecvBuffer->ab = (unsigned char*)mem_Malloc(1024*sizeof(unsigned char));
-        pblRecvBuffer->cBytes=1024;
+        pblRecvBuffer->ab = (unsigned char*)mem_Malloc(MAX_BUFFER_SIZE_EXTENDED*sizeof(unsigned char));
+        pblRecvBuffer->cBytes = MAX_BUFFER_SIZE_EXTENDED;
     
         lRet = (mySCardControl)(
                     hcard,
@@ -462,8 +464,8 @@
         SCARDRETCODE lRet;
         winscard_init();
     
-        pblRecvBuffer->ab = (unsigned char*)mem_Malloc(1024*sizeof(unsigned char));
-        pblRecvBuffer->cBytes=1024;
+        pblRecvBuffer->ab = (unsigned char*)mem_Malloc(MAX_BUFFER_SIZE_EXTENDED*sizeof(unsigned char));
+        pblRecvBuffer->cBytes = MAX_BUFFER_SIZE_EXTENDED;
     
         lRet = (mySCardControl)(
                     hcard,
@@ -801,8 +803,8 @@
 
     winscard_init();
 
-    pblRecvBuffer->ab = (unsigned char*)mem_Malloc(1024*sizeof(unsigned char));
-    pblRecvBuffer->cBytes=1024;
+    pblRecvBuffer->ab = (unsigned char*)mem_Malloc(MAX_BUFFER_SIZE_EXTENDED*sizeof(unsigned char));
+    pblRecvBuffer->cBytes = MAX_BUFFER_SIZE_EXTENDED;
 
     // keep in sync with redefinition in PcscDefs.i
     switch(pioSendPci)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.