dearsky/pico-openpgp
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

A VERIFY with P2=x82 and with data, references to PW1.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-04-21 22:39:53 +02:00
parent 879fa444e5
commit c006246aa0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openpgp/openpgp.c
View File

@@ -654,6 +654,8 @@ static int cmd_verify() {
return SW_WRONG_P1P2(); return SW_WRONG_P1P2();
uint8_t qualifier = p2&0x1f; uint8_t qualifier = p2&0x1f;
uint16_t fid = 0x1000 | p2; uint16_t fid = 0x1000 | p2;
if (fid == EF_RC && apdu.cmd_apdu_data_len > 0)
fid = EF_PW1;
file_t *pw, *retries; file_t *pw, *retries;
if (!(pw = search_by_fid(fid, NULL, SPECIFY_EF))) if (!(pw = search_by_fid(fid, NULL, SPECIFY_EF)))
return SW_REFERENCE_NOT_FOUND(); return SW_REFERENCE_NOT_FOUND();
@@ -1000,18 +1002,17 @@ static int cmd_pso_sig() {
else if (md == MBEDTLS_MD_SHA512 && hash_len != 64) else if (md == MBEDTLS_MD_SHA512 && hash_len != 64)
return SW_WRONG_DATA(); return SW_WRONG_DATA();
const uint8_t *hash = apdu.cmd_apdu_data+19; const uint8_t *hash = apdu.cmd_apdu_data+19;
uint8_t *signature = (uint8_t *)calloc(key_size, sizeof(uint8_t)); uint8_t *signature = calloc( 1, ctx.len );
r = mbedtls_rsa_pkcs1_sign(&ctx, random_gen, NULL, md, hash_len, hash, signature); r = mbedtls_rsa_pkcs1_sign(&ctx, random_gen, NULL, md, hash_len, hash, signature);
printf("sign r %d\r\n",r); printf("sign r %d\r\n",r);
memcpy(res_APDU, signature, key_size); memcpy(res_APDU, signature, key_size);
free(signature); free(signature);
mbedtls_rsa_free(&ctx);
if (r != 0) { if (r != 0) {
mbedtls_rsa_free(&ctx);
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }
res_APDU_size = key_size; res_APDU_size = key_size;
apdu.expected_res_size = key_size; //apdu.expected_res_size = key_size;
mbedtls_rsa_free(&ctx);
} }
return SW_OK(); return SW_OK();
} }