always log APDUs with SC_LOG_DEBUG_NORMAL
This commit is contained in:
parent
a899a46b09
commit
5474370b17
|
@ -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);
|
r = sc_apdu_get_octets(card->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
|
||||||
if (r == SC_SUCCESS)
|
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)
|
if(sbuf)
|
||||||
free(sbuf);
|
free(sbuf);
|
||||||
|
|
||||||
|
|
|
@ -247,13 +247,12 @@ int sc_apdu_set_resp(sc_context_t *ctx, sc_apdu_t *apdu, const u8 *buf,
|
||||||
/**
|
/**
|
||||||
* Logs APDU
|
* Logs APDU
|
||||||
* @param ctx sc_context_t object
|
* @param ctx sc_context_t object
|
||||||
* @param level log if ctx->debug >= level
|
|
||||||
* @param buf buffer with the APDU data
|
* @param buf buffer with the APDU data
|
||||||
* @param len length of the APDU
|
* @param len length of the APDU
|
||||||
* @param is_outgoing != 0 if the data is send to the card
|
* @param is_outgoing != 0 if the data is send to the card
|
||||||
*/
|
*/
|
||||||
#define sc_apdu_log(ctx, level, data, len, is_outgoing) \
|
#define sc_apdu_log(ctx, data, len, is_outgoing) \
|
||||||
sc_debug_hex(ctx, level, is_outgoing != 0 ? "Outgoing APDU" : "Incoming APDU", data, len)
|
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_pcsc_driver(void);
|
||||||
extern struct sc_reader_driver *sc_get_ctapi_driver(void);
|
extern struct sc_reader_driver *sc_get_ctapi_driver(void);
|
||||||
|
|
|
@ -265,7 +265,7 @@ static int cryptotokenkit_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
|
||||||
|
|
||||||
if (reader->name)
|
if (reader->name)
|
||||||
sc_log(reader->ctx, "reader '%s'", 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:
|
[priv->tksmartcard transmitRequest:
|
||||||
[NSData dataWithBytes: sbuf length: ssize]
|
[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)
|
if (r != SC_SUCCESS)
|
||||||
goto err;
|
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);
|
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
|
||||||
|
|
||||||
err:
|
err:
|
||||||
|
|
|
@ -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);
|
r = sc_apdu_get_octets(reader->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
|
||||||
if (r != SC_SUCCESS)
|
if (r != SC_SUCCESS)
|
||||||
goto out;
|
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,
|
r = ctapi_internal_transmit(reader, sbuf, ssize,
|
||||||
rbuf, &rsize, apdu->control);
|
rbuf, &rsize, apdu->control);
|
||||||
if (r < 0) {
|
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");
|
sc_log(reader->ctx, "unable to transmit");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, rbuf, rsize, 0);
|
sc_apdu_log(reader->ctx, rbuf, rsize, 0);
|
||||||
/* set response */
|
/* set response */
|
||||||
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
|
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -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);
|
r = sc_apdu_get_octets(reader->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
|
||||||
if (r != SC_SUCCESS)
|
if (r != SC_SUCCESS)
|
||||||
goto out;
|
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,
|
r = openct_reader_internal_transmit(reader, sbuf, ssize,
|
||||||
rbuf, &rsize, apdu->control);
|
rbuf, &rsize, apdu->control);
|
||||||
if (r < 0) {
|
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");
|
sc_log(reader->ctx, "unable to transmit");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, rbuf, rsize, 0);
|
sc_apdu_log(reader->ctx, rbuf, rsize, 0);
|
||||||
/* set response */
|
/* set response */
|
||||||
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
|
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -282,7 +282,7 @@ static int pcsc_transmit(sc_reader_t *reader, sc_apdu_t *apdu)
|
||||||
goto out;
|
goto out;
|
||||||
if (reader->name)
|
if (reader->name)
|
||||||
sc_log(reader->ctx, "reader '%s'", 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,
|
r = pcsc_internal_transmit(reader, sbuf, ssize,
|
||||||
rbuf, &rsize, apdu->control);
|
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");
|
sc_log(reader->ctx, "unable to transmit");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
sc_apdu_log(reader->ctx, SC_LOG_DEBUG_NORMAL, rbuf, rsize, 0);
|
sc_apdu_log(reader->ctx, rbuf, rsize, 0);
|
||||||
/* set response */
|
/* set response */
|
||||||
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
|
r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue