Package: belpic
Followup-For: Bug #339344
Hi,
attached is a patch for the pointer conversion error.
MfG
Goswin
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.8-frosties-2
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
diff -u belpic-2.5.9/debian/changelog belpic-2.5.9/debian/changelog
--- belpic-2.5.9/debian/changelog
+++ belpic-2.5.9/debian/changelog
@@ -1,3 +1,9 @@
+belpic (2.5.9-1a0.mrvn.1) unstable; urgency=low
+
+ * size_t fix
+
+ -- Goswin von Brederlow <[EMAIL PROTECTED]> Mon, 17 Jul 2006 09:50:00 +0200
+
belpic (2.5.9-1) unstable; urgency=low
* New upstream release.
only in patch2:
unchanged:
--- belpic-2.5.9.orig/src/eidlib/OpenSCReader.h
+++ belpic-2.5.9/src/eidlib/OpenSCReader.h
@@ -34,7 +34,7 @@
virtual long Transmit(const unsigned char *pucSend, int iSendLen, unsigned char *pucRecv, unsigned long *pulRecvLen, BEID_Status *ptStatus);
virtual long BeginTransaction(BEID_Status *ptStatus);
virtual long EndTransaction(BEID_Status *ptStatus);
- virtual long ReadFile(const unsigned char *ucFile, int iFileLen, unsigned char *pucOutput, unsigned long *pulOutLen, BEID_Status *ptStatus);
+ virtual long ReadFile(const unsigned char *ucFile, int iFileLen, unsigned char *pucOutput, size_t *pulOutLen, BEID_Status *ptStatus);
virtual long SelectFile(const unsigned char *ucFile, int iFileLen, unsigned char ucP1, BEID_Status *ptStatus);
virtual long ReadBinary(unsigned char *pszOutput, unsigned long *pulOutLen, BEID_Status *ptStatus, int iOffset = 0, int iCount = MAX_FILE_SIZE);
virtual long UpdateBinary(unsigned char *pucInput, unsigned long ulInLen, BEID_Status *ptStatus);
only in patch2:
unchanged:
--- belpic-2.5.9.orig/src/eidlib/OpenSCReader.cpp
+++ belpic-2.5.9/src/eidlib/OpenSCReader.cpp
@@ -174,7 +174,7 @@
return lRet;
}
-long COpenSCReader::ReadFile(const unsigned char *ucFile, int iFileLen, unsigned char *pucOutput, unsigned long *pulOutLen, BEID_Status *ptStatus)
+long COpenSCReader::ReadFile(const unsigned char *ucFile, int iFileLen, unsigned char *pucOutput, size_t *pulOutLen, BEID_Status *ptStatus)
{
long lRet = SC_NO_ERROR;
if(m_p15Card != NULL)
@@ -183,7 +183,7 @@
sc_append_path_id(&tPath, ucFile, iFileLen);
tPath.count = -1;
tPath.type = SC_PATH_TYPE_PATH;
- if(SC_NO_ERROR != (lRet = sc_pkcs15_read_file2(m_p15Card, &tPath, pucOutput, (unsigned int*)pulOutLen, NULL)))
+ if(SC_NO_ERROR != (lRet = sc_pkcs15_read_file2(m_p15Card, &tPath, pucOutput, pulOutLen, NULL)))
{
*pulOutLen = 0;
}