VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

- fixed memory corruption when getting ef.cardaccess

Browse Source 
- minor changes in build process with libopensc


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@391 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2011-01-16 23:34:08 +00:00
parent 21bf0cda9d
commit 90c2dc4cce
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ccid/src/Makefile.am
View File

@@ -14,9 +14,9 @@ cats_test_CFLAGS = $(PCSC_CFLAGS)
opensc: opensc:
cp -r $(top_srcdir)/src/opensc-$(OPENSCVERSION) 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 libopensc.la: opensc
cd opensc && ./configure $(OPENSC_CONFIGURE)
$(MAKE) -C opensc $(MAKE) -C opensc
cp opensc/src/libopensc/.libs/libopensc.* . cp opensc/src/libopensc/.libs/libopensc.* .

3
npa/src/Makefile.am
View File

@@ -14,9 +14,10 @@ pace_tool_CFLAGS = $(OPENSSL_CFLAGS)
opensc: opensc:
cp -r $(top_srcdir)/src/opensc-$(OPENSCVERSION) 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 libopensc.la: opensc
cd opensc && ./configure $(OPENSC_CONFIGURE)
$(MAKE) -C opensc $(MAKE) -C opensc
cp opensc/src/libopensc/.libs/libopensc.* . cp opensc/src/libopensc/.libs/libopensc.* .

7
npa/src/pace.c
View File

@@ -195,17 +195,12 @@ int get_ef_card_access(sc_card_t *card,
goto err; goto err;
} }
memset(&path, 0, sizeof path); memcpy(&path, sc_get_mf_path(), sizeof path);
r = sc_append_file_id(&path, FID_EF_CARDACCESS); r = sc_append_file_id(&path, FID_EF_CARDACCESS);
if (r < 0) { if (r < 0) {
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not create path object."); sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not create path object.");
goto err; 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); r = sc_select_file(card, &path, &file);
if (r < 0) { if (r < 0) {