Hello community,
here is the log from the commit of package pcsc-ccid for openSUSE:Factory checked in at 2014-02-16 19:54:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcsc-ccid (Old)
and /work/SRC/openSUSE:Factory/.pcsc-ccid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-ccid"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pcsc-ccid/pcsc-ccid.changes 2013-11-26 19:21:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pcsc-ccid.new/pcsc-ccid.changes 2014-02-16 19:54:17.000000000 +0100
@@ -1,0 +2,21 @@
+Sat Feb 15 20:48:40 UTC 2014 - wr@rosenauer.org
+
+- Updated to version 1.4.15
+ * Add support of
+ DUALi DRAGON NFC READER
+ Feitian bR301
+ Gemalto CR30 reader in serial communication
+ Gemalto Ezio Shield Pro SC
+ IIT E.Key Almaz-1C
+ * PIN_MODIFY_STRUCTURE & PIN_VERIFY_STRUCTURE: Fix calculation of
+ the command length after pcsc-lite 1.8.9 (October 2013) changed
+ the PCSC/reader.h header
+ * Add specific PIN min (0) & max (25) sizes for SmartTerminal ST-2xxx
+ * Do not get the data rates if bNumDataRatesSupported = 0
+ * Support Gemalto features for pinpad readers MinimumPINSize,
+ MaximumPINSize and bEntryValidationCondition are fetched from the
+ reader firmware
+ * disable (broken) pinpad for Fujitsu SmartCase KB SCR eSIG
+ * some minor bugs removed
+
+-------------------------------------------------------------------
Old:
----
ccid-1.4.14.tar.bz2
ccid-1.4.14.tar.bz2.asc
New:
----
ccid-1.4.15.tar.bz2
ccid-1.4.15.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-ccid.spec ++++++
--- /var/tmp/diff_new_pack.U9gfNB/_old 2014-02-16 19:54:17.000000000 +0100
+++ /var/tmp/diff_new_pack.U9gfNB/_new 2014-02-16 19:54:17.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pcsc-ccid
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,7 @@
%if %suse_version > 1220
BuildRequires: gpg-offline
%endif
-Version: 1.4.14
+Version: 1.4.15
Release: 0
Url: http://pcsclite.alioth.debian.org/ccid.html
Summary: PCSC Driver for CCID Based Smart Card Readers and GemPC Twin Serial Reader
++++++ ccid-1.4.14.tar.bz2 -> ccid-1.4.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/MacOSX/debuglog.h new/ccid-1.4.15/MacOSX/debuglog.h
--- old/ccid-1.4.14/MacOSX/debuglog.h 2011-07-09 14:10:50.000000000 +0200
+++ new/ccid-1.4.15/MacOSX/debuglog.h 2014-02-11 18:47:36.000000000 +0100
@@ -6,7 +6,33 @@
* Copyright (C) 1999-2011
* Ludovic Rousseau
*
- * $Id: debuglog.h 5854 2011-07-09 11:10:32Z rousseau $
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: debuglog.h 6822 2014-01-13 15:21:25Z rousseau $
*/
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/MacOSX/ifdhandler.h new/ccid-1.4.15/MacOSX/ifdhandler.h
--- old/ccid-1.4.14/MacOSX/ifdhandler.h 2012-08-12 16:33:49.000000000 +0200
+++ new/ccid-1.4.15/MacOSX/ifdhandler.h 2014-02-11 18:47:36.000000000 +0100
@@ -8,7 +8,33 @@
* Copyright (C) 2002-2011
* Ludovic Rousseau
*
- * $Id: ifdhandler.h 6413 2012-08-08 09:35:18Z rousseau $
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: ifdhandler.h 6822 2014-01-13 15:21:25Z rousseau $
*/
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/MacOSX/reader.h new/ccid-1.4.15/MacOSX/reader.h
--- old/ccid-1.4.14/MacOSX/reader.h 2013-06-12 13:56:21.000000000 +0200
+++ new/ccid-1.4.15/MacOSX/reader.h 2014-02-11 18:47:36.000000000 +0100
@@ -6,7 +6,33 @@
* Copyright (C) 2005-2009
* Ludovic Rousseau
*
- * $Id: reader.h 6638 2013-05-28 08:20:15Z rousseau $
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: reader.h 6822 2014-01-13 15:21:25Z rousseau $
*/
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/Makefile.in new/ccid-1.4.15/Makefile.in
--- old/ccid-1.4.14/Makefile.in 2013-11-25 19:15:25.000000000 +0100
+++ new/ccid-1.4.15/Makefile.in 2014-02-14 11:00:23.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -78,11 +78,11 @@
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in COPYING ar-lib compile config.guess \
- config.sub depcomp install-sh missing ylwrap ltmain.sh
+ $(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+ README ar-lib compile config.guess config.sub depcomp \
+ install-sh missing ylwrap ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -365,15 +365,15 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -655,9 +655,10 @@
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/README new/ccid-1.4.15/README
--- old/ccid-1.4.14/README 2013-11-25 19:15:15.000000000 +0100
+++ new/ccid-1.4.15/README 2014-02-14 10:22:39.000000000 +0100
@@ -118,7 +118,38 @@
History:
========
-1.4.14 - 25 NOvember 2013, Ludovic Rousseau
+1.4.15 - 14 February 2014, Ludovic Rousseau
+ - Add support of
+ . DUALi DRAGON NFC READER
+ . Feitian bR301
+ . Gemalto CR30 reader in serial communication
+ . Gemalto Ezio Shield Pro SC
+ . IIT E.Key Almaz-1C
+ - PIN_MODIFY_STRUCTURE & PIN_VERIFY_STRUCTURE: Fix calculation of
+ the command length after pcsc-lite 1.8.9 (October 2013) changed
+ the PCSC/reader.h header
+ - Add specific PIN min (0) & max (25) sizes for SmartTerminal
+ ST-2xxx
+ - Do not get the data rates if bNumDataRatesSupported = 0
+ - Support Gemalto features for pinpad readers MinimumPINSize,
+ MaximumPINSize and bEntryValidationCondition are fetched from the
+ reader firmware
+ - disable (broken) pinpad for Fujitsu SmartCase KB SCR eSIG
+ - examples/scardcontrol.c:
+ . Parse codes returned by a pinpad (as SW1/SW2)
+ Known codes for now are:
+ 0x9000: Success
+ 0x6400: Timeout
+ 0x6401: Cancelled by user
+ 0x6402: PIN mismatch
+ 0x6403: Too short or too long PIN
+ . Retrieve min and max PIN sizes from the driver
+ . Retrieve bEntryValidationCondition from the driver
+ - be more strict for bInterfaceClass = 255 by also checking extra_length
+ - some minor bugs removed
+
+
+1.4.14 - 25 November 2013, Ludovic Rousseau
- Add support of
. Gemalto GemCore SIM Pro firmware 2.0 (using USB)
- report FEATURE_IFD_PIN_PROPERTIES only for pinpad readers
@@ -929,6 +960,6 @@
- First public release
-$Id: README 6795 2013-11-25 18:09:17Z rousseau $
+$Id: README 6846 2014-02-14 09:19:48Z rousseau $
vim:ts=20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/aclocal.m4 new/ccid-1.4.15/aclocal.m4
--- old/ccid-1.4.14/aclocal.m4 2013-11-25 19:15:23.000000000 +0100
+++ new/ccid-1.4.15/aclocal.m4 2014-02-14 11:00:22.000000000 +0100
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -195,7 +195,7 @@
[am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14], [],
+m4_if([$1], [1.14.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -211,7 +211,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/configure new/ccid-1.4.15/configure
--- old/ccid-1.4.14/configure 2013-11-25 19:15:25.000000000 +0100
+++ new/ccid-1.4.15/configure 2014-02-14 11:00:23.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ccid 1.4.14.
+# Generated by GNU Autoconf 2.69 for ccid 1.4.15.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='ccid'
PACKAGE_TARNAME='ccid'
-PACKAGE_VERSION='1.4.14'
-PACKAGE_STRING='ccid 1.4.14'
+PACKAGE_VERSION='1.4.15'
+PACKAGE_STRING='ccid 1.4.15'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1362,7 +1362,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ccid 1.4.14 to adapt to many kinds of systems.
+\`configure' configures ccid 1.4.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1432,7 +1432,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ccid 1.4.14:";;
+ short | recursive ) echo "Configuration of ccid 1.4.15:";;
esac
cat <<\_ACEOF
@@ -1568,7 +1568,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ccid configure 1.4.14
+ccid configure 1.4.15
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1987,7 +1987,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ccid $as_me 1.4.14, which was
+It was created by ccid $as_me 1.4.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2851,7 +2851,7 @@
# Define the identity of the package.
PACKAGE='ccid'
- VERSION='1.4.14'
+ VERSION='1.4.15'
cat >>confdefs.h <<_ACEOF
@@ -7343,7 +7343,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7368,7 +7368,10 @@
;;
esac
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -7387,7 +7390,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -14159,7 +14165,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ccid $as_me 1.4.14, which was
+This file was extended by ccid $as_me 1.4.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14225,7 +14231,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ccid config.status 1.4.14
+ccid config.status 1.4.15
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/configure.ac new/ccid-1.4.15/configure.ac
--- old/ccid-1.4.14/configure.ac 2013-11-25 19:15:15.000000000 +0100
+++ new/ccid-1.4.15/configure.ac 2014-02-14 10:22:39.000000000 +0100
@@ -1,12 +1,12 @@
# Process this file with autoconf to produce a configure script.
# You may need to use autoconf 2.56 or newer
-# $Id: configure.ac 6795 2013-11-25 18:09:17Z rousseau $
+# $Id: configure.ac 6846 2014-02-14 09:19:48Z rousseau $
# Require autoconf 2.61
AC_PREREQ([2.69])
-AC_INIT([ccid],[1.4.14])
+AC_INIT([ccid],[1.4.15])
AC_CONFIG_SRCDIR(src/ifdhandler.c)
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip subdir-objects)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/contrib/Kobil_mIDentity_switch/Makefile.in new/ccid-1.4.15/contrib/Kobil_mIDentity_switch/Makefile.in
--- old/ccid-1.4.14/contrib/Kobil_mIDentity_switch/Makefile.in 2013-11-25 19:15:26.000000000 +0100
+++ new/ccid-1.4.15/contrib/Kobil_mIDentity_switch/Makefile.in 2014-02-14 11:00:23.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -331,9 +331,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Kobil_mIDentity_switch/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Kobil_mIDentity_switch/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu contrib/Kobil_mIDentity_switch/Makefile
+ $(AUTOMAKE) --foreign contrib/Kobil_mIDentity_switch/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/contrib/Makefile.in new/ccid-1.4.15/contrib/Makefile.in
--- old/ccid-1.4.14/contrib/Makefile.in 2013-11-25 19:15:26.000000000 +0100
+++ new/ccid-1.4.15/contrib/Makefile.in 2014-02-14 11:00:23.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -327,9 +327,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu contrib/Makefile
+ $(AUTOMAKE) --foreign contrib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/contrib/RSA_SecurID/Makefile.in new/ccid-1.4.15/contrib/RSA_SecurID/Makefile.in
--- old/ccid-1.4.14/contrib/RSA_SecurID/Makefile.in 2013-11-25 19:15:26.000000000 +0100
+++ new/ccid-1.4.15/contrib/RSA_SecurID/Makefile.in 2014-02-14 11:00:23.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -328,9 +328,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/RSA_SecurID/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/RSA_SecurID/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu contrib/RSA_SecurID/Makefile
+ $(AUTOMAKE) --foreign contrib/RSA_SecurID/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/examples/Makefile.in new/ccid-1.4.15/examples/Makefile.in
--- old/ccid-1.4.14/examples/Makefile.in 2013-11-25 19:15:26.000000000 +0100
+++ new/ccid-1.4.15/examples/Makefile.in 2014-02-14 11:00:23.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -329,9 +329,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu examples/Makefile
+ $(AUTOMAKE) --foreign examples/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/examples/scardcontrol.c new/ccid-1.4.15/examples/scardcontrol.c
--- old/ccid-1.4.14/examples/scardcontrol.c 2013-03-16 14:52:33.000000000 +0100
+++ new/ccid-1.4.15/examples/scardcontrol.c 2014-01-12 19:44:31.000000000 +0100
@@ -18,7 +18,7 @@
*/
/*
- * $Id: scardcontrol.c 6566 2013-03-12 14:00:37Z rousseau $
+ * $Id: scardcontrol.c 6818 2014-01-07 10:16:28Z rousseau $
*/
#include
@@ -37,8 +37,8 @@
#include "PCSCv2part10.h"
-#undef VERIFY_PIN
-#define MODIFY_PIN
+#define VERIFY_PIN
+#undef MODIFY_PIN
#undef GET_GEMPC_FIRMWARE
#ifndef TRUE
@@ -167,6 +167,39 @@
}
} /* parse_properties */
+
+static const char *pinpad_return_codes(unsigned char bRecvBuffer[])
+{
+ const char * ret = "UNKNOWN";
+
+ if ((0x90 == bRecvBuffer[0]) && (0x00 == bRecvBuffer[1]))
+ ret = "Success";
+
+ if (0x64 == bRecvBuffer[0])
+ {
+ switch (bRecvBuffer[1])
+ {
+ case 0x00:
+ ret = "Timeout";
+ break;
+
+ case 0x01:
+ ret = "Cancelled by user";
+ break;
+
+ case 0x02:
+ ret = "PIN mismatch";
+ break;
+
+ case 0x03:
+ ret = "Too short or too long PIN";
+ break;
+ }
+ }
+
+ return ret;
+}
+
int main(int argc, char *argv[])
{
LONG rv;
@@ -202,6 +235,15 @@
#ifdef MODIFY_PIN
PIN_MODIFY_STRUCTURE *pin_modify;
#endif
+ int PIN_min_size = 4;
+ int PIN_max_size = 8;
+
+ /* table for bEntryValidationCondition
+ * 0x01: Max size reached
+ * 0x02: Validation key pressed
+ * 0x04: Timeout occured
+ */
+ int bEntryValidationCondition = 7;
printf("SCardControl sample code\n");
printf("V 1.4 © 2004-2010, Ludovic Rousseau \n\n");
@@ -394,6 +436,29 @@
else
PRINT_GREEN_HEX4(" wIdProduct", value);
+ ret = PCSCv2Part10_find_TLV_property_by_tag_from_hcard(hCard, PCSCv2_PART10_PROPERTY_bMinPINSize, &value);
+ if (0 == ret)
+ {
+ PIN_min_size = value;
+ PRINT_GREEN_DEC(" PIN min size defined", PIN_min_size);
+ }
+
+
+ ret = PCSCv2Part10_find_TLV_property_by_tag_from_hcard(hCard, PCSCv2_PART10_PROPERTY_bMaxPINSize, &value);
+ if (0 == ret)
+ {
+ PIN_max_size = value;
+ PRINT_GREEN_DEC(" PIN max size defined", PIN_max_size);
+ }
+
+ ret = PCSCv2Part10_find_TLV_property_by_tag_from_hcard(hCard, PCSCv2_PART10_PROPERTY_bEntryValidationCondition, &value);
+ if (0 == ret)
+ {
+ bEntryValidationCondition = value;
+ PRINT_GREEN_DEC(" Entry Validation Condition defined",
+ bEntryValidationCondition);
+ }
+
printf("\n");
}
@@ -530,19 +595,14 @@
printf(" Secure verify PIN\n");
pin_verify = (PIN_VERIFY_STRUCTURE *)bSendBuffer;
- /* table for bEntryValidationCondition
- * 0x01: Max size reached
- * 0x02: Validation key pressed
- * 0x04: Timeout occured
- */
/* PC/SC v2.02.05 Part 10 PIN verification data structure */
pin_verify -> bTimerOut = 0x00;
pin_verify -> bTimerOut2 = 0x00;
pin_verify -> bmFormatString = 0x82;
pin_verify -> bmPINBlockString = 0x04;
pin_verify -> bmPINLengthFormat = 0x00;
- pin_verify -> wPINMaxExtraDigit = 0x0408; /* Min Max */
- pin_verify -> bEntryValidationCondition = 0x02; /* validation key pressed */
+ pin_verify -> wPINMaxExtraDigit = (PIN_min_size << 8) + PIN_max_size;
+ pin_verify -> bEntryValidationCondition = bEntryValidationCondition;
pin_verify -> bNumberMessage = 0x01;
pin_verify -> wLangId = 0x0904;
pin_verify -> bMsgIndex = 0x00;
@@ -568,7 +628,7 @@
pin_verify -> abData[offset++] = 0x00; /* '\0' */
pin_verify -> ulDataLength = 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;
printf(" command:");
for (i=0; i bmPINLengthFormat = 0x00;
pin_modify -> bInsertionOffsetOld = 0x00; /* offset from APDU start */
pin_modify -> bInsertionOffsetNew = 0x04; /* offset from APDU start */
- pin_modify -> wPINMaxExtraDigit = 0x0408; /* Min Max */
+ pin_modify -> wPINMaxExtraDigit = (PIN_min_size << 8) + PIN_max_size;
pin_modify -> bConfirmPIN = 0x03; /* b0 set = confirmation requested */
/* b1 set = current PIN entry requested */
- pin_modify -> bEntryValidationCondition = 0x02; /* validation key pressed */
+ pin_modify -> bEntryValidationCondition = bEntryValidationCondition;
pin_modify -> bNumberMessage = 0x03; /* see table above */
pin_modify -> wLangId = 0x0904;
pin_modify -> bMsgIndex1 = 0x00;
@@ -712,7 +773,7 @@
pin_modify -> abData[offset++] = 0x30; /* '0' */
pin_modify -> ulDataLength = 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;
printf(" command:");
for (i=0; i conftest.$ac_ext
@@ -1333,7 +1333,10 @@
;;
esac
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1352,7 +1355,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/missing new/ccid-1.4.15/missing
--- old/ccid-1.4.14/missing 2013-08-12 23:40:46.000000000 +0200
+++ new/ccid-1.4.15/missing 2014-02-14 11:00:05.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/readers/Makefile.in new/ccid-1.4.15/readers/Makefile.in
--- old/ccid-1.4.14/readers/Makefile.in 2013-11-25 19:15:26.000000000 +0100
+++ new/ccid-1.4.15/readers/Makefile.in 2014-02-14 11:00:23.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -268,9 +268,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu readers/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign readers/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu readers/Makefile
+ $(AUTOMAKE) --foreign readers/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/readers/supported_readers.txt new/ccid-1.4.15/readers/supported_readers.txt
--- old/ccid-1.4.14/readers/supported_readers.txt 2013-11-25 18:08:07.000000000 +0100
+++ new/ccid-1.4.15/readers/supported_readers.txt 2014-02-11 18:47:35.000000000 +0100
@@ -1,6 +1,6 @@
#
# List of readers supported by the CCID driver
-# Generated: 2013-11-25
+# Generated: 2014-02-08
#
# DO NOT EDIT BY HAND
@@ -201,8 +201,11 @@
0x0982:0x0008:COVADIS VEGA-ALPHA
0x0982:0x0040:COVADIS Auriga
-# Dectel
-0x0BDA:0x0165:Dectel CI692
+# DUALi
+0x1DB2:0x088B:DUALi DRAGON NFC READER
+
+# Feitian
+0x096E:0x061A:Feitian bR301
# Feitian Technologies
0x096E:0x0505:Feitian Technologies FT SCR310
@@ -231,6 +234,7 @@
0x08E6:0x3479:Gemplus GemCore POS Pro Smart Card Reader
# Generic
+0x0BDA:0x0165:Generic Smart Card Reader Interface
0x0BDA:0x0169:Generic USB2.0-CRW
# German Privacy Foundation
@@ -266,6 +270,9 @@
0x04E6:0x5721:Identive Identive CLOUD 4510 F Contactless + SAM Reader
0x04E6:0x5810:Identive CLOUD 2700 R Smart Card Reader
+# IIT
+0x03EB:0x9324:IIT E.Key Almaz-1C
+
# Inside Secure
0x2406:0x6300:Inside Secure VaultIC 420 Smart Object
0x2406:0x6301:Inside Secure VaultIC 440 Smart Object
@@ -424,6 +431,7 @@
0x1A44:0x0122:VASCO DIGIPASS KEY 202
0x1A44:0x0855:VASCO DP855
0x1A44:0x0865:VASCO DP865
+0x1A44:0x0870:VASCO DIGIPASS 870
0x1A44:0x0920:VASCO DIGIPASS 920
# VMware
@@ -554,6 +562,9 @@
#0x08E6:0x3478:Gemalto USB GemPCPinpad SmartCard Reader (GemPCPinpad.txt)
#0x08E6:0x3478:Gemalto USB GemPCPinpad SmartCard Reader (GemPCPinpadv2.txt)
+#0x08E6:0x34C0:Gemalto Ezio Shield (Gemalto_Ezio_Shield.txt)
+#0x08E6:0x34C0:Gemalto Ezio Shield Pro SC (Gemalto_Ezio_Shield_Pro_SC.txt)
+
#0x08E6:0x5503:Gemalto Prox Dual USB PC LinkReader (GemProxDU.txt)
#0x08E6:0x5503:Gemalto Prox Dual USB PC LinkReader (GemProxDU.txt_i1)
@@ -576,3 +587,6 @@
#0x0F14:0x003D:Ingenico WITEO USB Smart Card Reader (Ingenico_WITEO_badge.txt)
#0x0F14:0x003D:Ingenico WITEO USB Smart Card Reader (Ingenico_WITEO_base.txt)
+#0x1DB2:0x088B:DUALi DRAGON NFC READER (DUALi_DRAGON_NFC_READER.txt)
+#0x1DB2:0x088B:DUALi DRAGON NFC READER (DUALi_DRAGON_NFC_READER.txt_i1)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/Makefile.in new/ccid-1.4.15/src/Makefile.in
--- old/ccid-1.4.14/src/Makefile.in 2013-11-25 19:15:26.000000000 +0100
+++ new/ccid-1.4.15/src/Makefile.in 2014-02-14 11:00:23.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -490,9 +490,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
+ $(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/ccid.c new/ccid-1.4.15/src/ccid.c
--- old/ccid-1.4.14/src/ccid.c 2013-11-25 18:08:07.000000000 +0100
+++ new/ccid-1.4.15/src/ccid.c 2014-02-14 10:22:39.000000000 +0100
@@ -18,7 +18,7 @@
*/
/*
- * $Id: ccid.c 6783 2013-10-24 09:36:52Z rousseau $
+ * $Id: ccid.c 6845 2014-02-14 09:16:01Z rousseau $
*/
#include
@@ -427,7 +427,7 @@
}
(void)sleep(1);
- if (IFD_SUCCESS == CmdEscape(reader_index, cmd, sizeof(cmd), res, &length_res, 0))
+ if (IFD_SUCCESS == CmdEscape(reader_index, cmd, sizeof(cmd), res, &length_res, DEFAULT_COM_READ_TIMEOUT))
{
DEBUG_COMM("l10n string loaded successfully");
}
@@ -441,6 +441,7 @@
case HPSMARTCARDKEYBOARD:
case HP_CCIDSMARTCARDKEYBOARD:
+ case FUJITSUSMARTKEYB:
/* the Secure Pin Entry is bogus so disable it
* http://martinpaljak.net/2011/03/19/insecure-hp-usb-smart-card-keyboard/
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/ccid.h new/ccid-1.4.15/src/ccid.h
--- old/ccid-1.4.14/src/ccid.h 2013-06-12 13:56:24.000000000 +0200
+++ new/ccid-1.4.15/src/ccid.h 2014-02-14 10:22:39.000000000 +0100
@@ -18,7 +18,7 @@
*/
/*
- * $Id: ccid.h 6650 2013-06-10 08:43:24Z rousseau $
+ * $Id: ccid.h 6845 2014-02-14 09:16:01Z rousseau $
*/
typedef struct
@@ -185,6 +185,7 @@
#define GEMPCTWIN 0x08E63437
#define GEMPCPINPAD 0x08E63478
#define GEMCORESIMPRO 0x08E63480
+#define GEMCORESIMPRO2 0x08E60000 /* Does NOT match a real VID/PID as new firmware release exposes same VID/PID */
#define GEMCOREPOSPRO 0x08E63479
#define GEMALTOPROXDU 0x08E65503
#define GEMALTOPROXSU 0x08E65504
@@ -213,6 +214,7 @@
#define HPSMARTCARDKEYBOARD 0x03F01024
#define HP_CCIDSMARTCARDKEYBOARD 0x03F00036
#define KOBIL_IDTOKEN 0x0D46301D
+#define FUJITSUSMARTKEYB 0x0BF81017
#define VENDOR_GEMALTO 0x08E6
#define GET_VENDOR(readerID) ((readerID >> 16) & 0xFFFF)
@@ -267,6 +269,19 @@
/* data rates supported by the secondary slots on the GemCore Pos Pro & SIM Pro */
#define GEMPLUS_CUSTOM_DATA_RATES 10753, 21505, 43011, 125000
+/* data rates for GemCore SIM Pro 2 */
+#define SIMPRO2_ISO_DATA_RATES 8709, 10322, 12403, 12500, \
+ 12903, 17204, 18750, 20645, 24806, \
+ 25000, 25806, 28125, 30967, 34408, \
+ 37500, 41290, 46875, 49612, 50000, \
+ 51612, 56250, 62500, 64516, 68817, \
+ 74418, 75000, 82580, 86021, 93750, \
+ 99224, 100000, 103225, 112500, 124031, \
+ 125000, 137634, 150000, 154838, 165161, \
+ 172043, 187500, 198449, 200000, 206451, \
+ 258064, 275268, 300000, 396899, 400000, \
+ 412903, 550537, 600000, 825806
+
/* Structure returned by Gemalto readers for the CCID Escape command 0x6A */
struct GEMALTO_FIRMWARE_FEATURES
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/ccid_serial.c new/ccid-1.4.15/src/ccid_serial.c
--- old/ccid-1.4.14/src/ccid_serial.c 2013-11-25 18:08:07.000000000 +0100
+++ new/ccid-1.4.15/src/ccid_serial.c 2014-02-11 18:47:35.000000000 +0100
@@ -20,7 +20,7 @@
*/
/*
- * $Id: ccid_serial.c 6783 2013-10-24 09:36:52Z rousseau $
+ * $Id: ccid_serial.c 6832 2014-01-28 14:50:43Z rousseau $
*/
#include
@@ -154,6 +154,9 @@
/* data rates supported by the secondary slots on the GemCore Pos Pro & SIM Pro */
unsigned int SerialCustomDataRates[] = { GEMPLUS_CUSTOM_DATA_RATES, 0 };
+/* data rates supported by the GemCore SIM Pro 2 */
+unsigned int SIMPro2DataRates[] = { SIMPRO2_ISO_DATA_RATES, 0 };
+
/* no need to initialize to 0 since it is static */
static _serialDevice serialDevice[CCID_DRIVER_MAX_READERS];
@@ -522,6 +525,8 @@
readerID = GEMCOREPOSPRO;
else if (0 == strcasecmp(reader_name,"GemCoreSIMPro"))
readerID = GEMCORESIMPRO;
+ else if (0 == strcasecmp(reader_name,"GemCoreSIMPro2"))
+ readerID = GEMCORESIMPRO2;
else if (0 == strcasecmp(reader_name,"GemPCPinPad"))
readerID = GEMPCPINPAD;
@@ -598,6 +603,7 @@
serialDevice[reader_index].ccid.dwMaxDataRate = 344086;
serialDevice[reader_index].ccid.bMaxSlotIndex = 0;
serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialTwinDataRates;
+ serialDevice[reader_index].ccid.readTimeout = DEFAULT_COM_READ_TIMEOUT;
serialDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT;
serialDevice[reader_index].ccid.bVoltageSupport = 0x07; /* 1.8V, 3V and 5V */
serialDevice[reader_index].ccid.gemalto_firmware_features = NULL;
@@ -621,6 +627,14 @@
serialDevice[reader_index].ccid.dwMaxDataRate = 500000;
break;
+ case GEMCORESIMPRO2:
+ serialDevice[reader_index].ccid.dwDefaultClock = 4800;
+ serialDevice[reader_index].ccid.bMaxSlotIndex = 1; /* 2 slots */
+ serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SIMPro2DataRates;
+ serialDevice[reader_index].echo = FALSE;
+ serialDevice[reader_index].ccid.dwMaxDataRate = 825806;
+ break;
+
case GEMPCPINPAD:
serialDevice[reader_index].ccid.bPINSupport = 0x03;
serialDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialExtendedDataRates;
@@ -739,6 +753,58 @@
* will echo characters for you. Don't generate signals. */
current_termios.c_lflag = 0;
+ if (0 == strcasecmp(reader_name,"GemCoreSIMPro2"))
+ {
+ unsigned char pcbuffer[SIZE_GET_SLOT_STATUS];
+ unsigned int old_timeout;
+ RESPONSECODE r;
+
+ /* Unless we resume from a stand-by condition, GemCoreSIMPro2
+ * starts at 9600 bauds, so let's first try this speed */
+ /* set serial port speed to 9600 bauds */
+ (void)cfsetspeed(¤t_termios, B9600);
+ DEBUG_INFO("Set serial port baudrate to 9600 and correct configuration");
+ if (tcsetattr(serialDevice[reader_index].fd, TCSANOW, ¤t_termios) == -1)
+ {
+ (void)close(serialDevice[reader_index].fd);
+ serialDevice[reader_index].fd = -1;
+ DEBUG_CRITICAL2("tcsetattr error: %s", strerror(errno));
+
+ return STATUS_UNSUCCESSFUL;
+ }
+
+ /* Test current speed issuing a CmdGetSlotStatus with a very
+ * short time out of 1 seconds */
+ old_timeout = serialDevice[reader_index].ccid.readTimeout;
+
+ serialDevice[reader_index].ccid.readTimeout = 1*1000;
+ r = CmdGetSlotStatus(reader_index, pcbuffer);
+
+ /* Restore default time out value */
+ serialDevice[reader_index].ccid.readTimeout = old_timeout;
+
+ if (IFD_SUCCESS == r)
+ {
+ /* We are at 9600 bauds, let's move to 115200 */
+ unsigned char tx_buffer[] = { 0x01, 0x10, 0x20 };
+ unsigned char rx_buffer[50];
+ unsigned int rx_length = sizeof(rx_buffer);
+
+ if (IFD_SUCCESS == CmdEscape(reader_index, tx_buffer,
+ sizeof(tx_buffer), rx_buffer, &rx_length, 0))
+ {
+ /* Let the reader setup its new communication speed */
+ (void)usleep(250*1000);
+ }
+ else
+ {
+ DEBUG_INFO("CmdEscape to configure 115200 bauds failed");
+ }
+ }
+ /* In case of a failure, reader is probably already at 115200
+ * bauds as code below assumes */
+ }
+
/* set serial port speed to 115200 bauds */
(void)cfsetspeed(¤t_termios, B115200);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/ccid_usb.c new/ccid-1.4.15/src/ccid_usb.c
--- old/ccid-1.4.14/src/ccid_usb.c 2013-11-25 18:08:07.000000000 +0100
+++ new/ccid-1.4.15/src/ccid_usb.c 2014-02-11 18:47:35.000000000 +0100
@@ -18,7 +18,7 @@
*/
/*
- * $Id: ccid_usb.c 6793 2013-11-25 13:09:41Z rousseau $
+ * $Id: ccid_usb.c 6828 2014-01-21 17:36:11Z rousseau $
*/
#define __CCID_USB__
@@ -635,7 +635,13 @@
usbDevice[reader_index].ccid.bMaxSlotIndex = device_descriptor[4];
usbDevice[reader_index].ccid.bCurrentSlotIndex = 0;
usbDevice[reader_index].ccid.readTimeout = DEFAULT_COM_READ_TIMEOUT;
- usbDevice[reader_index].ccid.arrayOfSupportedDataRates = get_data_rates(reader_index, config_desc, num);
+ if (device_descriptor[27])
+ usbDevice[reader_index].ccid.arrayOfSupportedDataRates = get_data_rates(reader_index, config_desc, num);
+ else
+ {
+ usbDevice[reader_index].ccid.arrayOfSupportedDataRates = NULL;
+ DEBUG_INFO("bNumDataRatesSupported is 0");
+ }
usbDevice[reader_index].ccid.bInterfaceProtocol = usb_interface->altsetting->bInterfaceProtocol;
usbDevice[reader_index].ccid.bNumEndpoints = usb_interface->altsetting->bNumEndpoints;
usbDevice[reader_index].ccid.dwSlotStatus = IFD_ICC_PRESENT;
@@ -1006,7 +1012,8 @@
/* CCID Class? */
if (desc->interface[i].altsetting->bInterfaceClass == 0xb
#ifdef ALLOW_PROPRIETARY_CLASS
- || desc->interface[i].altsetting->bInterfaceClass == 0xff
+ || (desc->interface[i].altsetting->bInterfaceClass == 0xff
+ && 54 == desc->interface[i].altsetting->extra_length)
#endif
)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/debug.h new/ccid-1.4.15/src/debug.h
--- old/ccid-1.4.14/src/debug.h 2011-08-28 17:35:57.000000000 +0200
+++ new/ccid-1.4.15/src/debug.h 2014-01-12 19:44:31.000000000 +0100
@@ -18,7 +18,7 @@
*/
/*
- * $Id: debug.h 5916 2011-08-27 15:50:04Z rousseau $
+ * $Id: debug.h 6798 2013-11-26 13:49:00Z rousseau $
*/
/*
@@ -73,6 +73,8 @@
#define DEBUG_INFO4(fmt, data1, data2, data3) if (LogLevel & DEBUG_LEVEL_INFO) Log4(PCSC_LOG_INFO, fmt, data1, data2, data3)
+#define DEBUG_INFO5(fmt, data1, data2, data3, data4) if (LogLevel & DEBUG_LEVEL_INFO) Log5(PCSC_LOG_INFO, fmt, data1, data2, data3, data4)
+
#define DEBUG_INFO_XXD(msg, buffer, size) if (LogLevel & DEBUG_LEVEL_INFO) log_xxd(PCSC_LOG_INFO, msg, buffer, size)
/* DEBUG_PERIODIC */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/ifdhandler.c new/ccid-1.4.15/src/ifdhandler.c
--- old/ccid-1.4.14/src/ifdhandler.c 2013-11-25 18:08:07.000000000 +0100
+++ new/ccid-1.4.15/src/ifdhandler.c 2014-01-12 19:44:31.000000000 +0100
@@ -17,7 +17,7 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* $Id: ifdhandler.c 6790 2013-11-25 10:02:35Z rousseau $ */
+/* $Id: ifdhandler.c 6819 2014-01-07 14:12:27Z rousseau $ */
#include
#include
@@ -1488,13 +1488,31 @@
if (IOCTL_FEATURE_IFD_PIN_PROPERTIES == dwControlCode)
{
PIN_PROPERTIES_STRUCTURE *caps = (PIN_PROPERTIES_STRUCTURE *)RxBuffer;
+ int validation;
if (RxLength < sizeof(PIN_PROPERTIES_STRUCTURE))
return IFD_ERROR_INSUFFICIENT_BUFFER;
/* Only give the LCD size for now */
caps -> wLcdLayout = ccid_descriptor -> wLcdLayout;
- caps -> bEntryValidationCondition = 0x07; /* Default */
+
+ /* Hardcoded special reader cases */
+ switch (ccid_descriptor->readerID)
+ {
+ case GEMPCPINPAD:
+ case VEGAALPHA:
+ case CHERRYST2000:
+ validation = 0x02; /* Validation key pressed */
+ break;
+ default:
+ validation = 0x07; /* Default */
+ }
+
+ /* Gemalto readers providing firmware features */
+ if (ccid_descriptor -> gemalto_firmware_features)
+ validation = ccid_descriptor -> gemalto_firmware_features -> bEntryValidationCondition;
+
+ caps -> bEntryValidationCondition = validation;
caps -> bTimeOut2 = 0x00; /* We do not distinguish bTimeOut from TimeOut2 */
*pdwBytesReturned = sizeof(*caps);
@@ -1559,7 +1577,8 @@
}
/* Gemalto PC Pinpad V1 */
- if ((GEMPCPINPAD == ccid_descriptor -> readerID)
+ if (((GEMPCPINPAD == ccid_descriptor -> readerID)
+ && (0x0100 == ccid_descriptor -> IFD_bcdDevice))
/* Covadis Véga-Alpha */
|| (VEGAALPHA == ccid_descriptor->readerID))
{
@@ -1579,6 +1598,46 @@
RxBuffer[p++] = 0x02; /* validation key pressed */
}
+ /* Cherry GmbH SmartTerminal ST-2xxx */
+ if (CHERRYST2000 == ccid_descriptor -> readerID)
+ {
+ /* bMinPINSize */
+ RxBuffer[p++] = PCSCv2_PART10_PROPERTY_bMinPINSize;
+ RxBuffer[p++] = 1; /* length */
+ RxBuffer[p++] = 0; /* min PIN size */
+
+ /* bMaxPINSize */
+ RxBuffer[p++] = PCSCv2_PART10_PROPERTY_bMaxPINSize;
+ RxBuffer[p++] = 1; /* length */
+ RxBuffer[p++] = 25; /* max PIN size */
+
+ /* bEntryValidationCondition */
+ RxBuffer[p++] = PCSCv2_PART10_PROPERTY_bEntryValidationCondition;
+ RxBuffer[p++] = 1; /* length */
+ RxBuffer[p++] = 0x02; /* validation key pressed */
+ }
+
+ /* Gemalto readers providing firmware features */
+ if (ccid_descriptor -> gemalto_firmware_features)
+ {
+ struct GEMALTO_FIRMWARE_FEATURES *features = ccid_descriptor -> gemalto_firmware_features;
+
+ /* bMinPINSize */
+ RxBuffer[p++] = PCSCv2_PART10_PROPERTY_bMinPINSize;
+ RxBuffer[p++] = 1; /* length */
+ RxBuffer[p++] = features -> MinimumPINSize; /* min PIN size */
+
+ /* bMaxPINSize */
+ RxBuffer[p++] = PCSCv2_PART10_PROPERTY_bMaxPINSize;
+ RxBuffer[p++] = 1; /* length */
+ RxBuffer[p++] = features -> MaximumPINSize; /* max PIN size */
+
+ /* bEntryValidationCondition */
+ RxBuffer[p++] = PCSCv2_PART10_PROPERTY_bEntryValidationCondition;
+ RxBuffer[p++] = 1; /* length */
+ RxBuffer[p++] = features -> bEntryValidationCondition; /* validation key pressed */
+ }
+
/* bPPDUSupport */
RxBuffer[p++] = PCSCv2_PART10_PROPERTY_bPPDUSupport;
RxBuffer[p++] = 1; /* length */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/misc.h new/ccid-1.4.15/src/misc.h
--- old/ccid-1.4.14/src/misc.h 2013-10-06 12:25:18.000000000 +0200
+++ new/ccid-1.4.15/src/misc.h 2014-02-11 18:47:36.000000000 +0100
@@ -6,7 +6,33 @@
* Copyright (C) 2005-2010
* Ludovic Rousseau
*
- * $Id: misc.h 6758 2013-10-01 12:55:58Z rousseau $
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: misc.h 6822 2014-01-13 15:21:25Z rousseau $
*/
#ifndef __misc_h__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/parser.h new/ccid-1.4.15/src/parser.h
--- old/ccid-1.4.14/src/parser.h 2010-12-11 14:40:35.000000000 +0100
+++ new/ccid-1.4.15/src/parser.h 2014-02-11 18:47:36.000000000 +0100
@@ -6,7 +6,33 @@
* Copyright (C) 2003-2009
* Ludovic Rousseau
*
- * $Id: parser.h 5434 2010-12-08 14:13:21Z rousseau $
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: parser.h 6822 2014-01-13 15:21:25Z rousseau $
*/
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/reader.conf.in new/ccid-1.4.15/src/reader.conf.in
--- old/ccid-1.4.14/src/reader.conf.in 2010-03-12 17:40:43.000000000 +0100
+++ new/ccid-1.4.15/src/reader.conf.in 2014-02-11 18:47:35.000000000 +0100
@@ -1,10 +1,13 @@
# Gemalto reader with serial communication
# - n is the serial port to use n in [0..3]
# - reader is the reader name. It is needed for multi-slot readers.
-# Possible reader values are: GemPCPinPad, GemCorePOSPro, GemCoreSIMPro,
-# GemPCTwin (default value)
+# Possible reader values are:
+# GemCorePOSPro
+# GemCoreSIMPro
+# GemCoreSIMPro2
+# GemPCPinPad
+# GemPCTwin (default value)
# example: /dev/ttyS0:GemPCPinPad
-#FRIENDLYNAME "GemPCTwin serial"
#DEVICENAME /dev/ttySn[:reader]
+#FRIENDLYNAME "GemPCTwin serial"
#LIBPATH TARGET
-#CHANNELID n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/strlcpycat.h new/ccid-1.4.15/src/strlcpycat.h
--- old/ccid-1.4.14/src/strlcpycat.h 2010-06-04 14:30:57.000000000 +0200
+++ new/ccid-1.4.15/src/strlcpycat.h 2014-02-11 18:47:36.000000000 +0100
@@ -4,7 +4,33 @@
* Copyright (C) 2004-2010
* Ludovic Rousseau
*
- * $Id: strlcpycat.h 4974 2010-06-01 09:43:47Z rousseau $
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: strlcpycat.h 6822 2014-01-13 15:21:25Z rousseau $
*/
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/tokenparser.c new/ccid-1.4.15/src/tokenparser.c
--- old/ccid-1.4.14/src/tokenparser.c 2013-08-12 23:37:16.000000000 +0200
+++ new/ccid-1.4.15/src/tokenparser.c 2014-02-14 11:00:33.000000000 +0100
@@ -491,14 +491,40 @@
* Copyright (C) 2003-2010
* Ludovic Rousseau
*
- * $Id: tokenparser.l 6712 2013-08-05 19:11:47Z rousseau $
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: tokenparser.l 6822 2014-01-13 15:21:25Z rousseau $
*/
/**
* @file
* @brief provides parsing functions for Info.plist files
* platforms
*/
-#line 21 "tokenparser.l"
+#line 47 "tokenparser.l"
#include "config.h"
#include
@@ -520,7 +546,7 @@
static list_t *ListValues;
#define YY_NO_INPUT 1
-#line 524 "tokenparser.c"
+#line 550 "tokenparser.c"
#define INITIAL 0
@@ -705,10 +731,10 @@
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 47 "tokenparser.l"
+#line 73 "tokenparser.l"
-#line 712 "tokenparser.c"
+#line 738 "tokenparser.c"
if ( !(yy_init) )
{
@@ -793,41 +819,41 @@
case 1:
YY_RULE_SETUP
-#line 49 "tokenparser.l"
+#line 75 "tokenparser.l"
{}
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 50 "tokenparser.l"
+#line 76 "tokenparser.l"
{}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 51 "tokenparser.l"
+#line 77 "tokenparser.l"
{ eval_key(yytext, ListKeys); }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 52 "tokenparser.l"
+#line 78 "tokenparser.l"
{}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 53 "tokenparser.l"
+#line 79 "tokenparser.l"
{ eval_value(yytext, ListValues); }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 54 "tokenparser.l"
+#line 80 "tokenparser.l"
{ tperrorCheck(yytext); }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 55 "tokenparser.l"
+#line 81 "tokenparser.l"
ECHO;
YY_BREAK
-#line 831 "tokenparser.c"
+#line 857 "tokenparser.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1788,7 +1814,7 @@
#define YYTABLES_NAME "yytables"
-#line 55 "tokenparser.l"
+#line 81 "tokenparser.l"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.14/src/tokenparser.l new/ccid-1.4.15/src/tokenparser.l
--- old/ccid-1.4.14/src/tokenparser.l 2013-08-05 21:18:44.000000000 +0200
+++ new/ccid-1.4.15/src/tokenparser.l 2014-02-11 18:47:36.000000000 +0100
@@ -8,7 +8,33 @@
* Copyright (C) 2003-2010
* Ludovic Rousseau
*
- * $Id: tokenparser.l 6712 2013-08-05 19:11:47Z rousseau $
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: tokenparser.l 6822 2014-01-13 15:21:25Z rousseau $
*/
/**
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org