Changeset 3405

Timestamp:

03/06/08 16:06:59 (2 years ago)

Author:

alonbl

Message:

Complete rewrite of OpenSC build system.

1. Build system now supports MinGW (Windows) compilation using msys and cross compilation.
2. Ability to explicitly disable and enable dependencies of the package.
3. openct, pcsc and nsplugins features are disabled by default.
4. Modified pcsc driver to use pcsc dynamically, no compile time dependency is required.
5. --enable-pcsc-lite configuration option renamed to --enable-pcsc.
6. Install opensc.conf file (as opensc.conf.new if opensc.conf exists).
7. Add--enable-doc configuration option, allow installing documentation into target.
8. Add --disable-man configuration option, allow msys mingw32 users to

build from svn without extra dependencies.

9. Add export files to each library in order to export only required symbols.

Windows native build may use these files instead of scanning objects' symbols.

10. Add opensc-tool --info to display some general information about the build.
11. Create compatibility library to be linked against library instread of recompiling the

same source files in different places.

12. Add different win32 version resource to each class of outputs.
13. Make xsl-stylesheets location selectable.
14. Some win32 fixups.
15. Some warning fixups.
16. Many other autoconf/automake cleanups.

Alon Bar-Lev

svn diff -r 3315:3399  https://www.opensc-project.org/svn/opensc/branches/alonbl/mingw

_M .
D configure.in
_M src
_M src/openssh
M src/openssh/Makefile.am
_M src/tools
M src/tools/rutoken-tool.c
M src/tools/opensc-tool.c
M src/tools/cardos-info.c
M src/tools/pkcs15-crypt.c
M src/tools/pkcs15-init.c
M src/tools/piv-tool.c
M src/tools/netkey-tool.c
M src/tools/eidenv.c
M src/tools/cryptoflex-tool.c
M src/tools/util.c
M src/tools/pkcs11-tool.c
M src/tools/pkcs15-tool.c
M src/tools/util.h
M src/tools/opensc-explorer.c
M src/tools/Makefile.am
_M src/pkcs11
M src/pkcs11/pkcs11-global.c
M src/pkcs11/framework-pkcs15.c
M src/pkcs11/mechanism.c
M src/pkcs11/pkcs11-display.c
M src/pkcs11/pkcs11-object.c
A src/pkcs11/opensc-pkcs11.exports
M src/pkcs11/sc-pkcs11.h
M src/pkcs11/pkcs11-spy.c
M src/pkcs11/openssl.c
M src/pkcs11/Makefile.am
A src/pkcs11/pkcs11-spy.exports
_M src/tests
_M src/tests/regression
M src/tests/regression/Makefile.am
M src/tests/sc-test.c
M src/tests/pintest.c
M src/tests/Makefile.am
_M src/include
_M src/include/opensc
M src/include/opensc/Makefile.am
A src/include/opensc/svnignore
M src/include/Makefile.am
_M src/signer
_M src/signer/npinclude
M src/signer/npinclude/Makefile.am
M src/signer/Makefile.am
A src/signer/signer.exports
_M src/common
A src/common/compat_dummy.c
D src/common/getopt.txt
D src/common/strlcpy.c
D src/common/LICENSE
A src/common/compat_getopt.txt
A src/common/compat_strlcpy.c
A src/common/LICENSE.compat_getopt
A src/common/compat_getopt.c
D src/common/strlcpy.h
D src/common/ChangeLog
D src/common/getpass.c
D src/common/my_getopt.c
A src/common/compat_strlcpy.h
A src/common/compat_getpass.c
A src/common/compat_getopt.h
A src/common/ChangeLog.compat_getopt
D src/common/README.strlcpy
D src/common/my_getopt.h
A src/common/compat_getpass.h
A src/common/README.compat_strlcpy
D src/common/strlcpy.3
A src/common/README.compat_getopt
D src/common/getopt.3
D src/common/README.my_getopt
A src/common/compat_strlcpy.3
A src/common/compat_getopt.3
M src/common/Makefile.am
M src/Makefile.am
_M src/pkcs15init
M src/pkcs15init/pkcs15-oberthur.c
M src/pkcs15init/profile.c
M src/pkcs15init/pkcs15-lib.c
M src/pkcs15init/pkcs15-rutoken.c
A src/pkcs15init/pkcs15init.exports
M src/pkcs15init/pkcs15-gpk.c
M src/pkcs15init/Makefile.am
_M src/scconf
M src/scconf/Makefile.am
M src/scconf/parse.c
A src/scconf/scconf.exports
_M src/libopensc
M src/libopensc/card-rutoken.c
M src/libopensc/compression.c
M src/libopensc/sc.c
M src/libopensc/card-piv.c
M src/libopensc/pkcs15-openpgp.c
M src/libopensc/pkcs15-postecert.c
M src/libopensc/pkcs15-tcos.c
M src/libopensc/opensc-config.in
M src/libopensc/reader-pcsc.c
A src/libopensc/internal-winscard.h
M src/libopensc/ctx.c
A src/libopensc/libopensc.exports
M src/libopensc/pkcs15-piv.c
M src/libopensc/pkcs15-infocamere.c
M src/libopensc/internal.h
M src/libopensc/pkcs15-actalis.c
M src/libopensc/pkcs15-starcert.c
M src/libopensc/card-oberthur.c
M src/libopensc/pkcs15-atrust-acos.c
M src/libopensc/p15card-helper.c
D src/libopensc/part10.h
M src/libopensc/ui.c
M src/libopensc/card-gpk.c
M src/libopensc/pkcs15-wrap.c
M src/libopensc/pkcs15-gemsafeGPK.c
M src/libopensc/log.c
M src/libopensc/pkcs15-esteid.c
M src/libopensc/pkcs15-prkey-rutoken.c
M src/libopensc/log.h
M src/libopensc/Makefile.am
M src/libopensc/reader-openct.c
_M aclocal
M aclocal/Makefile.am
_M win32
M win32/Makefile.am
A win32/versioninfo.rc.in
A win32/ltrc.inc
A configure.ac
_M doc
_M doc/tools
M doc/tools/pkcs15-profile.xml
D doc/changelog.sh
D doc/export-wiki.xsl
_M doc/api
_M doc/api/file
M doc/api/man.xsl
_M doc/api/asn1
_M doc/api/apps
_M doc/api/init
_M doc/api/types
_M doc/api/card
M doc/api/html.xsl
_M doc/api/misc
_M doc/api/util
M doc/Makefile.am
D doc/export-wiki.sh
AM doc/nonpersistent
A doc/nonpersistent/export-wiki.xsl
A doc/nonpersistent/Makefile.am
A doc/nonpersistent/export-wiki.sh
A doc/nonpersistent/svn2cl.xsl
D doc/generate-man.sh
D doc/svn2cl.xsl
M Makefile.am
A svnignore
_M etc
M etc/opensc.conf.in
M etc/Makefile.am
D man
_M solaris
M solaris/Makefile

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• aclocal (modified) (1 prop)
• aclocal/Makefile.am (modified) (1 diff)
• configure.ac (copied) (copied from branches/alonbl/mingw/configure.ac) (1 diff)
• configure.in (deleted)
• doc (modified) (1 prop)
• doc/Makefile.am (modified) (1 diff)
• doc/api (modified) (1 prop)
• doc/api/apps (modified) (1 prop)
• doc/api/asn1 (modified) (1 prop)
• doc/api/card (modified) (1 prop)
• doc/api/file (modified) (1 prop)
• doc/api/html.xsl (modified) (1 diff)
• doc/api/init (modified) (1 prop)
• doc/api/man.xsl (modified) (1 diff)
• doc/api/misc (modified) (1 prop)
• doc/api/types (modified) (1 prop)
• doc/api/util (modified) (1 prop)
• doc/changelog.sh (deleted)
• doc/export-wiki.sh (deleted)
• doc/export-wiki.xsl (deleted)
• doc/generate-man.sh (deleted)
• doc/nonpersistent (copied) (copied from branches/alonbl/mingw/doc/nonpersistent)
• doc/nonpersistent/Makefile.am (copied) (copied from branches/alonbl/mingw/doc/nonpersistent/Makefile.am)
• doc/nonpersistent/export-wiki.sh (copied) (copied from branches/alonbl/mingw/doc/nonpersistent/export-wiki.sh)
• doc/nonpersistent/export-wiki.xsl (copied) (copied from branches/alonbl/mingw/doc/nonpersistent/export-wiki.xsl)
• doc/nonpersistent/svn2cl.xsl (copied) (copied from branches/alonbl/mingw/doc/nonpersistent/svn2cl.xsl)
• doc/svn2cl.xsl (deleted)
• doc/tools (modified) (1 prop)
• doc/tools/pkcs15-profile.xml (modified) (1 diff)
• etc (modified) (1 prop)
• etc/Makefile.am (modified) (1 diff)
• etc/opensc.conf.in (modified) (2 diffs)
• man (deleted)
• solaris (modified) (1 prop)
• solaris/Makefile (modified) (1 diff)
• src (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/common (modified) (1 prop)
• src/common/ChangeLog (deleted)
• src/common/ChangeLog.compat_getopt (copied) (copied from branches/alonbl/mingw/src/common/ChangeLog.compat_getopt)
• src/common/LICENSE (deleted)
• src/common/LICENSE.compat_getopt (copied) (copied from branches/alonbl/mingw/src/common/LICENSE.compat_getopt)
• src/common/Makefile.am (modified) (1 diff)
• src/common/README.compat_getopt (copied) (copied from branches/alonbl/mingw/src/common/README.compat_getopt)
• src/common/README.compat_strlcpy (copied) (copied from branches/alonbl/mingw/src/common/README.compat_strlcpy)
• src/common/README.my_getopt (deleted)
• src/common/README.strlcpy (deleted)
• src/common/compat_dummy.c (copied) (copied from branches/alonbl/mingw/src/common/compat_dummy.c)
• src/common/compat_getopt.3 (copied) (copied from branches/alonbl/mingw/src/common/compat_getopt.3)
• src/common/compat_getopt.c (copied) (copied from branches/alonbl/mingw/src/common/compat_getopt.c)
• src/common/compat_getopt.h (copied) (copied from branches/alonbl/mingw/src/common/compat_getopt.h)
• src/common/compat_getopt.txt (copied) (copied from branches/alonbl/mingw/src/common/compat_getopt.txt)
• src/common/compat_getpass.c (copied) (copied from branches/alonbl/mingw/src/common/compat_getpass.c)
• src/common/compat_getpass.h (copied) (copied from branches/alonbl/mingw/src/common/compat_getpass.h)
• src/common/compat_strlcpy.3 (copied) (copied from branches/alonbl/mingw/src/common/compat_strlcpy.3)
• src/common/compat_strlcpy.c (copied) (copied from branches/alonbl/mingw/src/common/compat_strlcpy.c)
• src/common/compat_strlcpy.h (copied) (copied from branches/alonbl/mingw/src/common/compat_strlcpy.h)
• src/common/getopt.3 (deleted)
• src/common/getopt.txt (deleted)
• src/common/getpass.c (deleted)
• src/common/my_getopt.c (deleted)
• src/common/my_getopt.h (deleted)
• src/common/strlcpy.3 (deleted)
• src/common/strlcpy.c (deleted)
• src/common/strlcpy.h (deleted)
• src/include (modified) (1 prop)
• src/include/Makefile.am (modified) (1 diff)
• src/include/opensc (modified) (1 prop)
• src/include/opensc/Makefile.am (modified) (1 diff)
• src/include/opensc/svnignore (copied) (copied from branches/alonbl/mingw/src/include/opensc/svnignore)
• src/libopensc (modified) (1 prop)
• src/libopensc/Makefile.am (modified) (2 diffs)
• src/libopensc/card-gpk.c (modified) (2 diffs)
• src/libopensc/card-oberthur.c (modified) (2 diffs)
• src/libopensc/card-piv.c (modified) (4 diffs)
• src/libopensc/card-rutoken.c (modified) (5 diffs)
• src/libopensc/compression.c (modified) (2 diffs)
• src/libopensc/ctx.c (modified) (7 diffs)
• src/libopensc/internal-winscard.h (copied) (copied from branches/alonbl/mingw/src/libopensc/internal-winscard.h) (1 diff)
• src/libopensc/internal.h (modified) (1 diff)
• src/libopensc/libopensc.exports (copied) (copied from branches/alonbl/mingw/src/libopensc/libopensc.exports)
• src/libopensc/log.c (modified) (3 diffs)
• src/libopensc/log.h (modified) (1 diff)
• src/libopensc/opensc-config.in (modified) (3 diffs)
• src/libopensc/p15card-helper.c (modified) (2 diffs)
• src/libopensc/part10.h (deleted)
• src/libopensc/pkcs15-actalis.c (modified) (3 diffs)
• src/libopensc/pkcs15-atrust-acos.c (modified) (1 diff)
• src/libopensc/pkcs15-esteid.c (modified) (1 diff)
• src/libopensc/pkcs15-gemsafeGPK.c (modified) (1 diff)
• src/libopensc/pkcs15-infocamere.c (modified) (3 diffs)
• src/libopensc/pkcs15-openpgp.c (modified) (1 diff)
• src/libopensc/pkcs15-piv.c (modified) (2 diffs)
• src/libopensc/pkcs15-postecert.c (modified) (1 diff)
• src/libopensc/pkcs15-prkey-rutoken.c (modified) (8 diffs)
• src/libopensc/pkcs15-starcert.c (modified) (1 diff)
• src/libopensc/pkcs15-tcos.c (modified) (1 diff)
• src/libopensc/pkcs15-wrap.c (modified) (4 diffs)
• src/libopensc/reader-openct.c (modified) (2 diffs)
• src/libopensc/reader-pcsc.c (modified) (32 diffs)
• src/libopensc/sc.c (modified) (2 diffs)
• src/libopensc/ui.c (modified) (3 diffs)
• src/openssh (modified) (1 prop)
• src/openssh/Makefile.am (modified) (1 diff)
• src/pkcs11 (modified) (1 prop)
• src/pkcs11/Makefile.am (modified) (2 diffs)
• src/pkcs11/framework-pkcs15.c (modified) (3 diffs)
• src/pkcs11/mechanism.c (modified) (3 diffs)
• src/pkcs11/opensc-pkcs11.exports (copied) (copied from branches/alonbl/mingw/src/pkcs11/opensc-pkcs11.exports)
• src/pkcs11/openssl.c (modified) (1 diff)
• src/pkcs11/pkcs11-display.c (modified) (5 diffs)
• src/pkcs11/pkcs11-global.c (modified) (14 diffs)
• src/pkcs11/pkcs11-object.c (modified) (4 diffs)
• src/pkcs11/pkcs11-spy.c (modified) (2 diffs)
• src/pkcs11/pkcs11-spy.exports (copied) (copied from branches/alonbl/mingw/src/pkcs11/pkcs11-spy.exports)
• src/pkcs11/sc-pkcs11.h (modified) (6 diffs)
• src/pkcs15init (modified) (1 prop)
• src/pkcs15init/Makefile.am (modified) (3 diffs)
• src/pkcs15init/pkcs15-gpk.c (modified) (2 diffs)
• src/pkcs15init/pkcs15-lib.c (modified) (3 diffs)
• src/pkcs15init/pkcs15-oberthur.c (modified) (3 diffs)
• src/pkcs15init/pkcs15-rutoken.c (modified) (2 diffs)
• src/pkcs15init/pkcs15init.exports (copied) (copied from branches/alonbl/mingw/src/pkcs15init/pkcs15init.exports)
• src/pkcs15init/profile.c (modified) (1 diff)
• src/scconf (modified) (1 prop)
• src/scconf/Makefile.am (modified) (1 diff)
• src/scconf/parse.c (modified) (1 diff)
• src/scconf/scconf.exports (copied) (copied from branches/alonbl/mingw/src/scconf/scconf.exports)
• src/signer (modified) (1 prop)
• src/signer/Makefile.am (modified) (1 diff)
• src/signer/npinclude (modified) (1 prop)
• src/signer/npinclude/Makefile.am (modified) (1 diff)
• src/signer/signer.exports (copied) (copied from branches/alonbl/mingw/src/signer/signer.exports)
• src/tests (modified) (1 prop)
• src/tests/Makefile.am (modified) (1 diff)
• src/tests/pintest.c (modified) (1 diff)
• src/tests/regression (modified) (1 prop)
• src/tests/regression/Makefile.am (modified) (1 diff)
• src/tests/sc-test.c (modified) (1 diff)
• src/tools (modified) (1 prop)
• src/tools/Makefile.am (modified) (1 diff)
• src/tools/cardos-info.c (modified) (16 diffs)
• src/tools/cryptoflex-tool.c (modified) (4 diffs)
• src/tools/eidenv.c (modified) (2 diffs)
• src/tools/netkey-tool.c (modified) (1 diff)
• src/tools/opensc-explorer.c (modified) (19 diffs)
• src/tools/opensc-tool.c (modified) (16 diffs)
• src/tools/piv-tool.c (modified) (5 diffs)
• src/tools/pkcs11-tool.c (modified) (52 diffs)
• src/tools/pkcs15-crypt.c (modified) (10 diffs)
• src/tools/pkcs15-init.c (modified) (48 diffs)
• src/tools/pkcs15-tool.c (modified) (12 diffs)
• src/tools/rutoken-tool.c (modified) (5 diffs)
• src/tools/util.c (modified) (9 diffs)
• src/tools/util.h (modified) (2 diffs)
• svnignore (copied) (copied from branches/alonbl/mingw/svnignore)
• win32 (modified) (1 prop)
• win32/Makefile.am (modified) (1 diff)
• win32/ltrc.inc (copied) (copied from branches/alonbl/mingw/win32/ltrc.inc)
• win32/versioninfo.rc.in (copied) (copied from branches/alonbl/mingw/win32/versioninfo.rc.in)

trunk

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-archive
-acinclude.m4
-aclocal.m4
-autom4te.cache
-compile
-confdefs.h
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-conftest
-conftest.c
-depcomp
-install-sh
-libtool
-libtool.m4
-ltmain.sh
-missing
-mkinstalldirs
-so_locations
-stamp-h*
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-archive
-acinclude.m4
-aclocal.m4
-autom4te.cache
-compile
-confdefs.h
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-conftest
-conftest.c
-depcomp
-install-sh
-libtool
-libtool.m4
-ltmain.sh
-missing
-mkinstalldirs
-so_locations
-stamp-h*
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/Makefile.am

@@ -1 +1 @@
 # Process this file with automake to create Makefile.in
-
-SUBDIRS = . aclocal etc man src win32
-DIST_SUBDIRS = . aclocal doc etc man src win32
-
-EXTRA_DIST = README \
-        bootstrap Makefile.mak depcomp \
-        solaris/Makefile solaris/README solaris/checkinstall.in \
-        solaris/opensc.conf-dist solaris/pkginfo.in solaris/proto
-
-MAINTAINERCLEANFILES = \
-        Makefile.in config.h.in configure \
-        install-sh ltmain.sh missing mkinstalldirs \
-        compile depcomp config.log config.status \
-        config.guess config.sub acinclude.m4 aclocal.m4
-
-DEPCLEANFILES = config.log configure
 
 AUTOMAKE_OPTIONS = foreign 1.5
 ACLOCAL_AMFLAGS = -I aclocal
+
+MAINTAINERCLEANFILES = \
+        Makefile.in config.h.in config.h.in~ configure \
+        install-sh ltmain.sh missing mkinstalldirs \
+        compile depcomp config.log config.status \
+        config.guess config.sub acinclude.m4 aclocal.m4 \
+        packaged
+EXTRA_DIST = Makefile.mak svnignore
+
+SUBDIRS = aclocal etc src win32 doc
+
+dist_noinst_SCRIPTS = bootstrap
+dist_noinst_DATA = README \
+        solaris/Makefile solaris/README solaris/checkinstall.in \
+        solaris/opensc.conf-dist solaris/pkginfo.in solaris/proto
+dist_doc_DATA = NEWS
+
+# Allow detection of packaged tarball
+dist-hook:
+        echo > "$(distdir)/packaged"
 
 distcheck-hook:

trunk/aclocal

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/aclocal/Makefile.am

@@ -2 +2 @@
 
 MAINTAINERCLEANFILES = Makefile.in
-
 EXTRA_DIST = acx_pthread.m4 libassuan.m4

trunk/configure.ac

@@ -158 +158 @@
 AC_ARG_ENABLE(
         [man],
-        [AC_HELP_STRING([--enable-man], [enable installation of manuals. [[default=enabled for none Windows]]])],
+        [AC_HELP_STRING([--disable-man], [disable installation of manuals. [[default=enabled for none Windows]]])],
         ,
         [

trunk/doc

@@ -1 @@
-html
-man
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
+.deps
+.libs
+.#*#
+.*.bak
+.*.orig
+.*.rej
+.*~
+#*#
+*.bak
+*.d
+*.def
+*.dll
+*.exe
+*.la
+*.lib
+*.lo
+*.orig
+*.pdb
+*.rej
+*.u
+*.rc
+*.pc
+*~
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ -1 @@
-html
-man
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
+.deps
+.libs
+.#*#
+.*.bak
+.*.orig
+.*.rej
+.*~
+#*#
+*.bak
+*.d
+*.def
+*.dll
+*.exe
+*.la
+*.lib
+*.lo
+*.orig
+*.pdb
+*.rej
+*.u
+*.rc
+*.pc
+*~
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/doc/Makefile.am

@@ -1 +1 @@
 # Process this file with automake to create Makefile.in
 
-SUBDIRS = . 
+MAINTAINERCLEANFILES = Makefile.in
 
-MAINTAINERCLEANFILES = Makefile.in $(HTML) $(TMP) ChangeLog
+wikidir=$(htmldir)/wiki
 
-EXTRA_DIST = README ChangeLog $(HTML) $(XML) index.html \
-                export-wiki.sh export-wiki.xsl \
-                generate-man.sh changelog.sh svn2cl.xsl 
+if ENABLE_DOC
+SUBDIRS = nonpersistent
+endif
+DIST_SUBDIRS = nonpersistent
 
-TMP= $(shell ls $(srcdir)/*.tmp)
-HTML= $(shell ls $(srcdir)/*.html $(srcdir)/*.css $(srcdir)/*.gif $(srcdir)/html/*)
-XML = $(shell ls $(srcdir)/tools/*.xml $(srcdir)/api/*.xml $(srcdir)/api/*/*.xml $(srcdir)/api/api.css $(srcdir)/api/*.xsl)
+dist_noinst_DATA = tools/*.xml api/*.xml api/*/*.xml api/api.css api/*.xsl
+if ENABLE_DOC
+dist_html_DATA = html.out/*
+else
+dist_noinst_DATA += html.out/*
+endif
+dist_doc_DATA = README
+if WIN32
+dist_noinst_DATA += man.out/*.1 man.out/*.3 man.out/*.5
+else
+dist_man1_MANS = man.out/*.1
+dist_man3_MANS = man.out/*.3
+dist_man5_MANS = man.out/*.5
+endif
 
-index.html:
-        sh $(srcdir)/export-wiki.sh $(srcdir)
-        sh $(srcdir)/generate-man.sh $(srcdir)
+if SVN_CHECKOUT
+if ENABLE_MAN
 
-ChangeLog:
-        sh $(srcdir)/changelog.sh $(srcdir)
+html.out/*:     api/xsl-stylesheets
+        test -n "$(XSLTPROC)"
+        -rm -fr html.tmp
+        $(MKDIR_P) html.tmp
+        $(XSLTPROC) --nonet --xinclude -o "html.out/api.html" "$(srcdir)/api/html.xsl" "$(srcdir)/api/api.xml"
+        $(XSLTPROC) --nonet --xinclude -o "html.out/tools.html" "$(srcdir)/api/html.xsl" "$(srcdir)/tools/tools.xml"
+        mv html.tmp html.out
+
+man.out/*.1:    api/xsl-stylesheets
+        test -n "$(XSLTPROC)"
+        -rm -fr man.tmp
+        $(MKDIR_P) man.tmp
+        $(XSLTPROC) --nonet --xinclude -o "man.out/" "$(srcdir)/api/man.xsl" "$(srcdir)/api/api.xml"
+        $(XSLTPROC) --nonet --xinclude -o "man.out/" "$(srcdir)/api/man.xsl" "$(srcdir)/tools/tools.xml"
+        mv man.tmp man.out
+
+man.out/*.3 man.out/*.5:        man.out/*.1
+
+api/xsl-stylesheets:
+        $(LN_S) "$(xslstylesheetsdir)" api/xsl-stylesheets
+
+else
+
+html.out/*:
+man.out/*.1:
+man.out/*.3 man.out/*.5:        man.out/*.1
+
+endif
+endif
 
 maintainer-clean-local:
-        rm -rf $(srcdir)/html
+        rm -rf html.out html.tmp man.out man.tmp
+        rm -fr api/xsl-stylesheets

trunk/doc/api/html.xsl

@@ -4 +4 @@
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-        <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"/>
+        <xsl:import href="xsl-stylesheets/html/docbook.xsl"/>
         <xsl:param name="toc.section.depth" select="0"/>
         <xsl:template name="user.head.content">

trunk/doc/api/man.xsl

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-        <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl"/>
+        <xsl:import href="xsl-stylesheets/manpages/docbook.xsl"/>
 </xsl:stylesheet>

trunk/doc/tools/pkcs15-profile.xml

@@ -38 +38 @@
                         The card specific profile contains additional information required during
                         card intialization, such as location of PIN files, key references etc.
-                        Profiles currently reside in <command>@pkgdata@</command>
+                        Profiles currently reside in <command>@pkgdatadir@</command>
                 </para>
         </refsect1>

trunk/etc

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/etc/Makefile.am

@@ -3 +3 @@
 MAINTAINERCLEANFILES = Makefile.in
 DISTCLEANFILES = opensc.conf 
-EXTRA_DIST = opensc.conf.in 
 
-noinst_DATA = opensc.conf.in opensc.conf 
+SUFFIXES = .in
+dist_noinst_DATA = opensc.conf.in opensc.conf 
 
-%: %.in
-        sed -e "s#PKGDATADIR#$(shell eval echo $(pkgdatadir))#" < $^ > $@
+.in:
+        sed -e "s|@pkgdatadir[@]|$(pkgdatadir)|g" < $^ > $@
+
+sysconf_DATA=#required in order to create dir
+install-exec-hook:      install-sysconfDATA
+        if [ -f $(DESTDIR)$(sysconfdir)/opensc.conf ]; then \
+                $(INSTALL_DATA) $(srcdir)/opensc.conf $(DESTDIR)$(sysconfdir)/opensc.conf.new; \
+        else \
+                $(INSTALL_DATA) $(srcdir)/opensc.conf $(DESTDIR)$(sysconfdir)/opensc.conf; \
+        fi

trunk/etc/opensc.conf.in

@@ -34 +34 @@
         # profiles directory for pkcs15-init.
         
-        profile_dir = PKGDATADIR;
+        profile_dir = @pkgdatadir@;
 
         # What reader drivers to load at start-up
@@ -88 +88 @@
                 # Default: false
                 # enable_pinpad = true;
+                #
+                # Use specific pcsc library.
+                # Default: system
+                # library_name = /usr/lib/libpcsclite.so
         }
 

trunk/solaris/Makefile

@@ -5 +5 @@
 CONFIGURE_PREFIX=$(PWD:sh)/..
 CONFIGURE=${CONFIGURE_PREFIX}/configure
-CONFIGURE_ARGS=--prefix=/usr --sysconfdir=/etc/opensc --mandir=/usr/share/man
+CONFIGURE_ARGS=--prefix=/usr --sysconfdir=/etc/opensc --mandir=/usr/share/man --enable-pcsc --enable-openct
 CONFIG_GUESS=${CONFIGURE_PREFIX}/config.guess
 UNAME_ARCH=/sbin/uname -p

trunk/src

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/src/Makefile.am

@@ -2 +2 @@
 
 MAINTAINERCLEANFILES = Makefile.in
-
 EXTRA_DIST = Makefile.mak
 

trunk/src/common

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/src/common/Makefile.am

@@ -2 +2 @@
 
 MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = Makefile.mak
 
-EXTRA_DIST = Makefile.mak getpass.c \
-        ChangeLog LICENSE README.my_getopt getopt.3 getopt.txt \
-        main.c my_getopt.c my_getopt.h README.strlcpy strlcpy.3 \
-        strlcpy.c strlcpy.h
+noinst_LTLIBRARIES = libcompat.la
+dist_noinst_DATA = \
+        README.compat_getopt ChangeLog.compat_getopt LICENSE.compat_getopt compat_getopt.txt \
+        README.compat_strlcpy compat_strlcpy.3
+
+libcompat_la_SOURCES = \
+        compat_dummy.c \
+        compat_strlcpy.h compat_strlcpy.c \
+        compat_getpass.h compat_getpass.c \
+        compat_getopt.h compat_getopt.c

trunk/src/include

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/src/include/Makefile.am

@@ -2 +2 @@
 
 MAINTAINERCLEANFILES = Makefile.in
-
 EXTRA_DIST = Makefile.mak winconfig.h
 
-SUBDIRS = . opensc
+SUBDIRS = opensc

trunk/src/include/opensc

@@ -1 @@
-.deps
-.libs
-.#*#
-.*.bak
-.*.orig
-.*.rej
-.*~
-#*#
-*.bak
-*.d
-*.def
-*.dll
-*.exe
-*.la
-*.lib
-*.lo
-*.orig
-*.pdb
-*.rej
-*.u
-*~
+*.h
+*.in
 Makefile
-Makefile.in
-core
-gmon.out
-*.h

@@ -1 @@
-.deps
-.libs
-.#*#
-.*.bak
-.*.orig
-.*.rej
-.*~
-#*#
-*.bak
-*.d
-*.def
-*.dll
-*.exe
-*.la
-*.lib
-*.lo
-*.orig
-*.pdb
-*.rej
-*.u
-*~
+*.h
+*.in
 Makefile
-Makefile.in
-core
-gmon.out
-*.h

trunk/src/include/opensc/Makefile.am

@@ -1 +1 @@
 # Process this file with automake to create Makefile.in
 
-RM = rm -f
-
 MAINTAINERCLEANFILES = Makefile.in
-DISTCLEANFILES = \
-        asn1.h \
-        cardctl.h \
-        cards.h \
-        emv.h \
-        errors.h \
-        log.h \
-        opensc.h \
-        pkcs15.h \
-        types.h \
-        ui.h \
-        pkcs11.h \
-        keycache.h \
-        pkcs15-init.h \
-        scconf.h 
+EXTRA_DIST = svnignore
 
 all-local:
-        @$(RM) *.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/asn1.h asn1.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/cardctl.h cardctl.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/cards.h cards.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/emv.h emv.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/errors.h errors.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/log.h log.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/opensc.h opensc.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/pkcs15.h pkcs15.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/types.h types.h
-        @$(LN_S) ${top_srcdir}/src/libopensc/ui.h ui.h
-        @$(LN_S) ${top_srcdir}/src/pkcs11/pkcs11.h pkcs11.h
-        @$(LN_S) ${top_srcdir}/src/pkcs15init/keycache.h keycache.h
-        @$(LN_S) ${top_srcdir}/src/pkcs15init/pkcs15-init.h pkcs15-init.h
-        @$(LN_S) ${top_srcdir}/src/scconf/scconf.h scconf.h
+        @-rm -f *.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/asn1.h asn1.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/cardctl.h cardctl.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/cards.h cards.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/emv.h emv.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/errors.h errors.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/log.h log.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/opensc.h opensc.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/pkcs15.h pkcs15.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/types.h types.h
+        @$(LN_S) $(top_srcdir)/src/libopensc/ui.h ui.h
+        @$(LN_S) $(top_srcdir)/src/pkcs11/pkcs11.h pkcs11.h
+        @$(LN_S) $(top_srcdir)/src/pkcs15init/keycache.h keycache.h
+        @$(LN_S) $(top_srcdir)/src/pkcs15init/pkcs15-init.h pkcs15-init.h
+        @$(LN_S) $(top_srcdir)/src/scconf/scconf.h scconf.h
+
+distclean-local:
+        -rm -f *.h

trunk/src/libopensc

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-*.pc
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
 opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-*.pc
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
 opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/src/libopensc/Makefile.am

@@ -1 +1 @@
 # Process this file with automake to create Makefile.in
 
-includedir = @includedir@/opensc
+include $(top_srcdir)/win32/ltrc.inc
 
 MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = Makefile.mak libopensc.pc.in libpkcs15init.pc.in libscconf.pc.in 
-
-INCLUDES = $(CPPFLAGS) $(OPENSSL_CFLAGS) $(OPENCT_CFLAGS) $(PCSC_CFLAGS) \
-        $(LTLIB_CFLAGS) -I$(top_srcdir)/src/common
-AM_LDFLAGS = 
+CLEANFILES = versioninfo.rc
+EXTRA_DIST = Makefile.mak 
 
 bin_SCRIPTS = opensc-config
+lib_LTLIBRARIES = libopensc.la
+openscinclude_HEADERS = \
+        opensc.h pkcs15.h emv.h \
+        cardctl.h asn1.h log.h ui.h \
+        errors.h types.h compression.h
+noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.h \
+        internal-winscard.h p15card-helper.h
+pkgconfig_DATA = libopensc.pc libpkcs15init.pc libscconf.pc
 
-lib_LTLIBRARIES = libopensc.la
+AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \
+        $(OPTIONAL_ZLIB_CFLAGS) $(LTLIB_CFLAGS) 
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common
+
 libopensc_la_SOURCES = \
         sc.c ctx.c ui.c log.c errors.c \
@@ -38 +45 @@
         pkcs15-actalis.c pkcs15-atrust-acos.c pkcs15-tccardos.c pkcs15-piv.c \
         pkcs15-rutoken.c pkcs15-prkey-rutoken.c \
-        compression.c p15card-helper.c
-libopensc_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
-libopensc_la_LIBADD = @LIBSCCONF@ $(OPENSSL_LIBS) $(OPENCT_LIBS) $(PCSC_LIBS) $(LTLIB_LIBS)
+        compression.c p15card-helper.c \
+        \
+        libopensc.exports
+if WIN32
+nodist_libopensc_la_SOURCES = versioninfo.rc
+endif
+libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(OPTIONAL_OPENCT_LIBS) \
+        $(OPTIONAL_ZLIB_LIBS) $(LTLIB_LIBS) \
+        $(top_builddir)/src/scconf/libscconf.la \
+        $(top_builddir)/src/common/libcompat.la
+if WIN32
+libopensc_la_LIBADD += -lws2_32
+endif
+libopensc_la_LDFLAGS = $(AM_LDFLAGS) \
+        -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
+        -export-symbols libopensc.exports \
+        -no-undefined
 
-include_HEADERS = \
-        opensc.h pkcs15.h emv.h \
-        cardctl.h asn1.h log.h ui.h \
-        errors.h types.h compression.h
+versioninfo.rc:
+        sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \
+                "$(top_srcdir)/win32/versioninfo.rc" > versioninfo.rc
 
-noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.h part10.h p15card-helper.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libopensc.pc libpkcs15init.pc libscconf.pc
+if WIN32
+# def file required for MS users to build library
+mylibdir=$(libdir)
+if CYGWIN
+mylib_DATA=.libs/cygopensc-@OPENSC_LT_CURRENT@.dll.def
+.libs/cygopensc-@OPENSC_LT_CURRENT@.dll.def:    libopensc.la
+else
+mylib_DATA=.libs/libopensc-@OPENSC_LT_CURRENT@.dll.def
+.libs/libopensc-@OPENSC_LT_CURRENT@.dll.def:    libopensc.la
+endif
+endif

trunk/src/libopensc/card-gpk.c

@@ -22 +22 @@
 #include "cardctl.h"
 #include "pkcs15.h"
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
 #include <stdlib.h>
 #include <string.h>
@@ -1903 +1903 @@
         return sc_get_driver();
 }
-#endif /* HAVE_OPENSSL */
+#endif /* ENABLE_OPENSSL */

trunk/src/libopensc/card-oberthur.c

@@ -27 +27 @@
 #include "pkcs15.h"
 
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
 #include <stdlib.h>
 #include <string.h>
@@ -2505 +2505 @@
 }
 
-#endif /* HAVE_OPENSSL */
+#endif /* ENABLE_OPENSSL */

trunk/src/libopensc/card-piv.c

@@ -24 +24 @@
 
 #include "internal.h"
+
+#ifdef ENABLE_OPENSSL
+
 #include <ctype.h>
 #include <string.h>
@@ -33 +36 @@
 #include "asn1.h"
 #include "cardctl.h"
-#ifdef HAVE_ZLIB_H
+#ifdef ENABLE_ZLIB
 #include "compression.h"
 #endif
@@ -743 +746 @@
         /* Potential truncation */
         if(compressed) {
-#ifdef HAVE_ZLIB_H
+#ifdef ENABLE_ZLIB
                 size_t len = count;
                 u8* newBuf = NULL;
@@ -1803 +1806 @@
 }
 #endif
+
+#endif

trunk/src/libopensc/card-rutoken.c

@@ -26 +26 @@
 #include <stdlib.h>
 #include "pkcs15.h"
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#elif defined(_MSC_VER)
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int16 uint16_t;
+#else
+#warning no uint32_t type available, please contact opensc-devel@opensc-project.org
+#endif
 
 #define BIG_ENDIAN_RUTOKEN
 
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
@@ -43 +53 @@
 #define ID_RESERVED_CURDF   0x3FFF      /*Reserved ID for current DF*/
 
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
 int get_prkey_from_bin(const u8 *data, size_t len, struct sc_pkcs15_prkey **key);
 #endif
@@ -343 +353 @@
 {
 #ifdef BIG_ENDIAN_RUTOKEN
-        file->size = pIn[3] + ((u_int16_t)pIn[2])*256;
-        file->id = pIn[7] + ((u_int16_t)pIn[6])*256;
+        file->size = pIn[3] + ((uint16_t)pIn[2])*256;
+        file->id = pIn[7] + ((uint16_t)pIn[6])*256;
 #else
-        file->size = pIn[2] + ((u_int16_t)pIn[3])*256;
-        file->id = pIn[6] + ((u_int16_t)pIn[7])*256;
+        file->size = pIn[2] + ((uint16_t)pIn[3])*256;
+        file->id = pIn[6] + ((uint16_t)pIn[7])*256;
 #endif
 
@@ -1070 +1080 @@
 /*  RSA emulation  */
 
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
 
 static int rutoken_get_current_fileid(sc_card_t *card, u8 id[2])
@@ -1416 +1426 @@
         rutoken_ops.get_challenge = rutoken_get_challenge;
         
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
         rutoken_ops.decipher = rutoken_decipher;
         rutoken_ops.compute_signature = rutoken_compute_signature;

trunk/src/libopensc/compression.c

@@ -19 +19 @@
  */
 #include "internal.h"
-#ifdef HAVE_ZLIB_H
+#ifdef ENABLE_ZLIB
 #include "compression.h"
 
@@ -180 +180 @@
         }
 }
-#endif /* HAVE_ZLIB_H */
+#endif /* ENABLE_ZLIB */

trunk/src/libopensc/ctx.c

@@ -57 +57 @@
         { "flex",       (void *(*)(void)) sc_get_cryptoflex_driver },
         { "cyberflex",  (void *(*)(void)) sc_get_cyberflex_driver },
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
         { "gpk",        (void *(*)(void)) sc_get_gpk_driver },
 #endif
@@ -69 +69 @@
         { "opengpg",    (void *(*)(void)) sc_get_openpgp_driver },
         { "jcop",       (void *(*)(void)) sc_get_jcop_driver },
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
         { "oberthur",   (void *(*)(void)) sc_get_oberthur_driver },
 #endif
@@ -77 +77 @@
         { "emv",        (void *(*)(void)) sc_get_emv_driver },
         { "incrypto34", (void *(*)(void)) sc_get_incrypto34_driver },
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
         { "PIV-II",     (void *(*)(void)) sc_get_piv_driver },
 #endif
@@ -89 +89 @@
 
 static const struct _sc_driver_entry internal_reader_drivers[] = {
-#if defined(HAVE_PCSC)
+#if defined(ENABLE_PCSC)
         { "pcsc",       (void *(*)(void)) sc_get_pcsc_driver },
 #endif
         { "ctapi",      (void *(*)(void)) sc_get_ctapi_driver },
 #ifndef _WIN32
-#ifdef HAVE_OPENCT
+#ifdef ENABLE_OPENCT
         { "openct",     (void *(*)(void)) sc_get_openct_driver },
 #endif
@@ -557 +557 @@
 #ifdef _WIN32
         char temp_path[PATH_MAX];
-        int temp_len;
+        DWORD temp_len;
         long rc;
         HKEY hKey;
@@ -848 +848 @@
 
         while (1) {
+#ifdef _WIN32
+                if (mkdir(dirname) >= 0)
+#else
                 if (mkdir(dirname, 0700) >= 0)
+#endif
                         break;
                 if (errno != ENOENT
@@ -864 +868 @@
                         break;
                 dirname[j] = '/';
+#ifdef _WIN32
+                if (mkdir(dirname) < 0)
+#else
                 if (mkdir(dirname, 0700) < 0)
+#endif
                         goto failed;
         }

trunk/src/libopensc/internal-winscard.h

@@ -56 +56 @@
 #define SCARD_E_NO_READERS_AVAILABLE    0x8010002E /**< Cannot find a smart card reader. */
 #define SCARD_W_UNRESPONSIVE_CARD       0x80100066 /**< The smart card is not responding to a reset. */
+#define SCARD_W_UNPOWERED_CARD          0x80100067 /**< Power has been removed from the smart card, so that further communication is not possible. */
 #define SCARD_W_RESET_CARD              0x80100068 /**< The smart card has been reset, so any shared state information is invalid. */
 #define SCARD_W_REMOVED_CARD            0x80100069 /**< The smart card has been removed, so further communication is not possible. */

trunk/src/libopensc/internal.h

@@ -36 +36 @@
 #include "cards.h"
 #include <assert.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 #define SC_FILE_MAGIC                   0x14426950

trunk/src/libopensc/log.c

@@ -36 +36 @@
 #endif
 
-#ifndef __GNUC__
-void sc_error(sc_context_t *ctx, const char *format, ...)
+/* Although not used, we need this for consistent exports */
+void _sc_error(sc_context_t *ctx, const char *format, ...)
 {
         va_list ap;
@@ -46 +46 @@
 }
 
-void sc_debug(sc_context_t *ctx, const char *format, ...)
+/* Although not used, we need this for consistent exports */
+void _sc_debug(sc_context_t *ctx, const char *format, ...)
 {
         va_list ap;
@@ -54 +55 @@
         va_end(ap);
 }
-
-#endif
 
 void sc_do_log(sc_context_t *ctx, int type, const char *file, int line, const char *func, const char *format, ...)

trunk/src/libopensc/log.h

@@ -45 +45 @@
 
 #else
-
-void sc_error(struct sc_context *ctx, const char *format, ...);
-void sc_debug(struct sc_context *ctx, const char *format, ...);
-
+#define sc_error _sc_error
+#define sc_debug _sc_debug
 #endif
 
+void _sc_error(struct sc_context *ctx, const char *format, ...);
+void _sc_debug(struct sc_context *ctx, const char *format, ...);
 void sc_do_log(struct sc_context *ctx, int type, const char *file, int line, const char *func, const char *format, ...);
 void sc_do_log_va(struct sc_context *ctx, int type, const char *file, int line, const char *func, const char *format, va_list args);

trunk/src/libopensc/opensc-config.in

@@ -10 +10 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+version="@VERSION@"
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
 exec_prefix_set=no
 
-opensc_libs="@OPENSC_LIBS@"
-opensc_cflags="@OPENSC_CFLAGS@"
-
+libdir="@libdir@"
+includedir="@includedir@"
+opensc_cflags=""
+opensc_libs="-L${libdir} -lopensc"
 
 usage()
@@ -61 +63 @@
       ;;
     --version)
-      echo "@VERSION@"
+      echo "${version}"
       exit 0
       ;;
@@ -86 +88 @@
 
 if test "$echo_cflags" = "yes"; then
-    if test "@includedir@" != "/usr/include" ; then
-      includes="-I@includedir@"
-      for i in $opensc_cflags ; do
-        if test "$i" = "-I@includedir@" ; then
+    if test "${includedir}" != "/usr/include" ; then
+      includes="-I${includedir}"
+      for i in ${opensc_cflags} ; do
+        if test "$i" = "-I${includedir}" ; then
           includes=""
         fi

trunk/src/libopensc/p15card-helper.c

@@ -19 +19 @@
  */
 
+#include "internal.h"
+
+#if ENABLE_OPENSSL
 #include "p15card-helper.h"
 #include <opensc/opensc.h>
@@ -341 +344 @@
         return SC_SUCCESS;
 }
+
+#endif

trunk/src/libopensc/pkcs15-actalis.c

@@ -32 +32 @@
 #include <string.h>
 #include <stdio.h>
-#include "strlcpy.h"
-
-#ifdef HAVE_ZLIB_H
+#include <compat_strlcpy.h>
+
+#ifdef ENABLE_ZLIB
 #include <zlib.h>
 #endif
@@ -152 +152 @@
         int r;
 
-#ifdef HAVE_ZLIB_H
+#ifdef ENABLE_ZLIB
         int i;
         const char *certLabel[] = {
@@ -198 +198 @@
         set_string(&p15card->serial_number, (char *)serial);
 
-#ifdef HAVE_ZLIB_H
+#ifdef ENABLE_ZLIB
         for (i = 0; i < 3; i++) {
                 unsigned char *compCert = NULL, *cert = NULL, size[2];

trunk/src/libopensc/pkcs15-atrust-acos.c

@@ -25 +25 @@
 #include <string.h>
 #include <stdio.h>
-#include "strlcpy.h"
+#include <compat_strlcpy.h>
 
 #define MANU_ID         "A-Trust"

trunk/src/libopensc/pkcs15-esteid.c

@@ -29 +29 @@
 
 #include "esteid.h"
-#include "strlcpy.h"
+#include <compat_strlcpy.h>
 
 int sc_pkcs15emu_esteid_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);

trunk/src/libopensc/pkcs15-gemsafeGPK.c

@@ -27 +27 @@
 #include <string.h>
 #include <stdio.h>
-#include "strlcpy.h"
+#include <compat_strlcpy.h>
 
 #define MANU_ID         "GemSAFE on GPK16000"

trunk/src/libopensc/pkcs15-infocamere.c

@@ -31 +31 @@
 #include <string.h>
 #include <stdio.h>
-#include "strlcpy.h"
-
-#ifdef HAVE_ZLIB_H
+#include <compat_strlcpy.h>
+
+#ifdef ENABLE_ZLIB
 #include <zlib.h>
 #endif
@@ -487 +487 @@
 }
 
-#ifdef HAVE_ZLIB_H
+#ifdef ENABLE_ZLIB
 
 static const u8 ATR_1400[] =
@@ -840 +840 @@
         if (memcmp(p15card->card->atr, ATR_1600, sizeof(ATR_1600)) == 0)
                 return infocamere_1600_init(p15card);
-#ifdef HAVE_ZLIB_H
+#ifdef ENABLE_ZLIB
         else if (memcmp(p15card->card->atr, ATR_1400, sizeof(ATR_1400)) ==
                  0)

trunk/src/libopensc/pkcs15-openpgp.c

@@ -27 +27 @@
 #include <stdio.h>
 #include <assert.h>
-#include "strlcpy.h"
+#include <compat_strlcpy.h>
 
 int sc_pkcs15emu_openpgp_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);

trunk/src/libopensc/pkcs15-piv.c

@@ -24 +24 @@
  */
 
+#include "internal.h"
 #include <stdlib.h>
 #include <string.h>
@@ -32 +33 @@
 #include <opensc/cardctl.h>
 #include <opensc/cards.h>
-#include <openssl/bio.h>
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
 
 #define MANU_ID         "piv_II "

trunk/src/libopensc/pkcs15-postecert.c

@@ -27 +27 @@
 #include <string.h>
 #include <stdio.h>
-#include "strlcpy.h"
+#include <compat_strlcpy.h>
 
 int sc_pkcs15emu_postecert_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);

trunk/src/libopensc/pkcs15-prkey-rutoken.c

@@ -29 +29 @@
 #include <opensc/opensc.h>
 #include <opensc/pkcs15.h>
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#elif defined(_MSC_VER)
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int16 uint16_t;
+#else
+#warning no uint32_t type available, please contact opensc-devel@opensc-project.org
+#endif
 
 /*  BLOB definition  */
 
 typedef struct _RSAPUBKEY {
-        u_int32_t magic;
-        u_int32_t bitlen;
-        u_int32_t pubexp;
+        uint32_t magic;
+        uint32_t bitlen;
+        uint32_t pubexp;
 } RSAPUBKEY;
 
@@ -41 +51 @@
         u8 bType;
         u8 bVersion;
-        u_int16_t reserved;
-        u_int32_t aiKeyAlg;
+        uint16_t reserved;
+        uint32_t aiKeyAlg;
 } BLOBHEADER;
 
@@ -98 +108 @@
         tmp += sizeof(pr_blob->rsapubkey);
 
-        u_int32_t bitlen = pr_blob->rsapubkey.bitlen;
+        uint32_t bitlen = pr_blob->rsapubkey.bitlen;
 
         len += bitlen/8 * 2  +  bitlen/16 * 5;
@@ -139 +149 @@
 {
         size_t n;
-        const u_int32_t bitlen = key->modulus.len*8;
+        const uint32_t bitlen = key->modulus.len*8;
 
         if (    key->modulus.len != bitlen/8
@@ -167 +177 @@
         for (n=0; n < key->exponent.len  &&  n < sizeof(pr_blob->rsapubkey.pubexp); ++n)
                 pr_blob->rsapubkey.pubexp += 
-                        (u_int32_t)key->exponent.data[key->exponent.len - n - 1] << 8*n;
+                        (uint32_t)key->exponent.data[key->exponent.len - n - 1] << 8*n;
 
         pr_blob->modulus = malloc(bitlen/8);
@@ -206 +216 @@
         static const u8 Exp[3] = { 0x01, 0x00, 0x01 }; /* big endian */
 
-        const u_int32_t bitlen = pr_blob->rsapubkey.bitlen;
+        const uint32_t bitlen = pr_blob->rsapubkey.bitlen;
 
         key->modulus.data = malloc(bitlen/8);
@@ -306 +316 @@
 static int clean_prkey_private_blob(const PRIVATEKEYBLOB* pr_blob)
 {
-        const u_int32_t bitlen = pr_blob->rsapubkey.bitlen;
+        const uint32_t bitlen = pr_blob->rsapubkey.bitlen;
 
         memset(pr_blob->modulus, 0, bitlen/8);
@@ -344 +354 @@
 }
 
-int get_bin_from_prkey(const struct sc_pkcs15_prkey_rsa *rsa, u8 *key, size_t *keysize)
+int sc_rutoken_get_bin_from_prkey(const struct sc_pkcs15_prkey_rsa *rsa, u8 *key, size_t *keysize)
 {
         int r = -1;

trunk/src/libopensc/pkcs15-starcert.c

@@ -24 +24 @@
 #include <string.h>
 #include <stdio.h>
-#include "strlcpy.h"
+#include <compat_strlcpy.h>
 
 #define MANU_ID         "Giesecke & Devrient GmbH"

trunk/src/libopensc/pkcs15-tcos.c

@@ -26 +26 @@
 #include <string.h>
 #include <stdio.h>
-#include "strlcpy.h"
+#include <compat_strlcpy.h>
 
 static int insert_cert(

trunk/src/libopensc/pkcs15-wrap.c

@@ -21 +21 @@
 #include "internal.h"
 #include "pkcs15.h"
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
 #include <openssl/evp.h>
 #include <openssl/rand.h>
@@ -40 +40 @@
 
 
-#ifndef HAVE_OPENSSL
+#ifndef ENABLE_OPENSSL
 int
 sc_pkcs15_wrap_data(sc_context_t *ctx,
@@ -59 +59 @@
 }
 
-#else /* HAVE_OPENSSL */
+#else /* ENABLE_OPENSSL */
 
 static int
@@ -247 +247 @@
         return r;
 }
-#endif /* HAVE_OPENSSL */
+#endif /* ENABLE_OPENSSL */
 
 /*

trunk/src/libopensc/reader-openct.c

@@ -6 +6 @@
 
 #include "internal.h"
-#ifdef HAVE_OPENCT
+#ifdef ENABLE_OPENCT
 #include <errno.h>
 #include <stdlib.h>
@@ -492 +492 @@
 }
 
-#endif  /* HAVE_OPENCT */
+#endif  /* ENABLE_OPENCT */

trunk/src/libopensc/reader-pcsc.c

@@ -20 +20 @@
 
 #include "internal.h"
-#ifdef HAVE_PCSC
+#ifdef ENABLE_PCSC
 #include "ctbcs.h"
 #include <assert.h>
@@ -26 +26 @@
 #include <string.h>
 #include <time.h>
-#ifdef PCSC_INCLUDES_IN_PCSC
-#include <PCSC/wintypes.h>
-#include <PCSC/winscard.h>
-#else
-#include <winscard.h>
-#endif
+#include <ltdl.h>
 
 #ifdef _WIN32
-#include <Winsock.h>
-#include "part10.h"
-#define PINPAD_ENABLED
+#include <winsock2.h>
 #else
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_READER_H
-#include <reader.h>
-#ifdef HOST_TO_CCID_32
-#define PINPAD_ENABLED
-#endif
-#endif
+
+#include "internal-winscard.h"
 
 /* Default timeout value for SCardGetStatusChange
@@ -60 +49 @@
 #undef SCARD_PROTOCOL_ANY
 #define SCARD_PROTOCOL_ANY (SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
-#ifdef _WIN32
-
 /* Error printing */
 #define PCSC_ERROR(ctx, desc, rv) sc_error(ctx, desc ": %lx\n", rv);
-
-#else
-
-#define PCSC_ERROR(ctx, desc, rv) sc_error(ctx, desc ": %s\n", pcsc_stringify_error(rv));
-#endif
 
 /* Utility for handling big endian IOCTL codes. */
@@ -86 +68 @@
         int connect_reset;
         int transaction_reset;
-        
+        const char *library_name;
+        lt_dlhandle dlhandle;
+        SCardEstablishContext_t SCardEstablishContext;
+        SCardReleaseContext_t SCardReleaseContext;
+        SCardConnect_t SCardConnect;
+        SCardReconnect_t SCardReconnect;
+        SCardDisconnect_t SCardDisconnect;
+        SCardBeginTransaction_t SCardBeginTransaction;
+        SCardEndTransaction_t SCardEndTransaction;
+        SCardStatus_t SCardStatus;
+        SCardGetStatusChange_t SCardGetStatusChange;
+        SCardControlOLD_t SCardControlOLD;
+        SCardControl_t SCardControl;
+        SCardTransmit_t SCardTransmit;
+        SCardListReaders_t SCardListReaders;
 };
 
 struct pcsc_private_data {
-        SCARDCONTEXT pcsc_ctx;
         char *reader_name;
         struct pcsc_global_private_data *gpriv;
@@ -169 +164 @@
                          unsigned long control)
 {
+        struct pcsc_private_data *priv = GET_PRIV_DATA(reader);
         SCARD_IO_REQUEST sSendPci, sRecvPci;
         DWORD dwSendLength, dwRecvLength;
@@ -191 +187 @@
 
         if (!control) {
-                rv = SCardTransmit(card, &sSendPci, sendbuf, dwSendLength,
+                rv = priv->gpriv->SCardTransmit(card, &sSendPci, sendbuf, dwSendLength,
                                    &sRecvPci, recvbuf, &dwRecvLength);
         } else {
-#ifdef HAVE_PCSC_OLD
-                rv = SCardControl(card, sendbuf, dwSendLength,
+                if (priv->gpriv->SCardControlOLD != NULL) {
+                        rv = priv->gpriv->SCardControlOLD(card, sendbuf, dwSendLength,
                                   recvbuf, &dwRecvLength);
-#else
-                rv = SCardControl(card, (DWORD) control, sendbuf, dwSendLength,
+                }
+                else {
+                        rv = priv->gpriv->SCardControl(card, (DWORD) control, sendbuf, dwSendLength,
                                   recvbuf, dwRecvLength, &dwRecvLength);
-#endif
+                }
         }
 
@@ -291 +288 @@
         }
 
-        ret = SCardGetStatusChange(priv->pcsc_ctx, SC_STATUS_TIMEOUT, &pslot->reader_state, 1);
+        ret = priv->gpriv->SCardGetStatusChange(priv->gpriv->pcsc_ctx, SC_STATUS_TIMEOUT, &pslot->reader_state, 1);
         if (ret == (LONG)SCARD_E_TIMEOUT) { /* timeout: nothing changed */
                 slot->flags &= ~SCARD_STATE_CHANGED;
@@ -334 +331 @@
                                 DWORD readers_len = 0, state, prot, atr_len = 32;
                                 unsigned char atr[32];
-                                LONG rv = SCardStatus(pslot->pcsc_card, NULL, &readers_len,
+                                LONG rv = priv->gpriv->SCardStatus(pslot->pcsc_card, NULL, &readers_len,
                                         &state, &prot, atr, &atr_len);
                                 if (rv == (LONG)SCARD_W_REMOVED_CARD)
@@ -368 +365 @@
                                unsigned int *event, int timeout)
 {
+        struct pcsc_private_data *priv = GET_PRIV_DATA(readers[0]);
         sc_context_t *ctx;
         SCARDCONTEXT pcsc_ctx;
@@ -394 +392 @@
         /* Find out the current status */
         ctx = readers[0]->ctx;
-        pcsc_ctx = GET_PRIV_DATA(readers[0])->pcsc_ctx;
+        pcsc_ctx = priv->gpriv->pcsc_ctx;
         for (i = 0; i < nslots; i++) {
                 struct pcsc_private_data *priv = GET_PRIV_DATA(readers[i]);
@@ -403 +401 @@
 
                 /* Can we handle readers from different PCSC contexts? */
-                if (priv->pcsc_ctx != pcsc_ctx)
+                if (priv->gpriv->pcsc_ctx != pcsc_ctx)
                         return SC_ERROR_INVALID_ARGUMENTS;
         }
 
-        ret = SCardGetStatusChange(pcsc_ctx, 0, rgReaderStates, nslots);
+        ret = priv->gpriv->SCardGetStatusChange(pcsc_ctx, 0, rgReaderStates, nslots);
         if (ret != 0) {
                 PCSC_ERROR(ctx, "SCardGetStatusChange(1) failed", ret);
@@ -457 +455 @@
                 }
 
-                ret = SCardGetStatusChange(pcsc_ctx, 1000 * delta,
+                ret = priv->gpriv->SCardGetStatusChange(pcsc_ctx, 1000 * delta,
                                            rgReaderStates, nslots);
                 if (ret == (LONG) SCARD_E_TIMEOUT) {
@@ -490 +488 @@
         pslot->locked = 0;
         
-        rv = SCardReconnect(pslot->pcsc_card,
+        rv = priv->gpriv->SCardReconnect(pslot->pcsc_card,
                             priv->gpriv->connect_exclusive ? SCARD_SHARE_EXCLUSIVE : SCARD_SHARE_SHARED,
                             SCARD_PROTOCOL_ANY, reset ? SCARD_UNPOWER_CARD : SCARD_LEAVE_CARD, &active_proto);
@@ -500 +498 @@
                 protocol = opensc_proto_to_pcsc(protocol);
                 if (pcsc_proto_to_opensc(active_proto) != protocol) {
-                 rv = SCardReconnect(pslot->pcsc_card,
+                 rv = priv->gpriv->SCardReconnect(pslot->pcsc_card,
                                      priv->gpriv->connect_exclusive ? SCARD_SHARE_EXCLUSIVE : SCARD_SHARE_SHARED,
                                      protocol, SCARD_UNPOWER_CARD, &active_proto);
@@ -523 +521 @@
         struct pcsc_slot_data *pslot = GET_SLOT_DATA(slot);
         int r;
-#ifdef PINPAD_ENABLED
         u8 feature_buf[256];
         DWORD i, feature_len;
         PCSC_TLV_STRUCTURE *pcsc_tlv;
-#endif
 
         r = refresh_slot_attributes(reader, slot);
@@ -536 +532 @@
 
         /* Always connect with whatever protocol possible */
-        rv = SCardConnect(priv->pcsc_ctx, priv->reader_name,
+        rv = priv->gpriv->SCardConnect(priv->gpriv->pcsc_ctx, priv->reader_name,
                           priv->gpriv->connect_exclusive ? SCARD_SHARE_EXCLUSIVE : SCARD_SHARE_SHARED,
                           SCARD_PROTOCOL_ANY, &card_handle, &active_proto);
@@ -566 +562 @@
 
         /* check for pinpad support */
-#ifdef PINPAD_ENABLED
-        sc_debug(reader->ctx, "Requesting reader features ... ");
-
-        rv = SCardControl(pslot->pcsc_card, CM_IOCTL_GET_FEATURE_REQUEST, NULL,
-                          0, feature_buf, sizeof(feature_buf), &feature_len);
-        if (rv == SCARD_S_SUCCESS) {
-                
-                if (!(feature_len % sizeof(PCSC_TLV_STRUCTURE))) {
-                        char *log_disabled = "but it's disabled in configuration file";
-                        /* get the number of elements instead of the complete size */
-                        feature_len /= sizeof(PCSC_TLV_STRUCTURE);
-
-                        pcsc_tlv = (PCSC_TLV_STRUCTURE *)feature_buf;
-                        for (i = 0; i < feature_len; i++) {
-                                if (pcsc_tlv[i].tag == FEATURE_VERIFY_PIN_DIRECT) {
-                                        pslot->verify_ioctl = ntohl(pcsc_tlv[i].value);
-                                } else if (pcsc_tlv[i].tag == FEATURE_VERIFY_PIN_START) {
-                                        pslot->verify_ioctl_start = ntohl(pcsc_tlv[i].value);
-                                } else if (pcsc_tlv[i].tag == FEATURE_VERIFY_PIN_FINISH) {
-                                        pslot->verify_ioctl_finish = ntohl(pcsc_tlv[i].value);
-                                } else if (pcsc_tlv[i].tag == FEATURE_MODIFY_PIN_DIRECT) {
-                                        pslot->modify_ioctl = ntohl(pcsc_tlv[i].value);
-                                } else if (pcsc_tlv[i].tag == FEATURE_MODIFY_PIN_START) {
-                                        pslot->modify_ioctl_start = ntohl(pcsc_tlv[i].value);
-                                } else if (pcsc_tlv[i].tag == FEATURE_MODIFY_PIN_FINISH) {
-                                        pslot->modify_ioctl_finish = ntohl(pcsc_tlv[i].value);
-                                } else {
-                                        sc_debug(reader->ctx, "Reader pinpad feature: %02x not supported", pcsc_tlv[i].tag);
-                                }
-                        }
+        if (priv->gpriv->SCardControl != NULL) {
+                sc_debug(reader->ctx, "Requesting reader features ... ");
+
+                rv = priv->gpriv->SCardControl(pslot->pcsc_card, CM_IOCTL_GET_FEATURE_REQUEST, NULL,
+                                  0, feature_buf, sizeof(feature_buf), &feature_len);
+                if (rv == SCARD_S_SUCCESS) {
                         
-                        /* Set slot capabilities based on detected IOCTLs */
-                        if (pslot->verify_ioctl || (pslot->verify_ioctl_start && pslot->verify_ioctl_finish)) {
-                                        char *log_text = "Reader supports pinpad PIN verification";
-                                        if (priv->gpriv->enable_pinpad) {
-                                                sc_debug(reader->ctx, log_text);
-                                                slot->capabilities |= SC_SLOT_CAP_PIN_PAD;
+                        if (!(feature_len % sizeof(PCSC_TLV_STRUCTURE))) {
+                                char *log_disabled = "but it's disabled in configuration file";
+                                /* get the number of elements instead of the complete size */
+                                feature_len /= sizeof(PCSC_TLV_STRUCTURE);
+
+                                pcsc_tlv = (PCSC_TLV_STRUCTURE *)feature_buf;
+                                for (i = 0; i < feature_len; i++) {
+                                        if (pcsc_tlv[i].tag == FEATURE_VERIFY_PIN_DIRECT) {
+                                                pslot->verify_ioctl = ntohl(pcsc_tlv[i].value);
+                                        } else if (pcsc_tlv[i].tag == FEATURE_VERIFY_PIN_START) {
+                                                pslot->verify_ioctl_start = ntohl(pcsc_tlv[i].value);
+                                        } else if (pcsc_tlv[i].tag == FEATURE_VERIFY_PIN_FINISH) {
+                                                pslot->verify_ioctl_finish = ntohl(pcsc_tlv[i].value);
+                                        } else if (pcsc_tlv[i].tag == FEATURE_MODIFY_PIN_DIRECT) {
+                                                pslot->modify_ioctl = ntohl(pcsc_tlv[i].value);
+                                        } else if (pcsc_tlv[i].tag == FEATURE_MODIFY_PIN_START) {
+                                                pslot->modify_ioctl_start = ntohl(pcsc_tlv[i].value);
+                                        } else if (pcsc_tlv[i].tag == FEATURE_MODIFY_PIN_FINISH) {
+                                                pslot->modify_ioctl_finish = ntohl(pcsc_tlv[i].value);
                                         } else {
-                                                sc_debug(reader->ctx, "%s %s", log_text, log_disabled);
-                                        }
-                        }
-                        
-                        if (pslot->modify_ioctl || (pslot->modify_ioctl_start && pslot->modify_ioctl_finish)) {
-                                        char *log_text = "Reader supports pinpad PIN modification";
-                                        if (priv->gpriv->enable_pinpad) {
-                                                sc_debug(reader->ctx, log_text);
-                                                slot->capabilities |= SC_SLOT_CAP_PIN_PAD;
-                                        } else {
-                                                sc_debug(reader->ctx, "%s %s", log_text, log_disabled);
+                                                sc_debug(reader->ctx, "Reader pinpad feature: %02x not supported", pcsc_tlv[i].tag);
                                         }
                                 }
-                } else
-                        sc_debug(reader->ctx, "Inconsistent TLV from reader!");
-        } else {
-                sc_debug(reader->ctx, "SCardControl failed %d", rv);
-        }
-#endif /* PINPAD_ENABLED */
+                                
+                                /* Set slot capabilities based on detected IOCTLs */
+                                if (pslot->verify_ioctl || (pslot->verify_ioctl_start && pslot->verify_ioctl_finish)) {
+                                                char *log_text = "Reader supports pinpad PIN verification";
+                                                if (priv->gpriv->enable_pinpad) {
+                                                        sc_debug(reader->ctx, log_text);
+                                                        slot->capabilities |= SC_SLOT_CAP_PIN_PAD;
+                                                } else {
+                                                        sc_debug(reader->ctx, "%s %s", log_text, log_disabled);
+                                                }
+                                }
+                                
+                                if (pslot->modify_ioctl || (pslot->modify_ioctl_start && pslot->modify_ioctl_finish)) {
+                                                char *log_text = "Reader supports pinpad PIN modification";
+                                                if (priv->gpriv->enable_pinpad) {
+                                                        sc_debug(reader->ctx, log_text);
+                                                        slot->capabilities |= SC_SLOT_CAP_PIN_PAD;
+                                                } else {
+                                                        sc_debug(reader->ctx, "%s %s", log_text, log_disabled);
+                                                }
+                                        }
+                        } else
+                                sc_debug(reader->ctx, "Inconsistent TLV from reader!");
+                } else {
+                        sc_debug(reader->ctx, "SCardControl failed %d", rv);
+                }
+        }
         return SC_SUCCESS;
 }
@@ -631 +627 @@
         struct pcsc_private_data *priv = GET_PRIV_DATA(reader);
 
-        SCardDisconnect(pslot->pcsc_card, priv->gpriv->transaction_reset ?
+        priv->gpriv->SCardDisconnect(pslot->pcsc_card, priv->gpriv->transaction_reset ?
                   SCARD_RESET_CARD : SCARD_LEAVE_CARD);
         memset(pslot, 0, sizeof(*pslot));
@@ -642 +638 @@
         long rv;
         struct pcsc_slot_data *pslot = GET_SLOT_DATA(slot);
+        struct pcsc_private_data *priv = GET_PRIV_DATA(reader);
 
         SC_FUNC_CALLED(reader->ctx, 3);
         assert(pslot != NULL);
 
-        rv = SCardBeginTransaction(pslot->pcsc_card);
+        rv = priv->gpriv->SCardBeginTransaction(pslot->pcsc_card);
 
         if ((unsigned int)rv == SCARD_W_RESET_CARD) {
@@ -657 +654 @@
                 /* Now try to begin a new transaction after we reconnected and we fail if
                  some other program was faster to lock the reader */
-                rv = SCardBeginTransaction(pslot->pcsc_card);
+                rv = priv->gpriv->SCardBeginTransaction(pslot->pcsc_card);
         }
 
@@ -679 +676 @@
         assert(pslot != NULL);
 
-        rv = SCardEndTransaction(pslot->pcsc_card, priv->gpriv->transaction_reset ?
+        rv = priv->gpriv->SCardEndTransaction(pslot->pcsc_card, priv->gpriv->transaction_reset ?
                            SCARD_RESET_CARD : SCARD_LEAVE_CARD);
 
@@ -736 +733 @@
         LONG rv;
         DWORD reader_buf_size;
-        char *reader_buf, *p;
+        char *reader_buf = NULL, *p;
         const char *mszGroups = NULL;
-        SCARDCONTEXT pcsc_ctx;
         int r;
         struct pcsc_global_private_data *gpriv;
-        scconf_block *conf_block;
-
-        rv = SCardEstablishContext(SCARD_SCOPE_USER,
-                              NULL, NULL, &pcsc_ctx);
-        if (rv != SCARD_S_SUCCESS)
-                return pcsc_ret_to_error(rv);
-        rv = SCardListReaders(pcsc_ctx, NULL, NULL,
-                              (LPDWORD) &reader_buf_size);
-        if (rv != SCARD_S_SUCCESS || reader_buf_size < 2) {
-                SCardReleaseContext(pcsc_ctx);
-                return pcsc_ret_to_error(rv);   /* No readers configured */
-        }
-        gpriv = (struct pcsc_global_private_data *) malloc(sizeof(struct pcsc_global_private_data));
+        scconf_block *conf_block = NULL;
+        int ret = SC_ERROR_INTERNAL;
+
+        *reader_data = NULL;
+
+        gpriv = (struct pcsc_global_private_data *) calloc(1, sizeof(struct pcsc_global_private_data));
         if (gpriv == NULL) {
-                SCardReleaseContext(pcsc_ctx);
-                return SC_ERROR_OUT_OF_MEMORY;
-        }
-        gpriv->pcsc_ctx = pcsc_ctx;
+                ret = SC_ERROR_OUT_OF_MEMORY;
+                goto out;
+        }
 
         /* Defaults */
@@ -765 +753 @@
         gpriv->transaction_reset = 0;
         gpriv->enable_pinpad = 0;
+        gpriv->library_name = PCSC_DEFAULT_LIBRARY_NAME;
         
         conf_block = sc_get_conf_block(ctx, "reader_driver", "pcsc", 1);
@@ -776 +765 @@
                 gpriv->enable_pinpad =
                     scconf_get_bool(conf_block, "enable_pinpad", gpriv->enable_pinpad);
-        }
-        *reader_data = gpriv;
+                gpriv->library_name =
+                    scconf_get_str(conf_block, "library_name", gpriv->library_name);
+        }
+
+        gpriv->dlhandle = lt_dlopen(gpriv->library_name);
+        if (gpriv->dlhandle == NULL) {
+                ret = SC_ERROR_CANNOT_LOAD_MODULE;
+                goto out;
+        }
+
+        gpriv->SCardEstablishContext = (SCardEstablishContext_t)lt_dlsym(gpriv->dlhandle, "SCardEstablishContext");
+        gpriv->SCardReleaseContext = (SCardReleaseContext_t)lt_dlsym(gpriv->dlhandle, "SCardReleaseContext");
+        gpriv->SCardConnect = (SCardConnect_t)lt_dlsym(gpriv->dlhandle, "SCardConnect");
+        gpriv->SCardReconnect = (SCardReconnect_t)lt_dlsym(gpriv->dlhandle, "SCardReconnect");
+        gpriv->SCardDisconnect = (SCardDisconnect_t)lt_dlsym(gpriv->dlhandle, "SCardDisconnect");
+        gpriv->SCardBeginTransaction = (SCardBeginTransaction_t)lt_dlsym(gpriv->dlhandle, "SCardBeginTransaction");
+        gpriv->SCardEndTransaction = (SCardEndTransaction_t)lt_dlsym(gpriv->dlhandle, "SCardEndTransaction");
+        gpriv->SCardStatus = (SCardStatus_t)lt_dlsym(gpriv->dlhandle, "SCardStatus");
+        gpriv->SCardGetStatusChange = (SCardGetStatusChange_t)lt_dlsym(gpriv->dlhandle, "SCardGetStatusChange");
+        gpriv->SCardTransmit = (SCardTransmit_t)lt_dlsym(gpriv->dlhandle, "SCardTransmit");
+        gpriv->SCardListReaders = (SCardListReaders_t)lt_dlsym(gpriv->dlhandle, "SCardListReaders");
+
+        if (gpriv->SCardConnect == NULL)
+                gpriv->SCardConnect = (SCardConnect_t)lt_dlsym(gpriv->dlhandle, "SCardConnectA");
+        if (gpriv->SCardStatus == NULL)
+                gpriv->SCardStatus = (SCardStatus_t)lt_dlsym(gpriv->dlhandle, "SCardStatusA");
+        if (gpriv->SCardGetStatusChange == NULL)
+                gpriv->SCardGetStatusChange = (SCardGetStatusChange_t)lt_dlsym(gpriv->dlhandle, "SCardGetStatusChangeA");
+        if (gpriv->SCardListReaders == NULL)
+                gpriv->SCardListReaders = (SCardListReaders_t)lt_dlsym(gpriv->dlhandle, "SCardListReadersA");
+        
+        /* If we have SCardGetAttrib it is correct API */
+        if (lt_dlsym(gpriv->dlhandle, "SCardGetAttrib") != NULL)
+                gpriv->SCardControl = (SCardControl_t)lt_dlsym(gpriv->dlhandle, "SCardControl");
+        else
+                gpriv->SCardControlOLD = (SCardControlOLD_t)lt_dlsym(gpriv->dlhandle, "SCardControl");
+
+        if (
+                gpriv->SCardReleaseContext == NULL ||
+                gpriv->SCardConnect == NULL ||
+                gpriv->SCardReconnect == NULL ||
+                gpriv->SCardDisconnect == NULL ||
+                gpriv->SCardBeginTransaction == NULL ||
+                gpriv->SCardEndTransaction == NULL ||
+                gpriv->SCardStatus == NULL ||
+                gpriv->SCardGetStatusChange == NULL ||
+                (gpriv->SCardControl == NULL && gpriv->SCardControlOLD == NULL) ||
+                gpriv->SCardTransmit == NULL ||
+                gpriv->SCardListReaders == NULL
+        ) {
+                ret = SC_ERROR_CANNOT_LOAD_MODULE;
+                goto out;
+        }
+
+        rv = gpriv->SCardEstablishContext(SCARD_SCOPE_USER,
+                              NULL, NULL, &gpriv->pcsc_ctx);
+        if (rv != SCARD_S_SUCCESS) {
+                ret = pcsc_ret_to_error(rv);
+                goto out;
+        }
+        rv = gpriv->SCardListReaders(gpriv->pcsc_ctx, NULL, NULL,
+                              (LPDWORD) &reader_buf_size);
+        if (rv != SCARD_S_SUCCESS || reader_buf_size < 2) {
+                ret = pcsc_ret_to_error(rv);    /* No readers configured */
+                goto out;
+        }
 
         reader_buf = (char *) malloc(sizeof(char) * reader_buf_size);
         if (!reader_buf) {
-                free(gpriv);
-                *reader_data = NULL;
-                SCardReleaseContext(pcsc_ctx);
-                return SC_ERROR_OUT_OF_MEMORY;
-        }
-        rv = SCardListReaders(pcsc_ctx, mszGroups, reader_buf,
+                ret = SC_ERROR_OUT_OF_MEMORY;
+                goto out;
+        }
+        rv = gpriv->SCardListReaders(gpriv->pcsc_ctx, mszGroups, reader_buf,
                               (LPDWORD) &reader_buf_size);
         if (rv != SCARD_S_SUCCESS) {
-                free(reader_buf);
-                free(gpriv);
-                *reader_data = NULL;
-                SCardReleaseContext(pcsc_ctx);
-                return pcsc_ret_to_error(rv);
+                ret = pcsc_ret_to_error(rv);
+                goto out;
         }
         p = reader_buf;
@@ -818 +866 @@
                 reader->name = strdup(p);
                 priv->gpriv = gpriv;
-                priv->pcsc_ctx = pcsc_ctx;
                 priv->reader_name = strdup(p);
                 r = _sc_add_reader(ctx, reader);
@@ -837 +884 @@
                 while (*p++ != 0);
         } while (p < (reader_buf + reader_buf_size - 1));
-        free(reader_buf);
+
+        *reader_data = gpriv;
+        gpriv = NULL;
+        ret = SC_SUCCESS;
+
+out:
+        if (ret != SC_SUCCESS) {
+                if (gpriv->pcsc_ctx != 0)
+                        gpriv->SCardReleaseContext(gpriv->pcsc_ctx);
+                if (reader_buf != NULL)
+                        free(reader_buf);
+                if (gpriv->dlhandle != NULL)
+                        lt_dlclose(gpriv->dlhandle);
+                if (gpriv != NULL)
+                        free(gpriv);
+        }
 
         return 0;
@@ -847 +909 @@
 
         if (priv) {
-                SCardReleaseContext(priv->pcsc_ctx);
+                priv->SCardReleaseContext(priv->pcsc_ctx);
+                lt_dlclose(priv->dlhandle);
                 free(priv);
         }
@@ -888 +951 @@
  */
 
-#ifdef PINPAD_ENABLED
 /* Local definitions */
 #define SC_CCID_PIN_TIMEOUT        30
@@ -1085 +1147 @@
 }
 
-#endif
 /* Do the PIN command */
 static int
@@ -1091 +1152 @@
              struct sc_pin_cmd_data *data)
 {
-#ifdef PINPAD_ENABLED
+        struct pcsc_private_data *priv = GET_PRIV_DATA(reader);
         u8 rbuf[SC_MAX_APDU_BUFFER_SIZE], sbuf[SC_MAX_APDU_BUFFER_SIZE];
         char dbuf[SC_MAX_APDU_BUFFER_SIZE * 3];
@@ -1102 +1163 @@
         SC_FUNC_CALLED(reader->ctx, 3);
         assert(pslot != NULL);
+
+        if (priv->gpriv->SCardControl == NULL)
+                return SC_ERROR_NOT_SUPPORTED;
 
         /* The APDU must be provided by the card driver */
@@ -1181 +1245 @@
         /* PIN command completed, all is good */
         return SC_SUCCESS;
-#else
-        return SC_ERROR_NOT_SUPPORTED;
-#endif /* PINPAD_ENABLED */
 }
 #endif   /* HAVE_PCSC */

trunk/src/libopensc/sc.c

@@ -23 +23 @@
 #endif
 
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
 #include <openssl/crypto.h>     /* for OPENSSL_cleanse */
 #endif
@@ -718 +718 @@
 void sc_mem_clear(void *ptr, size_t len)
 {
-#ifdef HAVE_OPENSSL
+#ifdef ENABLE_OPENSSL
         OPENSSL_cleanse(ptr, len);
 #else

trunk/src/libopensc/ui.c

@@ -21 +21 @@
 #include <locale.h>
 #endif
+#include <compat_getpass.h>
 #include <ltdl.h>
 
@@ -222 +223 @@
         }
 
-#ifdef HAVE_SETLOCALE
+#if defined(HAVE_SETLOCALE) && !defined(_WIN32)
         setlocale(LC_MESSAGES, language);
 #else
@@ -258 +259 @@
         }
 
-#ifdef HAVE_SETLOCALE
+#if defined(HAVE_SETLOCALE) && !defined(_WIN32)
         setlocale(LC_MESSAGES, language);
 #else

trunk/src/openssh

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

trunk/src/openssh/Makefile.am

@@ -3 +3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = README ask-for-pin.diff
-EXTRA_DIST = README ask-for-pin.diff
+dist_noinst_DATA = README ask-for-pin.diff

trunk/src/pkcs11

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-archive
-acinclude.m4
-aclocal.m4
-autom4te.cache
-compile
-confdefs.h
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-conftest
-conftest.c
-depcomp
-install-sh
-libtool
-libtool.m4
-ltmain.sh
-missing
-mkinstalldirs
-so_locations
-stamp-h*
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ -1 @@
-html
-man
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
+.deps
+.libs
+.#*#
+.*.bak
+.*.orig
+.*.rej
+.*~
+#*#
+*.bak
+*.d
+*.def
+*.dll
+*.exe
+*.la
+*.lib
+*.lo
+*.orig
+*.pdb
+*.rej
+*.u
+*.rc
+*.pc
+*~
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ -1 @@
-.deps
-.libs
-.#*#
-.*.bak
-.*.orig
-.*.rej
-.*~
-#*#
-*.bak
-*.d
-*.def
-*.dll
-*.exe
-*.la
-*.lib
-*.lo
-*.orig
-*.pdb
-*.rej
-*.u
-*~
+*.h
+*.in
 Makefile
-Makefile.in
-core
-gmon.out
-*.h

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-*.pc
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
 opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
+

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf