diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am index e995bc4..0c7a797 100644 --- a/ccid/src/Makefile.am +++ b/ccid/src/Makefile.am @@ -14,9 +14,9 @@ cats_test_CFLAGS = $(PCSC_CFLAGS) opensc: cp -r $(top_srcdir)/src/opensc-$(OPENSCVERSION) opensc + cd opensc && ./configure OPENSSL_LIBS="$(OPENSSL_LIBS)" OPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" $(OPENSC_CONFIGURE) libopensc.la: opensc - cd opensc && ./configure $(OPENSC_CONFIGURE) $(MAKE) -C opensc cp opensc/src/libopensc/.libs/libopensc.* . diff --git a/npa/src/Makefile.am b/npa/src/Makefile.am index 108961d..effd4cf 100644 --- a/npa/src/Makefile.am +++ b/npa/src/Makefile.am @@ -14,9 +14,10 @@ pace_tool_CFLAGS = $(OPENSSL_CFLAGS) opensc: cp -r $(top_srcdir)/src/opensc-$(OPENSCVERSION) opensc + cd opensc && ./configure OPENSSL_LIBS="$(OPENSSL_LIBS)" OPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" $(OPENSC_CONFIGURE) +.PHONY:libopensc.la libopensc.la: opensc - cd opensc && ./configure $(OPENSC_CONFIGURE) $(MAKE) -C opensc cp opensc/src/libopensc/.libs/libopensc.* . diff --git a/npa/src/pace.c b/npa/src/pace.c index 2ae0f9b..cae836f 100644 --- a/npa/src/pace.c +++ b/npa/src/pace.c @@ -195,17 +195,12 @@ int get_ef_card_access(sc_card_t *card, goto err; } - memset(&path, 0, sizeof path); + memcpy(&path, sc_get_mf_path(), sizeof path); r = sc_append_file_id(&path, FID_EF_CARDACCESS); if (r < 0) { sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not create path object."); goto err; } - r = sc_concatenate_path(&path, sc_get_mf_path(), &path); - if (r < 0) { - sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not create path object."); - goto err; - } r = sc_select_file(card, &path, &file); if (r < 0) {