giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

always log APDUs with SC_LOG_DEBUG_NORMAL

This commit is contained in:
Frank Morgner 2018-11-23 22:41:18 +01:00
parent a899a46b09
commit 5474370b17
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libopensc/card-entersafe.c
View File

@ -365,7 +365,7 @@ static int entersafe_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu,
r = sc_apdu_get_octets(card->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
if (r == SC_SUCCESS)
sc_apdu_log(card->ctx, SC_LOG_DEBUG_VERBOSE, sbuf, ssize, 1);
sc_apdu_log(card->ctx, sbuf, ssize, 1);
if(sbuf)
free(sbuf);

5
src/libopensc/internal.h
View File

@ -247,13 +247,12 @@ int sc_apdu_set_resp(sc_context_t *ctx, sc_apdu_t *apdu, const u8 *buf,
/**
* Logs APDU
* @param ctx sc_context_t object
* @param level log if ctx->debug >= level
* @param buf buffer with the APDU data
* @param len length of the APDU
* @param is_outgoing != 0 if the data is send to the card
*/
#define sc_apdu_log(ctx, level, data, len, is_outgoing) \
sc_debug_hex(ctx, level, is_outgoing != 0 ? "Outgoing APDU" : "Incoming APDU", data, len)
#define sc_apdu_log(ctx, data, len, is_outgoing) \
sc_debug_hex(ctx, SC_LOG_DEBUG_NORMAL, is_outgoing != 0 ? "Outgoing APDU" : "Incoming APDU", data, len)
extern struct sc_reader_driver *sc_get_pcsc_driver(void);
extern struct sc_reader_driver *sc_get_ctapi_driver(void);

4
src/libopensc/reader-cryptotokenkit.m
View File

@ -265,7 +265,7 @@ static int cryptotokenkit_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
if (reader->name)
sc_log(reader->ctx, "reader '%s'", reader->name);
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, sbuf, ssize, 1);
sc_apdu_log(reader->ctx, sbuf, ssize, 1);
[priv->tksmartcard transmitRequest:
[NSData dataWithBytes: sbuf length: ssize]
@ -288,7 +288,7 @@ static int cryptotokenkit_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
if (r != SC_SUCCESS)
goto err;
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, rbuf, rsize, 0);
sc_apdu_log(reader->ctx, rbuf, rsize, 0);
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
err:

4
src/libopensc/reader-ctapi.c
View File

@ -199,7 +199,7 @@ static int ctapi_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
r = sc_apdu_get_octets(reader->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
if (r != SC_SUCCESS)
goto out;
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, sbuf, ssize, 1);
sc_apdu_log(reader->ctx, sbuf, ssize, 1);
r = ctapi_internal_transmit(reader, sbuf, ssize,
rbuf, &rsize, apdu->control);
if (r < 0) {
@ -207,7 +207,7 @@ static int ctapi_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
sc_log(reader->ctx, "unable to transmit");
goto out;
}
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, rbuf, rsize, 0);
sc_apdu_log(reader->ctx, rbuf, rsize, 0);
/* set response */
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
out:

4
src/libopensc/reader-openct.c
View File

@ -323,7 +323,7 @@ static int openct_reader_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
r = sc_apdu_get_octets(reader->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
if (r != SC_SUCCESS)
goto out;
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, sbuf, ssize, 1);
sc_apdu_log(reader->ctx, sbuf, ssize, 1);
r = openct_reader_internal_transmit(reader, sbuf, ssize,
rbuf, &rsize, apdu->control);
if (r < 0) {
@ -331,7 +331,7 @@ static int openct_reader_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
sc_log(reader->ctx, "unable to transmit");
goto out;
}
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, rbuf, rsize, 0);
sc_apdu_log(reader->ctx, rbuf, rsize, 0);
/* set response */
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
out:

4
src/libopensc/reader-pcsc.c
View File

@ -282,7 +282,7 @@ static int pcsc_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
goto out;
if (reader->name)
sc_log(reader->ctx, "reader '%s'", reader->name);
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, sbuf, ssize, 1);
sc_apdu_log(reader->ctx, sbuf, ssize, 1);
r = pcsc_internal_transmit(reader, sbuf, ssize,
rbuf, &rsize, apdu->control);
@ -291,7 +291,7 @@ static int pcsc_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
sc_log(reader->ctx, "unable to transmit");
goto out;
}
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, rbuf, rsize, 0);
sc_apdu_log(reader->ctx, rbuf, rsize, 0);
/* set response */
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);