reader-pcsc: removed cardmod driver

- pcsc driver takes over all the functionality
- no dedicated reader driver config values for cardmod, use application
  specific blocks to define a different behavior for the pcsc reader if
  needed
- removes legacy code; requiring at least libpcsclite 1.6.5

Fixes OpenSC#892

configure.ac

@@ -672,7 +672,7 @@ if test "${enable_pcsc}" = "yes"; then
  if test "${WIN32}" != "yes"; then
  PKG_CHECK_EXISTS(
  [libpcsclite],
- [PKG_CHECK_MODULES([PCSC], [libpcsclite])]
+ [PKG_CHECK_MODULES([PCSC], [libpcsclite >= 1.6.5])]
  )
  if test -z "${PCSC_CFLAGS}"; then
  case "${host}" in

etc/opensc.conf.in

@@ -754,7 +754,7 @@ app onepin-opensc-pkcs11 {
  }
 }
 
-# Used by OpenSC.tokend on Mac OS X only.
+# Used by OpenSC.tokend on Mac OS X only
 app tokend {
  # The file to which debug log will be written
  # Default: /tmp/opensc-tokend.log
@@ -770,14 +770,6 @@ app tokend {
  }
 }
 
-# XXX: remove cardmod pseudodriver
+# Used by OpenSC minidriver on Windows only
 app cardmod {
- # cardmod app name use special pcsc reader subset
- # fix options for this reader driver here.
-
- reader_driver cardmod {
- # Enable pinpad if detected (PC/SC v2.0.2 Part 10)
- # Default: true
- # enable_pinpad = false;
- }
 }

src/libopensc/ctx.c

@@ -41,21 +41,21 @@
 
 int _sc_add_reader(sc_context_t *ctx, sc_reader_t *reader)
 {
- assert(reader != NULL);
+ if (!reader)
+ return SC_ERROR_INVALID_ARGUMENTS;
  reader->ctx = ctx;
  list_append(&ctx->readers, reader);
  return SC_SUCCESS;
 }
 
 int _sc_delete_reader(sc_context_t *ctx, sc_reader_t *reader)
 {
- assert(reader != NULL);
+ if (!reader)
+ return SC_ERROR_INVALID_ARGUMENTS;
  if (reader->ops->release)
  reader->ops->release(reader);
- if (reader->name)
- free(reader->name);
- if (reader->vendor)
- free(reader->vendor);
+ free(reader->name);
+ free(reader->vendor);
  list_delete(&ctx->readers, reader);
  free(reader);
  return SC_SUCCESS;
@@ -773,11 +773,6 @@ int sc_context_create(sc_context_t **ctx_out, const sc_context_param_t *parm)
 
 #ifdef ENABLE_PCSC
  ctx->reader_driver = sc_get_pcsc_driver();
-/* XXX: remove cardmod pseudoreader driver */
-#ifdef ENABLE_MINIDRIVER
- if(strcmp(ctx->app_name, "cardmod") == 0)
- ctx->reader_driver = sc_get_cardmod_driver();
-#endif
 #elif defined(ENABLE_CTAPI)
  ctx->reader_driver = sc_get_ctapi_driver();
 #elif defined(ENABLE_OPENCT)

src/libopensc/internal.h

@@ -245,7 +245,6 @@ int sc_apdu_set_resp(sc_context_t *ctx, sc_apdu_t *apdu, const u8 *buf,
 extern struct sc_reader_driver *sc_get_pcsc_driver(void);
 extern struct sc_reader_driver *sc_get_ctapi_driver(void);
 extern struct sc_reader_driver *sc_get_openct_driver(void);
-extern struct sc_reader_driver *sc_get_cardmod_driver(void);
 
 #ifdef __cplusplus
 }