From 5474370b17b7dd596b6fdb32d1efdaac013f8258 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Fri, 23 Nov 2018 22:41:18 +0100 Subject: [PATCH] always log APDUs with SC_LOG_DEBUG_NORMAL --- src/libopensc/card-entersafe.c | 2 +- src/libopensc/internal.h | 5 ++--- src/libopensc/reader-cryptotokenkit.m | 4 ++-- src/libopensc/reader-ctapi.c | 4 ++-- src/libopensc/reader-openct.c | 4 ++-- src/libopensc/reader-pcsc.c | 4 ++-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/libopensc/card-entersafe.c b/src/libopensc/card-entersafe.c index d85828d7..aa74c619 100644 --- a/src/libopensc/card-entersafe.c +++ b/src/libopensc/card-entersafe.c @@ -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); diff --git a/src/libopensc/internal.h b/src/libopensc/internal.h index dd079aac..622e8fde 100644 --- a/src/libopensc/internal.h +++ b/src/libopensc/internal.h @@ -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); diff --git a/src/libopensc/reader-cryptotokenkit.m b/src/libopensc/reader-cryptotokenkit.m index 449b9f86..7bee8278 100644 --- a/src/libopensc/reader-cryptotokenkit.m +++ b/src/libopensc/reader-cryptotokenkit.m @@ -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: diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c index db08465b..5ca8c04d 100644 --- a/src/libopensc/reader-ctapi.c +++ b/src/libopensc/reader-ctapi.c @@ -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: diff --git a/src/libopensc/reader-openct.c b/src/libopensc/reader-openct.c index 2697d270..c28e45f5 100644 --- a/src/libopensc/reader-openct.c +++ b/src/libopensc/reader-openct.c @@ -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: diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c index 817586fd..c1c2107e 100644 --- a/src/libopensc/reader-pcsc.c +++ b/src/libopensc/reader-pcsc.c @@ -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);