Permalink
Browse files

Imported opensc-0.11.8

Summary: Imported opensc-0.11.8
Keywords:

Imported opensc-0.11.8
into Git repository
  • Loading branch information...
1 parent 24010a6 commit 1de2358d056133c56c82d3b3fd305622452b3e22 @zedinosaur zedinosaur committed May 11, 2009
Showing with 5,662 additions and 3,832 deletions.
  1. +4 −3 Makefile.in
  2. +7 −1 NEWS
  3. +62 −51 aclocal.m4
  4. +14 −3 config.h.in
  5. +3,545 −2,923 configure
  6. +10 −2 configure.ac
  7. +3 −0 doc/Makefile.am
  8. +15 −14 doc/Makefile.in
  9. +156 −156 doc/html.out/api.html
  10. +47 −47 doc/html.out/tools.html
  11. +2 −2 doc/man.out/cardos-tool.1
  12. +2 −2 doc/man.out/cryptoflex-tool.1
  13. +2 −2 doc/man.out/netkey-tool.1
  14. +2 −2 doc/man.out/opensc-config.1
  15. +2 −2 doc/man.out/opensc-explorer.1
  16. +2 −2 doc/man.out/opensc-tool.1
  17. +2 −2 doc/man.out/pkcs11-tool.1
  18. +2 −2 doc/man.out/pkcs15-crypt.1
  19. +2 −2 doc/man.out/pkcs15-init.1
  20. +2 −2 doc/man.out/pkcs15-profile.5
  21. +2 −2 doc/man.out/pkcs15-tool.1
  22. +2 −2 doc/man.out/sc_app_info_t.3
  23. +2 −2 doc/man.out/sc_append_record.3
  24. +2 −2 doc/man.out/sc_asn1_decode.3
  25. +2 −2 doc/man.out/sc_asn1_encode.3
  26. +2 −2 doc/man.out/sc_asn1_entry.3
  27. +2 −2 doc/man.out/sc_asn1_find_tag.3
  28. +2 −2 doc/man.out/sc_asn1_print_tags.3
  29. +2 −2 doc/man.out/sc_asn1_put_tag.3
  30. +2 −2 doc/man.out/sc_asn1_read_tag.3
  31. +2 −2 doc/man.out/sc_asn1_skip_tag.3
  32. +2 −2 doc/man.out/sc_asn1_verify_tag.3
  33. +2 −2 doc/man.out/sc_base64_decode.3
  34. +2 −2 doc/man.out/sc_base64_encode.3
  35. +2 −2 doc/man.out/sc_card_ctl.3
  36. +2 −2 doc/man.out/sc_card_t.3
  37. +2 −2 doc/man.out/sc_card_valid.3
  38. +2 −2 doc/man.out/sc_check_sw.3
  39. +2 −2 doc/man.out/sc_connect_card.3
  40. +2 −2 doc/man.out/sc_copy_asn1_entry.3
  41. +2 −2 doc/man.out/sc_create_file.3
  42. +2 −2 doc/man.out/sc_delete_file.3
  43. +2 −2 doc/man.out/sc_delete_record.3
  44. +2 −2 doc/man.out/sc_der_clear.3
  45. +2 −2 doc/man.out/sc_der_copy.3
  46. +2 −2 doc/man.out/sc_detect_card_presence.3
  47. +2 −2 doc/man.out/sc_disconnect_card.3
  48. +2 −2 doc/man.out/sc_enum_apps.3
  49. +2 −2 doc/man.out/sc_establish_context.3
  50. +2 −2 doc/man.out/sc_file_dup.3
  51. +2 −2 doc/man.out/sc_file_free.3
  52. +2 −2 doc/man.out/sc_file_new.3
  53. +2 −2 doc/man.out/sc_file_t.3
  54. +2 −2 doc/man.out/sc_find_app_by_aid.3
  55. +2 −2 doc/man.out/sc_find_pkcs15_app.3
  56. +2 −2 doc/man.out/sc_format_apdu.3
  57. +2 −2 doc/man.out/sc_format_asn1_entry.3
  58. +2 −2 doc/man.out/sc_free_apps.3
  59. +2 −2 doc/man.out/sc_get_cache_dir.3
  60. +2 −2 doc/man.out/sc_get_challenge.3
  61. +2 −2 doc/man.out/sc_get_data.3
  62. +2 −2 doc/man.out/sc_list_files.3
  63. +2 −2 doc/man.out/sc_lock.3
  64. +2 −2 doc/man.out/sc_make_cache_dir.3
  65. +2 −2 doc/man.out/sc_put_data.3
  66. +2 −2 doc/man.out/sc_read_binary.3
  67. +2 −2 doc/man.out/sc_read_record.3
  68. +2 −2 doc/man.out/sc_release_context.3
  69. +2 −2 doc/man.out/sc_select_file.3
  70. +2 −2 doc/man.out/sc_set_card_driver.3
  71. +2 −2 doc/man.out/sc_strerror.3
  72. +2 −2 doc/man.out/sc_transmit_apdu.3
  73. +2 −2 doc/man.out/sc_unlock.3
  74. +2 −2 doc/man.out/sc_update_binary.3
  75. +2 −2 doc/man.out/sc_update_dir.3
  76. +2 −2 doc/man.out/sc_update_record.3
  77. +2 −2 doc/man.out/sc_wait_for_event.3
  78. +2 −2 doc/man.out/sc_write_binary.3
  79. +2 −2 doc/man.out/sc_write_record.3
  80. +255 −10 doc/nonpersistent/ChangeLog
  81. +4 −3 doc/nonpersistent/Makefile.in
  82. +4 −5 doc/nonpersistent/wiki.out/AladdinEtokenPro.html
  83. +1 −1 doc/nonpersistent/wiki.out/Cyberflex.html
  84. +28 −0 doc/nonpersistent/wiki.out/FTCOSPK01C.html
  85. +12 −5 doc/nonpersistent/wiki.out/GermanApi.html
  86. +46 −0 doc/nonpersistent/wiki.out/GermanEGK.html
  87. +11 −44 doc/nonpersistent/wiki.out/GermanEid.html
  88. +7 −6 doc/nonpersistent/wiki.out/PinpadReaders.html
  89. +1 −1 doc/nonpersistent/wiki.out/StarSign.html
  90. +14 −17 doc/nonpersistent/wiki.out/TCOS.html
  91. +1 −1 doc/nonpersistent/wiki.out/e-gate.html
  92. +2 −1 doc/nonpersistent/wiki.out/index.html
  93. +4 −3 etc/Makefile.in
  94. +657 −125 ltmain.sh
  95. +88 −40 m4/libtool.m4
  96. +1 −1 m4/ltoptions.m4
  97. +10 −10 m4/ltsugar.m4
  98. +5 −5 m4/ltversion.m4
  99. +5 −4 src/Makefile.in
  100. +5 −4 src/common/Makefile.in
  101. +5 −4 src/include/Makefile.in
  102. +4 −3 src/include/opensc/Makefile.in
  103. +1 −1 src/include/winconfig.h
  104. +5 −4 src/libopensc/Makefile.in
  105. +106 −7 src/libopensc/card-entersafe.c
  106. +14 −0 src/libopensc/card-muscle.c
  107. +0 −2 src/libopensc/cardctl.h
  108. +2 −0 src/libopensc/cards.h
  109. +31 −12 src/libopensc/internal-winscard.h
  110. +0 −2 src/libopensc/internal.h
  111. +1 −0 src/libopensc/libopensc.exports
  112. +98 −19 src/libopensc/muscle.c
  113. +1 −1 src/libopensc/muscle.h
  114. +1 −0 src/libopensc/opensc.h
  115. +1 −1 src/libopensc/reader-ctapi.c
  116. +107 −71 src/libopensc/reader-pcsc.c
  117. +2 −2 src/libopensc/versioninfo.rc
  118. +4 −3 src/openssh/Makefile.in
  119. +5 −4 src/pkcs11/Makefile.in
  120. +2 −3 src/pkcs11/misc.c
  121. +2 −2 src/pkcs11/versioninfo.rc
  122. +5 −4 src/pkcs15init/Makefile.in
  123. +5 −10 src/pkcs15init/entersafe.profile
  124. +1 −1 src/pkcs15init/gpk.profile
  125. +34 −12 src/pkcs15init/pkcs15-entersafe.c
  126. +18 −3 src/pkcs15init/pkcs15-lib.c
  127. +2 −2 src/pkcs15init/versioninfo.rc
  128. +5 −4 src/scconf/Makefile.in
  129. +2 −2 src/scconf/versioninfo.rc
  130. +5 −4 src/signer/Makefile.in
  131. +5 −4 src/signer/npinclude/Makefile.in
  132. +5 −4 src/tests/Makefile.in
  133. +4 −3 src/tests/regression/Makefile.in
  134. +2 −2 src/tests/versioninfo.rc
  135. +5 −4 src/tools/Makefile.in
  136. +1 −0 src/tools/cardos-tool.c
  137. +3 −3 src/tools/pkcs11-tool.c
  138. +2 −2 src/tools/versioninfo.rc
  139. +4 −3 win32/Makefile.in
View
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -248,6 +248,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
xslstylesheetsdir = @xslstylesheetsdir@
@@ -335,7 +336,7 @@ clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
- -rm -f libtool
+ -rm -f libtool config.lt
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@@ -429,7 +430,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
View
8 NEWS
@@ -6,6 +6,12 @@ http://www.opensc-project.org/opensc/wiki/WhatsNew
Also see the svn changelog using svn command
or doc/nonpersistent/ChangeLog.
+New in 0.11.8; 2009-05-07; Andreas Jellinghaus
+* Fix security problem in pkcs11-tool gen_keypair (PublicExponent 1)
+* fix compiling without openssl.
+* updated and improve entersafe driver. FTCOS/PK-01C cards are supported
+ now, compatible with cards writen by Feitian's software on windows.
+
New in 0.11.7; 2009-02-26; Andreas Jellinghaus
* hide_empty_slots now on by default? small logic change?
* pinpad supported fixed for Mac OS X.
@@ -18,7 +24,7 @@ New in 0.11.7; 2009-02-26; Andreas Jellinghaus
New in 0.11.6; 2008-08-27; Andreas Jellinghaus
* Improved security fix: don't match for "OpenSC" in the card label.
-* New support for Feitian ePass3000 bei Weitao Sun.
+* New support for Feitian ePass3000 by Weitao Sun.
* GemSafeV1 improved to handle key_ref other than 3 by Douglas E. Engert
New in 0.11.5; 2008-07-31; Andreas Jellinghaus
View
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -177,7 +177,7 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -192,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
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.10.1], [],
+m4_if([$1], [1.10.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -206,12 +206,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -461,57 +461,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 3
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -805,13 +816,13 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -828,7 +839,7 @@ AC_DEFUN([_AM_SET_OPTION],
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
View
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
/* Default PC/SC provider */
#undef DEFAULT_PCSC_PROVIDER
@@ -187,9 +190,17 @@
/* Version number of package */
#undef VERSION
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+# undef WORDS_BIGENDIAN
+# endif
+#endif
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Oops, something went wrong.

0 comments on commit 1de2358

Please sign in to comment.