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

ccid-emulator: Update to use OpenSC 0.20.0 release

Browse Source
This commit is contained in:
David Ward
2020-04-11 10:09:27 -04:00
parent bc8b237c5a
commit adac6a883f
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ccid/Makefile.am
View File

@@ -9,6 +9,7 @@ EXTRA_DIST = docs patches
all-local: all-local:
cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) all cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) all
cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) all cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) all
cd src/OpenSC/src/ui && $(MAKE) $(AM_MAKEFLAGS) all
cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) all cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) all
cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) all cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) all
cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) all cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) all
@@ -16,6 +17,7 @@ all-local:
check-local: check-local:
cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) check cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) check
cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) check cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) check
cd src/OpenSC/src/ui && $(MAKE) $(AM_MAKEFLAGS) check
cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) check cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) check
cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) check cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) check
cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) check cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) check
@@ -23,6 +25,7 @@ check-local:
clean-local: clean-local:
cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) clean cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) clean
cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) clean cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) clean
cd src/OpenSC/src/ui && $(MAKE) $(AM_MAKEFLAGS) clean
cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) clean cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) clean
cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) clean cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) clean
cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) clean cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) clean

2
ccid/src/OpenSC

Submodule ccid/src/OpenSC updated: 0ebe09f5f3...45e29056cc

8
ccid/src/ccid.c
View File

@@ -19,7 +19,7 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <libopensc/log.h> #include <libopensc/log.h>
#include <libopensc/opensc.h> #include <libopensc/opensc.h>
#include <libopensc/reader-boxing.h> #include <libopensc/reader-tr03119.h>
#include <libopensc/sm.h> #include <libopensc/sm.h>
#include <sm/sm-eac.h> #include <sm/sm-eac.h>
#include <openssl/evp.h> #include <openssl/evp.h>
@@ -48,7 +48,7 @@ perform_pseudo_apdu_EstablishPACEChannel(sc_apdu_t *apdu)
memset(&pace_input, 0, sizeof pace_input); memset(&pace_input, 0, sizeof pace_input);
memset(&pace_output, 0, sizeof pace_output); memset(&pace_output, 0, sizeof pace_output);
r = boxing_buf_to_pace_input(reader->ctx, apdu->data, apdu->datalen, r = escape_buf_to_pace_input(reader->ctx, apdu->data, apdu->datalen,
&pace_input); &pace_input);
if (r < 0) if (r < 0)
goto err; goto err;
@@ -58,7 +58,7 @@ perform_pseudo_apdu_EstablishPACEChannel(sc_apdu_t *apdu)
if (r < 0) if (r < 0)
goto err; goto err;
r = boxing_pace_output_to_buf(reader->ctx, &pace_output, &apdu->resp, r = escape_pace_output_to_buf(reader->ctx, &pace_output, &apdu->resp,
&apdu->resplen); &apdu->resplen);
err: err:
@@ -81,7 +81,7 @@ perform_pseudo_apdu_GetReaderPACECapabilities(sc_apdu_t *apdu)
| SC_READER_CAP_PACE_EID | SC_READER_CAP_PACE_ESIGN; | SC_READER_CAP_PACE_EID | SC_READER_CAP_PACE_ESIGN;
return boxing_pace_capabilities_to_buf(reader->ctx, return escape_pace_capabilities_to_buf(reader->ctx,
sc_reader_t_capabilities, &apdu->resp, &apdu->resplen); sc_reader_t_capabilities, &apdu->resp, &apdu->resplen);
} }

2
ccid/src/scutil.c
View File

@@ -85,7 +85,7 @@ void _bin_log(sc_context_t *ctx, int type, const char *file, int line,
if (!f) { if (!f) {
char buf[1800]; char buf[1800];
if (data) if (data)
sc_hex_dump(ctx, SC_LOG_DEBUG_NORMAL, data, len, buf, sizeof buf); sc_hex_dump(data, len, buf, sizeof buf);
else else
buf[0] = 0; buf[0] = 0;
sc_do_log(ctx, type, file, line, func, sc_do_log(ctx, type, file, line, func,