Add some debug info

This commit is contained in:
Zhi Guan
2018-03-13 12:26:17 +08:00
parent 877b1d3d9c
commit 4b825edf3c
7 changed files with 49 additions and 6 deletions

View File

@@ -400,6 +400,10 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return 0;
}
dctx->ec_scheme = p1;
# ifdef SM2_DEBUG
fprintf(stderr, "[SM2_DEBUG] EVP_PKEY_CTX_set_ec_scheme(%s)\n",
p1 == NID_secg_scheme ? "NID_secg_scheme" : "NID_sm_scheme");
# endif
return 1;
case EVP_PKEY_CTRL_SIGNER_ID:
@@ -431,6 +435,9 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
}
}
memcpy(dctx->signer_zid, zid, zidlen);
# ifdef SM2_DEBUG
fprintf(stderr, "[SM2_DEBUG] EVP_PKEY_CTX_set_signer_id(\"%s\")\n", id);
# endif
}
}
return 1;
@@ -459,6 +466,10 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return 0;
}
dctx->signer_zid = zid;
# ifdef SM2_DEBUG
fprintf(stderr, "[SM2_DEBUG] EVP_PKEY_CTX_get_signer_zid() "
"init zid with default id\n");
# endif
}
*(const unsigned char **)p2 = dctx->signer_zid;
return 1;

View File

@@ -155,6 +155,10 @@ int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
const unsigned char *zid;
if (1 == EVP_PKEY_CTX_get_signer_zid(ctx->pctx, &zid)) {
ctx->update(ctx, zid, 32);
# ifdef SM2_DEBUG
fprintf(stderr, " %s() first update with SM2 ZID\n",
__FUNCTION__);
# endif
}
EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_UPDATED);
}

View File

@@ -58,8 +58,9 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) {
if (EC_GROUP_get_curve_name(EC_KEY_get0_group(
EVP_PKEY_get0_EC_KEY(pkey))) == NID_sm2p256v1) {
# ifdef CIPHER_DEBUG
fprintf(stderr, "%s() set sm scheme\n", __FUNCTION__);
# ifdef SM2_DEBUG
fprintf(stderr, "[SM2_DEBUG] %s->EVP_PKEY_CTX_set_ec_scheme\n",
__FUNCTION__);
# endif
if (EVP_PKEY_CTX_set_ec_scheme(pkctx, NID_sm_scheme) <= 0) {
goto err;

View File

@@ -55,8 +55,9 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) {
if (EC_GROUP_get_curve_name(EC_KEY_get0_group(
EVP_PKEY_get0_EC_KEY(pkey))) == NID_sm2p256v1) {
# ifdef CIPHER_DEBUG
fprintf(stderr, "%s() set sm scheme\n", __FUNCTION__);
# ifdef SM2_DEBUG
fprintf(stderr, "[SM2_DEBUG] %s->EVP_PKEY_CTX_set_ec_scheme\n",
__FUNCTION__);
# endif
if (EVP_PKEY_CTX_set_ec_scheme(pkctx, NID_sm_scheme) <= 0) {
goto err;