Imported Upstream version 0.12.0+svn5227

Makefile.in

@@ -39,9 +39,8 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
 	$(dist_noinst_DATA) $(dist_noinst_SCRIPTS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/configure COPYING \
-	ChangeLog NEWS config.guess config.sub depcomp install-sh \
-	ltmain.sh missing
+	$(srcdir)/config.h.in $(top_srcdir)/configure COPYING NEWS \
+	config.guess config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \

aclocal.m4

@@ -156,7 +156,7 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])dnl
+_PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
      	AC_MSG_RESULT([no])
@@ -167,7 +167,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
         ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

config.h.in

@@ -57,6 +57,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the <ltdl.h> header file. */
+#undef HAVE_LTDL_H
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for opensc 0.12.0.
+# Generated by GNU Autoconf 2.67 for opensc 0.12.1-svn.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='opensc'
 PACKAGE_TARNAME='opensc'
-PACKAGE_VERSION='0.12.0'
-PACKAGE_STRING='opensc 0.12.0'
+PACKAGE_VERSION='0.12.1-svn'
+PACKAGE_STRING='opensc 0.12.1-svn'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1506,7 +1506,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opensc 0.12.0 to adapt to many kinds of systems.
+\`configure' configures opensc 0.12.1-svn to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1576,7 +1576,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opensc 0.12.0:";;
+     short | recursive ) echo "Configuration of opensc 0.12.1-svn:";;
    esac
   cat <<\_ACEOF
 
@@ -1718,7 +1718,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opensc configure 0.12.0
+opensc configure 0.12.1-svn
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2315,7 +2315,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opensc $as_me 0.12.0, which was
+It was created by opensc $as_me 0.12.1-svn, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3133,7 +3133,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='opensc'
- VERSION='0.12.0'
+ VERSION='0.12.1-svn'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3176,7 +3176,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 OPENSC_VERSION_MAJOR="0"
 OPENSC_VERSION_MINOR="12"
-OPENSC_VERSION_FIX="0"
+OPENSC_VERSION_FIX="1"
 
 # LT Version numbers, remember to change them just *before* a release.
 #   (Code changed:                      REVISION++)
@@ -12864,22 +12864,24 @@ fi
 $as_echo "$ac_cv_lib_ltdl_lt_dlopen" >&6; }
 if test "x$ac_cv_lib_ltdl_lt_dlopen" = x""yes; then :
   LTLIB_LIBS="-lltdl"
-else
-  as_fn_error $? "ltdl not found, please install libltdl and/or libtool" "$LINENO" 5
 
 fi
 
 fi
+
 saved_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
-ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
+for ac_header in ltdl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
 if test "x$ac_cv_header_ltdl_h" = x""yes; then :
-
-else
-  as_fn_error $? "ltdl.h not found, please install libltdl and/or libtool" "$LINENO" 5
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LTDL_H 1
+_ACEOF
 
 fi
 
+done
 
 CFLAGS="${saved_CFLAGS}"
 
@@ -14256,7 +14258,7 @@ if test "$GCC" = "yes"; then
 	CFLAGS="-fno-strict-aliasing ${CFLAGS}"
 fi
 
-ac_config_files="$ac_config_files Makefile doc/Makefile etc/Makefile src/Makefile src/common/Makefile src/libopensc/Makefile src/libopensc/libopensc.pc src/pkcs11/Makefile src/pkcs15init/Makefile src/scconf/Makefile src/tests/Makefile src/tests/regression/Makefile src/tools/Makefile src/cardmod/Makefile src/cardmod/cardmod.inf win32/Makefile win32/versioninfo.rc win32/winconfig.h"
+ac_config_files="$ac_config_files Makefile doc/Makefile etc/Makefile src/Makefile src/common/Makefile src/libopensc/Makefile src/libopensc/libopensc.pc src/pkcs11/Makefile src/pkcs15init/Makefile src/scconf/Makefile src/tests/Makefile src/tests/regression/Makefile src/tools/Makefile src/cardmod/Makefile src/cardmod/cardmod.inf win32/Makefile win32/versioninfo.rc win32/winconfig.h win32/OpenSC.iss"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14817,7 +14819,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opensc $as_me 0.12.0, which was
+This file was extended by opensc $as_me 0.12.1-svn, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14883,7 +14885,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-opensc config.status 0.12.0
+opensc config.status 0.12.1-svn
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -15361,6 +15363,7 @@ do
     "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
     "win32/versioninfo.rc") CONFIG_FILES="$CONFIG_FILES win32/versioninfo.rc" ;;
     "win32/winconfig.h") CONFIG_FILES="$CONFIG_FILES win32/winconfig.h" ;;
+    "win32/OpenSC.iss") CONFIG_FILES="$CONFIG_FILES win32/OpenSC.iss" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac

configure.ac

@@ -4,8 +4,8 @@ AC_PREREQ(2.60)
 
 define([PACKAGE_VERSION_MAJOR], [0])
 define([PACKAGE_VERSION_MINOR], [12])
-define([PACKAGE_VERSION_FIX], [0])
-define([PACKAGE_SUFFIX], [])
+define([PACKAGE_VERSION_FIX], [1])
+define([PACKAGE_SUFFIX], [-svn])
 
 AC_INIT([opensc],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX[]PACKAGE_SUFFIX])
 AC_CONFIG_AUX_DIR([.])
@@ -264,23 +264,20 @@ AC_CHECK_LIB(
 	]
 )
 
+dnl check for libltdl. If libltdl is not found, native dlopen/LoadLibrary is used
 AC_ARG_VAR([LTLIB_CFLAGS], [C compiler flags for libltdl])
 AC_ARG_VAR([LTLIB_LIBS], [linker flags for libltdl])
 if test -z "${LTLIB_LIBS}"; then
 	AC_CHECK_LIB(
 		[ltdl],
 		[lt_dlopen],
-		[LTLIB_LIBS="-lltdl"],
-		[AC_MSG_ERROR([ltdl not found, please install libltdl and/or libtool])]
+		[LTLIB_LIBS="-lltdl"]
 	)
 fi
+
 saved_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
-AC_CHECK_HEADER(
-	[ltdl.h],
-	,
-	[AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool])]
-)
+AC_CHECK_HEADERS([ltdl.h])
 CFLAGS="${saved_CFLAGS}"
 
 if test "${WIN32}" = "no"; then
@@ -600,6 +597,7 @@ AC_CONFIG_FILES([
 	win32/Makefile
 	win32/versioninfo.rc
 	win32/winconfig.h
+	win32/OpenSC.iss
 ])
 AC_OUTPUT
 

doc/tools/pkcs15-crypt.xml

@@ -123,6 +123,12 @@
 					If you specify '-' as PIN, it will be read from STDIN.</para></listitem>
 				</varlistentry>
 
+				<varlistentry>
+					<term><option>--aid</option> <varname>aid</varname></term>
+					<listitem><para>Specify in a hexadecimal form the AID of the on-card PKCS#15 
+                                        application to be binded to.</para></listitem>
+				</varlistentry>
+
 				<varlistentry>
 					<term><option>--verbose, -v</option></term>
 					<listitem><para>Causes <command>pkcs15-crypt</command> to be more

doc/tools/pkcs15-init.xml

@@ -292,7 +292,12 @@
 							(currently, the only supported name is <option>RSA</option>),
 							optionally followed by a slash and the length of the key in bits.
 							It is a good idea to specify the key ID along with this command,
-							using the <option>id</option> option.
+							using the <option>id</option> option, otherwise an intrinsic ID 
+                                                        will be calculated from the key material. Look the description of 
+                                                        the 'pkcs15-id-style' attribut in the 'pkcs15.profile' for the details
+                                                        about the algorithm used to calculate intrinsic ID.
+                                                        For the multi-application cards the target PKCS#15 application can be 
+                                                        specified by the hexadecimal AID value of the <option>aid</option> option.
 						</para>
 					</listitem>
 				</varlistentry>
@@ -308,7 +313,12 @@
 							file is assumed to contain the key in PEM format. Alternative
 							formats can be specified using <option>--format</option>.
 							It is a good idea to specify the key ID along with this command,
-							using the <option>--id</option> option.
+							using the <option>--id</option> option, otherwise an intrinsic ID
+                                                        will be calculated from the key material. Look the description of
+                                                        the 'pkcs15-id-style' attribut in the 'pkcs15.profile' for the details
+                                                        about the algorithm used to calculate intrinsic ID.
+                                                        For the multi-application cards the target PKCS#15 application can be 
+                                                        specified by the hexadecimal AID value of the <option>aid</option> option.
 						</para>
 					</listitem>
 				</varlistentry>
@@ -334,7 +344,13 @@
 							Tells <command>pkcs15-init</command> to store the certificate given
 							in <option>filename</option> on the card, creating a certificate
 							object with the ID specified via the <option>--id</option> option.
+                                                        Without supplied ID an intrisic ID will be calculated from the 
+                                                        certificate's public key. Look the description of the 'pkcs15-id-style' 
+                                                        attribut in the 'pkcs15.profile' for the details
+                                                        about the algorithm used to calculate intrinsic ID.
 							The file is assumed to contain the PEM encoded certificate.
+                                                        For the multi-application cards the target application can be specified
+                                                        by the hexadecimal AID value of the <option>aid</option> option.
 						</para>
 					</listitem>
 				</varlistentry>

doc/tools/pkcs15-tool.xml

@@ -43,6 +43,11 @@
 					operations may show stale results.</para></listitem>
 				</varlistentry>
 
+				<varlistentry>
+					<term><option>--list-applications</option></term>
+					<listitem><para>List the on-card PKCS#15 applications</para></listitem>
+				</varlistentry>
+
 				<varlistentry>
 					<term><option>--read-certificate</option> <varname>cert</varname>,
 					<option>-r</option> <varname>cert</varname></term>
@@ -141,6 +146,12 @@
 					operation. This is useful with the --change-pin operation.</para></listitem>
 				</varlistentry>
 
+                                <varlistentry>
+                                        <term><option>--aid</option> <varname>aid</varname></term>
+                                        <listitem><para>Specify in a hexadecimal form the AID of the on-card PKCS#15 
+                                        application to be binded to.</para></listitem>
+                                </varlistentry>
+
 				<varlistentry>
 					<term><option>--reader</option> <varname>num</varname></term>
 					<listitem><para>Forces <command>pkcs15-tool</command> to use reader