Changeset 3455

Timestamp:

04/02/08 07:44:12 (8 months ago)

Author:

alonbl

Message:

Rename PC/SC library into PC/SC provider.
Sync symbols between configuration and source.
Put default provider in opensc.conf, opensc-tool.

Location:

trunk

Files:

• configure.ac (modified) (4 diffs)
• etc/Makefile.am (modified) (1 diff)
• etc/opensc.conf.in (modified) (1 diff)
• src/libopensc/reader-pcsc.c (modified) (3 diffs)

trunk/configure.ac

@@ -485 +485 @@
                 case "${host}" in
                         *-*-darwin*)
-                                with_pcsc_provider="${full_usrlibdir}/libpcsclite.so"
+                                DEFAULT_PCSC_PROVIDER="${full_usrlibdir}/libpcsclite.so"
                         ;;
                         *-mingw32*|*-winnt*|*-cygwin*)
-                                with_pcsc_provider="winscard.dll"
+                                DEFAULT_PCSC_PROVIDER="winscard.dll"
                         ;;
                         *)
-                                with_pcsc_provider="${full_usrlibdir}/libpcsclite.so"
+                                DEFAULT_PCSC_PROVIDER="${full_usrlibdir}/libpcsclite.so"
                         ;;
                 esac
-        fi
-        AC_DEFINE_UNQUOTED([PCSC_DEFAULT_LIBRARY_NAME], ["${with_pcsc_provider}"], [Default PC/SC library])
+        else
+                DEFAULT_PCSC_PROVIDER="${with_pcsc_provider}"
+        fi
+        AC_DEFINE_UNQUOTED([DEFAULT_PCSC_PROVIDER], ["${DEFAULT_PCSC_PROVIDER}"], [Default PC/SC provider])
 fi
 
@@ -534 +536 @@
         OPTIONAL_OPENCT_LIBS="${OPENCT_LIBS}"
 fi
-test "${enable_pcsc}" = "yes" && OPENSC_FEATURES="${OPENSC_FEATURES} pcsc"
+test "${enable_pcsc}" = "yes" && OPENSC_FEATURES="${OPENSC_FEATURES} pcsc(${DEFAULT_PCSC_PROVIDER})"
 test "${enable_nsplugin}" = "yes" && OPENSC_FEATURES="${OPENSC_FEATURES} nsplugin"
 
@@ -559 +561 @@
 AC_SUBST([OPENSC_LT_OLDEST])
 AC_SUBST([WIN_LIBPREFIX])
+AC_SUBST([DEFAULT_PCSC_PROVIDER])
 AC_SUBST([OPTIONAL_ZLIB_CFLAGS])
 AC_SUBST([OPTIONAL_ZLIB_LIBS])
@@ -638 +641 @@
 NSPlugin support:        ${enable_nsplugin}
 
-PC/SC default provider:  ${with_pcsc_provider}
+PC/SC default provider:  ${DEFAULT_PCSC_PROVIDER}
 pinentry:                ${with_pinentry}
 

trunk/etc/Makefile.am

@@ -8 +8 @@
 
 .in:
-        sed -e "s|@pkgdatadir[@]|$(pkgdatadir)|g" < $^ > $@
+        sed \
+                -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+                -e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
+                < $^ > $@
 
 sysconf_DATA=#required in order to create dir

trunk/etc/opensc.conf.in

@@ -89 +89 @@
                 # enable_pinpad = true;
                 #
-                # Use specific pcsc library.
-                # Default: system
-                # library_name = /usr/lib/libpcsclite.so
+                # Use specific pcsc provider.
+                # Default: @DEFAULT_PCSC_PROVIDER@
+                # provider_library = @DEFAULT_PCSC_PROVIDER@
         }
 

trunk/src/libopensc/reader-pcsc.c

@@ -68 +68 @@
         int connect_reset;
         int transaction_reset;
-        const char *library_name;
+        const char *provider_library;
         lt_dlhandle dlhandle;
         SCardEstablishContext_t SCardEstablishContext;
@@ -753 +753 @@
         gpriv->transaction_reset = 0;
         gpriv->enable_pinpad = 0;
-        gpriv->library_name = PCSC_DEFAULT_LIBRARY_NAME;
+        gpriv->provider_library = DEFAULT_PCSC_PROVIDER;
         
         conf_block = sc_get_conf_block(ctx, "reader_driver", "pcsc", 1);
@@ -765 +765 @@
                 gpriv->enable_pinpad =
                     scconf_get_bool(conf_block, "enable_pinpad", gpriv->enable_pinpad);
-                gpriv->library_name =
-                    scconf_get_str(conf_block, "library_name", gpriv->library_name);
-        }
-
-        gpriv->dlhandle = lt_dlopen(gpriv->library_name);
+                gpriv->provider_library =
+                    scconf_get_str(conf_block, "provider_library", gpriv->provider_library);
+        }
+
+        gpriv->dlhandle = lt_dlopen(gpriv->provider_library);
         if (gpriv->dlhandle == NULL) {
                 ret = SC_ERROR_CANNOT_LOAD_MODULE;