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

[merge] new output for pMechas 

Signed-off-by: Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com>
This commit is contained in:
Vesa Jääskeläinen 2021-08-03 19:09:19 +03:00 committed by Jakub Jelen
parent 6431f69dcc
commit 1991fa24ae
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/pkcs11/pkcs11-spy.c
View File

@ -403,8 +403,10 @@ spy_attribute_list_out(const char *name, CK_ATTRIBUTE_PTR pTemplate,
static void static void
spy_dump_mechanism_in(const char *name, CK_MECHANISM_PTR pMechanism) spy_dump_mechanism_in(const char *name, CK_MECHANISM_PTR pMechanism)
{ {
char param_name[64];
if (!pMechanism) { if (!pMechanism) {
fprintf(spy_output, "[in] %s=(null)\n", name); fprintf(spy_output, "[in] %s = NULL\n", name);
return; return;
} }
@ -414,10 +416,13 @@ spy_dump_mechanism_in(const char *name, CK_MECHANISM_PTR pMechanism)
if (pMechanism->pParameter != NULL) { if (pMechanism->pParameter != NULL) {
CK_GCM_PARAMS *param = CK_GCM_PARAMS *param =
(CK_GCM_PARAMS *) pMechanism->pParameter; (CK_GCM_PARAMS *) pMechanism->pParameter;
spy_dump_string_in("pIv[ulIvLen]", snprintf(param_name, sizeof(param_name), "%s->pParameter->pIv[ulIvLen]", name);
spy_dump_string_in(param_name,
param->pIv, param->ulIvLen); param->pIv, param->ulIvLen);
spy_dump_ulong_in("ulIvBits", param->ulIvBits); snprintf(param_name, sizeof(param_name), "%s->pParameter->ulIvBits", name);
spy_dump_string_in("pAAD[ulAADLen]", spy_dump_ulong_in(param_name, param->ulIvBits);
snprintf(param_name, sizeof(param_name), "%s->pParameter->pAAD[ulAADLen]", name);
spy_dump_string_in(param_name,
param->pAAD, param->ulAADLen); param->pAAD, param->ulAADLen);
fprintf(spy_output, "[in] %s->pParameter->ulTagBits = %lu\n", name, param->ulTagBits); fprintf(spy_output, "[in] %s->pParameter->ulTagBits = %lu\n", name, param->ulTagBits);
} else { } else {
@ -430,15 +435,14 @@ spy_dump_mechanism_in(const char *name, CK_MECHANISM_PTR pMechanism)
if (pMechanism->pParameter != NULL) { if (pMechanism->pParameter != NULL) {
CK_ECDH1_DERIVE_PARAMS *param = CK_ECDH1_DERIVE_PARAMS *param =
(CK_ECDH1_DERIVE_PARAMS *) pMechanism->pParameter; (CK_ECDH1_DERIVE_PARAMS *) pMechanism->pParameter;
fprintf(spy_output, "[in] %s->pParameter = {\n\tkdf=%s\n", name, fprintf(spy_output, "[in] %s->pParameter->kdf = %s\n", name,
lookup_enum(CKD_T, param->kdf)); lookup_enum(CKD_T, param->kdf));
fprintf(spy_output, "\tpSharedData[ulSharedDataLen] = "); fprintf(spy_output, "[in] %s->pParameter->pSharedData[ulSharedDataLen] = ", name);
print_generic(spy_output, 0, param->pSharedData, print_generic(spy_output, 0, param->pSharedData,
param->ulSharedDataLen, NULL); param->ulSharedDataLen, NULL);
fprintf(spy_output, "\tpPublicData[ulPublicDataLen] = "); fprintf(spy_output, "[in] %s->pParameter->pPublicData[ulPublicDataLen] = ", name);
print_generic(spy_output, 0, param->pPublicData, print_generic(spy_output, 0, param->pPublicData,
param->ulPublicDataLen, NULL); param->ulPublicDataLen, NULL);
fprintf(spy_output, "}\n");
} else { } else {
fprintf(spy_output, "[in] %s->pParameter = NULL\n", name); fprintf(spy_output, "[in] %s->pParameter = NULL\n", name);
break; break;
@ -448,22 +452,21 @@ spy_dump_mechanism_in(const char *name, CK_MECHANISM_PTR pMechanism)
if (pMechanism->pParameter != NULL) { if (pMechanism->pParameter != NULL) {
CK_ECMQV_DERIVE_PARAMS *param = CK_ECMQV_DERIVE_PARAMS *param =
(CK_ECMQV_DERIVE_PARAMS *) pMechanism->pParameter; (CK_ECMQV_DERIVE_PARAMS *) pMechanism->pParameter;
fprintf(spy_output, "[in] %s->pParameter = {\n\tkdf=%s\n", name, fprintf(spy_output, "[in] %s->pParameter->kdf = %s\n", name,
lookup_enum(CKD_T, param->kdf)); lookup_enum(CKD_T, param->kdf));
fprintf(spy_output, "\tpSharedData[ulSharedDataLen] ="); fprintf(spy_output, "%s->pParameter->pSharedData[ulSharedDataLen] = ", name);
print_generic(spy_output, 0, param->pSharedData, print_generic(spy_output, 0, param->pSharedData,
param->ulSharedDataLen, NULL); param->ulSharedDataLen, NULL);
fprintf(spy_output, "\tpPublicData[ulPublicDataLen] = "); fprintf(spy_output, "%s->pParameter->pPublicData[ulPublicDataLen] = ", name);
print_generic(spy_output, 0, param->pPublicData, print_generic(spy_output, 0, param->pPublicData,
param->ulPublicDataLen, NULL); param->ulPublicDataLen, NULL);
fprintf(spy_output, "\tulPrivateDataLen = %lu", fprintf(spy_output, "%s->pParameter->ulPrivateDataLen = %lu", name,
param->ulPrivateDataLen); param->ulPrivateDataLen);
fprintf(spy_output, "\thPrivateData = %lu", param->hPrivateData); fprintf(spy_output, "%s->pParameter->hPrivateData = %lu", name, param->hPrivateData);
fprintf(spy_output, "\tpPublicData2[ulPublicDataLen2] = "); fprintf(spy_output, "%s->pParameter->pPublicData2[ulPublicDataLen2] = ", name);
print_generic(spy_output, 0, param->pPublicData2, print_generic(spy_output, 0, param->pPublicData2,
param->ulPublicDataLen2, NULL); param->ulPublicDataLen2, NULL);
fprintf(spy_output, "\tpublicKey = %lu", param->publicKey); fprintf(spy_output, "%s->pParameter->publicKey = %lu", name, param->publicKey);
fprintf(spy_output, "}\n");
} else { } else {
fprintf(spy_output, "[in] %s->pParameter = NULL\n", name); fprintf(spy_output, "[in] %s->pParameter = NULL\n", name);
break; break;
@ -478,7 +481,8 @@ spy_dump_mechanism_in(const char *name, CK_MECHANISM_PTR pMechanism)
fprintf(spy_output, "[in] %s->pParameter->mgf = %s\n", name, fprintf(spy_output, "[in] %s->pParameter->mgf = %s\n", name,
lookup_enum(MGF_T, param->mgf)); lookup_enum(MGF_T, param->mgf));
fprintf(spy_output, "[in] %s->pParameter->source = %lu\n", name, param->source); fprintf(spy_output, "[in] %s->pParameter->source = %lu\n", name, param->source);
spy_dump_string_out("pSourceData[ulSourceDalaLen]", snprintf(param_name, sizeof(param_name), "%s->pParameter->pSourceData[ulSourceDalaLen]", name);
spy_dump_string_in(param_name,
param->pSourceData, param->ulSourceDataLen); param->pSourceData, param->ulSourceDataLen);
} else { } else {
fprintf(spy_output, "[in] %s->pParameter = NULL\n", name); fprintf(spy_output, "[in] %s->pParameter = NULL\n", name);
@ -505,7 +509,8 @@ spy_dump_mechanism_in(const char *name, CK_MECHANISM_PTR pMechanism)
} }
break; break;
default: default:
spy_dump_string_in("pParameter[ulParameterLen]", pMechanism->pParameter, pMechanism->ulParameterLen); snprintf(param_name, sizeof(param_name), "%s->pParameter[ulParameterLen]", name);
spy_dump_string_in(param_name, pMechanism->pParameter, pMechanism->ulParameterLen);
break; break;
} }
} }