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

respect SM debug level

This commit is contained in:
Frank Morgner 2018-11-23 08:31:11 +01:00
parent e3dda8894e
commit d4f1a26215
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sm/sm-common.c
View File

@ -278,7 +278,7 @@ sm_decrypt_des_cbc3(struct sc_context *ctx, unsigned char *key,
DES_cblock icv={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
size_t st;
LOG_FUNC_CALLED(ctx);
SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_SM);
if (!out || !out_len)
LOG_TEST_RET(ctx, SC_ERROR_INVALID_ARGUMENTS, "SM decrypt_des_cbc3: invalid input arguments");
@ -299,7 +299,7 @@ sm_decrypt_des_cbc3(struct sc_context *ctx, unsigned char *key,
DES_3cbc_encrypt((DES_cblock *)(data + st),
(DES_cblock *)(*out + st), 8, &ks, &ks2, &icv, DES_DECRYPT);
LOG_FUNC_RETURN(ctx, SC_SUCCESS);
SC_FUNC_RETURN(ctx, SC_LOG_DEBUG_SM, SC_SUCCESS);
}
@ -314,7 +314,7 @@ sm_encrypt_des_cbc3(struct sc_context *ctx, unsigned char *key,
unsigned char *data;
size_t data_len, st;
LOG_FUNC_CALLED(ctx);
SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_SM);
sc_debug(ctx, SC_LOG_DEBUG_SM,
"SM encrypt_des_cbc3: not_force_pad:%i,in_len:%"SC_FORMAT_LEN_SIZE_T"u",
not_force_pad, in_len);
@ -358,7 +358,7 @@ sm_encrypt_des_cbc3(struct sc_context *ctx, unsigned char *key,
DES_3cbc_encrypt((DES_cblock *)(data + st), (DES_cblock *)(*out + st), 8, &ks, &ks2, &icv, DES_ENCRYPT);
free(data);
LOG_FUNC_RETURN(ctx, SC_SUCCESS);
SC_FUNC_RETURN(ctx, SC_LOG_DEBUG_SM, SC_SUCCESS);
}

18
src/sm/sm-eac.c
View File

@ -1381,7 +1381,7 @@ err:
if (r < 0)
EAC_CTX_clear_free(eac_ctx);
LOG_FUNC_RETURN(card->ctx, r);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM, r);
}
static int eac_mse_set_at_ta(sc_card_t *card, int protocol,
@ -1658,7 +1658,7 @@ err:
BUF_MEM_clear_free(signature);
if (card)
LOG_FUNC_RETURN(card->ctx, r);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM, r);
else
return r;
}
@ -1806,7 +1806,7 @@ err:
BUF_MEM_clear_free(picc_pubkey);
if (card)
LOG_FUNC_RETURN(card->ctx, r);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM, r);
else
return r;
}
@ -1891,7 +1891,7 @@ err:
BUF_MEM_clear_free(eph_pub_key);
if (card)
LOG_FUNC_RETURN(card->ctx, r);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM, r);
else
return r;
}
@ -2310,14 +2310,14 @@ err:
if (msesetat)
EAC_MSE_C_free(msesetat);
LOG_FUNC_RETURN(card->ctx, r);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM, r);
}
static int
eac_sm_post_transmit(sc_card_t *card, const struct iso_sm_ctx *ctx,
sc_apdu_t *sm_apdu)
{
LOG_FUNC_RETURN(card->ctx,
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM,
increment_ssc(ctx->priv_data));
}
@ -2329,7 +2329,7 @@ eac_sm_finish(sc_card_t *card, const struct iso_sm_ctx *ctx,
if (!card)
return SC_ERROR_INVALID_ARGUMENTS;
if(!ctx || !ctx->priv_data || !apdu)
LOG_FUNC_RETURN(card->ctx,
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM,
SC_ERROR_INVALID_ARGUMENTS);
eacsmctx = ctx->priv_data;
@ -2351,13 +2351,13 @@ eac_sm_finish(sc_card_t *card, const struct iso_sm_ctx *ctx,
if (!r) {
ssl_error(card->ctx);
LOG_FUNC_RETURN(card->ctx, SC_ERROR_INTERNAL);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM, SC_ERROR_INTERNAL);
}
}
}
}
LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_SM, SC_SUCCESS);
}
static void