Hello community, here is the log from the commit of package pcsc-cyberjack for openSUSE:Factory checked in at 2014-05-09 06:58:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-cyberjack (Old) and /work/SRC/openSUSE:Factory/.pcsc-cyberjack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-cyberjack" Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-cyberjack/pcsc-cyberjack.changes 2014-04-26 06:06:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcsc-cyberjack.new/pcsc-cyberjack.changes 2014-05-09 06:58:06.000000000 +0200 @@ -1,0 +2,11 @@ +Sun May 4 22:20:57 UTC 2014 - [email protected] + +- fix for changed data structure in PCSC's reader.h + (data-structure.patch) + +------------------------------------------------------------------- +Tue Apr 29 18:14:56 UTC 2014 - [email protected] + +- fixed typo in udev rule + +------------------------------------------------------------------- New: ---- data-structure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-cyberjack.spec ++++++ --- /var/tmp/diff_new_pack.DfjsnA/_old 2014-05-09 06:58:07.000000000 +0200 +++ /var/tmp/diff_new_pack.DfjsnA/_new 2014-05-09 06:58:07.000000000 +0200 @@ -50,6 +50,7 @@ Patch1: ctapi-cyberjack-configure.patch Patch2: ctapi-cyberjack-check.patch Patch3: pcsc-cyberjack-fprintf.patch +Patch4: data-structure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define ifddir %(pkg-config --variable=usbdropdir libpcsclite) Supplements: modalias(usb:v0C4Bp0100d*dc*dsc*dp*ic*isc*ip*) @@ -74,6 +75,7 @@ %patch1 %patch2 %patch3 -p1 +%patch4 -p1 %build ACLOCAL="aclocal -I m4" autoreconf -f -i ++++++ 40-cyberjack.rules ++++++ --- /var/tmp/diff_new_pack.DfjsnA/_old 2014-05-09 06:58:07.000000000 +0200 +++ /var/tmp/diff_new_pack.DfjsnA/_new 2014-05-09 06:58:07.000000000 +0200 @@ -1,6 +1,6 @@ SUBSYSTEM!="usb", GOTO="cyberjack_rules_end" ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end" -ACTION!="add", GOTO=cyberjack_rules_end" +ACTION!="add", GOTO="cyberjack_rules_end" ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" ++++++ data-structure.patch ++++++ diff --git a/cjeca32/CCIDReader.cpp b/cjeca32/CCIDReader.cpp index 1ab4135..91489bc 100644 --- a/cjeca32/CCIDReader.cpp +++ b/cjeca32/CCIDReader.cpp @@ -3115,15 +3115,15 @@ RSCT_IFD_RESULT CCCIDReader::IfdVendor(uint32_t IoCtrlCode,uint8_t *Input,uint32 case CJPCSC_VEN_IOCTRL_VERIFY_PIN_DIRECT: if(InputLength<sizeof(PIN_VERIFY_STRUCTURE)) return STATUS_INVALID_BUFFER_SIZE; - if(InputLength!=sizeof(PIN_VERIFY_STRUCTURE)-sizeof(uint8_t)+((PIN_VERIFY_STRUCTURE *)Input)->ulDataLength) + if(InputLength!=sizeof(PIN_VERIFY_STRUCTURE)-sizeof(PIN_VERIFY_STRUCTURE::abData)+((PIN_VERIFY_STRUCTURE *)Input)->ulDataLength) return STATUS_INVALID_BUFFER_SIZE; return IfdVerifyPinDirect((PIN_VERIFY_STRUCTURE *)Input,Output,OutputLength); case CJPCSC_VEN_IOCTRL_MODIFY_PIN_DIRECT: if(InputLength<sizeof(PIN_MODIFY_STRUCTURE)) return STATUS_INVALID_BUFFER_SIZE; - if(InputLength!=sizeof(PIN_MODIFY_STRUCTURE)-sizeof(uint8_t)+((PIN_MODIFY_STRUCTURE *)Input)->ulDataLength) - return STATUS_INVALID_BUFFER_SIZE; + if(InputLength!=sizeof(PIN_MODIFY_STRUCTURE)-sizeof(PIN_MODIFY_STRUCTURE::abData)+((PIN_MODIFY_STRUCTURE *)Input)->ulDataLength) + return STATUS_INVALID_BUFFER_SIZE; return IfdModifyPinDirect((PIN_MODIFY_STRUCTURE *)Input,Output,OutputLength); case CJPCSC_VEN_IOCTRL_SET_NORM: if(InputLength<1) diff --git a/cjeca32/stdafx.h b/cjeca32/stdafx.h index 7149946..87c78f8 100644 --- a/cjeca32/stdafx.h +++ b/cjeca32/stdafx.h @@ -57,6 +57,12 @@ #include "cjeca32.h" #include "PCSC10.h" +#ifdef OS_LINUX +#include <PCSC/reader.h> +#else +#include "PCSC10.h" +#endif + #include "Debug.h" #include "RSCTCriticalSection.h" #include "BaseCommunication.h" diff --git a/doc/verifypin_ascii.c b/doc/verifypin_ascii.c index c41d97b..c27caba 100644 --- a/doc/verifypin_ascii.c +++ b/doc/verifypin_ascii.c @@ -330,7 +330,7 @@ int main(int argc, char *argv[]) pin_verify -> abData[offset++] = 0x20; /* '\0' */ pin_verify -> ulDataLength = htonl(offset); /* APDU size */ - length = sizeof(PIN_VERIFY_STRUCTURE) + offset -1; /* -1 because PIN_VERIFY_STRUCTURE contains the first byte of abData[] */ + length = sizeof(PIN_VERIFY_STRUCTURE) + offset - sizeof(PIN_VERIFY_STRUCTURE::abData); /* because PIN_VERIFY_STRUCTURE may contain the first byte of abData[] */ printf(" command:"); for (i=0; i<length; i++) @@ -463,7 +463,7 @@ int main(int argc, char *argv[]) pin_modify -> abData[offset++] = 0x30; /* '0' */ pin_modify -> ulDataLength = HOST_TO_CCID_32(offset); /* APDU size */ - length = sizeof(PIN_MODIFY_STRUCTURE) + offset -1; /* -1 because PIN_MODIFY_STRUCTURE contains the first byte of abData[] */ + length = sizeof(PIN_MODIFY_STRUCTURE) + offset -sizeof(PIN_MODIFY_STRUCTURE::abData); /* because PIN_MODIFY_STRUCTURE may contain the first byte of abData[] */; printf(" command:"); for (i=0; i<length; i++) diff --git a/doc/verifypin_fpin2.c b/doc/verifypin_fpin2.c index 4ee4362..c4bc9c1 100644 --- a/doc/verifypin_fpin2.c +++ b/doc/verifypin_fpin2.c @@ -331,7 +331,7 @@ int main(int argc, char *argv[]) pin_verify -> abData[offset++] = 0xff; /* '\0' */ pin_verify -> ulDataLength = htonl(offset); /* APDU size */ - length = sizeof(PIN_VERIFY_STRUCTURE) + offset -1; /* -1 because PIN_VERIFY_STRUCTURE contains the first byte of abData[] */ + length = sizeof(PIN_VERIFY_STRUCTURE) + offset - sizeof(PIN_VERIFY_STRUCTURE::abData); /* because PIN_VERIFY_STRUCTURE may contain the first byte of abData[] */ printf(" command:"); for (i=0; i<length; i++) @@ -464,7 +464,7 @@ int main(int argc, char *argv[]) pin_modify -> abData[offset++] = 0x30; /* '0' */ pin_modify -> ulDataLength = HOST_TO_CCID_32(offset); /* APDU size */ - length = sizeof(PIN_MODIFY_STRUCTURE) + offset -1; /* -1 because PIN_MODIFY_STRUCTURE contains the first byte of abData[] */ + length = sizeof(PIN_MODIFY_STRUCTURE) + offset -sizeof(PIN_MODIFY_STRUCTURE::abData); /* because PIN_MODIFY_STRUCTURE may contain the first byte of abData[] */ printf(" command:"); for (i=0; i<length; i++) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
