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

Signature counter is reset on keypair generation.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-04-26 16:43:18 +02:00
parent 1594da7533
commit dc988e2a88
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openpgp/openpgp.c
View File

@@ -298,13 +298,11 @@ int parse_ch_data(const file_t *f, int mode) {
} }
int inc_sig_count() { int inc_sig_count() {
uint32_t counter = 0;
uint8_t *p = NULL;
file_t *ef = search_by_fid(EF_SIG_COUNT, NULL, SPECIFY_ANY); file_t *ef = search_by_fid(EF_SIG_COUNT, NULL, SPECIFY_ANY);
if (!ef || !ef->data) if (!ef || !ef->data)
return CCID_ERR_FILE_NOT_FOUND; return CCID_ERR_FILE_NOT_FOUND;
p = file_read(ef->data+2); uint8_t *p = file_read(ef->data+2);
counter = (p[0] << 16) | (p[1] << 8) | p[2]; uint32_t counter = (p[0] << 16) | (p[1] << 8) | p[2];
counter++; counter++;
uint8_t q[3] = { (counter>>16) & 0xff, (counter>>8) & 0xff, counter&0xff }; uint8_t q[3] = { (counter>>16) & 0xff, (counter>>8) & 0xff, counter&0xff };
int r = flash_write_data_to_file(ef, q, sizeof(q)); int r = flash_write_data_to_file(ef, q, sizeof(q));
@@ -314,6 +312,18 @@ int inc_sig_count() {
return CCID_OK; return CCID_OK;
} }
int reset_sig_count() {
file_t *ef = search_by_fid(EF_SIG_COUNT, NULL, SPECIFY_ANY);
if (!ef || !ef->data)
return CCID_ERR_FILE_NOT_FOUND;
uint8_t q[3] = { 0 };
int r = flash_write_data_to_file(ef, q, sizeof(q));
if (r != CCID_OK)
return CCID_EXEC_ERROR;
low_flash_available();
return CCID_OK;
}
int parse_sec_tpl(const file_t *f, int mode) { int parse_sec_tpl(const file_t *f, int mode) {
res_APDU[res_APDU_size++] = EF_SEC_TPL & 0xff; res_APDU[res_APDU_size++] = EF_SEC_TPL & 0xff;
res_APDU[res_APDU_size++] = 5; res_APDU[res_APDU_size++] = 5;
@@ -1055,6 +1065,8 @@ static int cmd_keypair_gen() {
r = flash_write_data_to_file(pbef, res_APDU, res_APDU_size); r = flash_write_data_to_file(pbef, res_APDU, res_APDU_size);
if (r != CCID_OK) if (r != CCID_OK)
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
if (fid == EF_PK_SIG)
reset_sig_count();
low_flash_available(); low_flash_available();
return SW_OK(); return SW_OK();
} }