dearsky/pico-hsm
1
0
Fork 0
Code Issues 17 Pull Requests 4 Actions Packages Projects Releases 26 Wiki Activity

Fix parsing TLV in signatures.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-04-11 01:44:18 +02:00
parent c4c2bf86ba
commit 2f1f8e0c90
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/hsm/eac.c
View File

@@ -93,7 +93,14 @@ int sm_unwrap() {
bool is87 = false; bool is87 = false;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) {
uint8_t tag = *p++; uint8_t tag = *p++;
uint8_t tag_len = *p++; uint16_t tag_len = *p++;
if (tag_len == 0x82) {
tag_len = *p++ << 8;
tag_len |= *p++;
}
else if (tag_len == 0x81) {
tag_len = *p++;
}
if (tag == 0x87 || tag == 0x85) { if (tag == 0x87 || tag == 0x85) {
body = (uint8_t *)p; body = (uint8_t *)p;
body_size = tag_len; body_size = tag_len;
@@ -180,7 +187,14 @@ int sm_get_le() {
const uint8_t *p = apdu.cmd_apdu_data; const uint8_t *p = apdu.cmd_apdu_data;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) {
uint8_t tag = *p++; uint8_t tag = *p++;
uint8_t tag_len = *p++; uint16_t tag_len = *p++;
if (tag_len == 0x82) {
tag_len = *p++ << 8;
tag_len |= *p++;
}
else if (tag_len == 0x81) {
tag_len = *p++;
}
if (tag == 0x97) { if (tag == 0x97) {
uint32_t le = 0; uint32_t le = 0;
for (int t = 1; t <= tag_len; t++) for (int t = 1; t <= tag_len; t++)
@@ -228,14 +242,22 @@ int sm_verify() {
input_len += sm_blocksize-5; input_len += sm_blocksize-5;
} }
bool some_added = false; bool some_added = false;
const uint8_t *p = apdu.cmd_apdu_data, *mac = NULL; const uint8_t *p = apdu.cmd_apdu_data, *mac = NULL, *initag = NULL;
size_t mac_len = 0; size_t mac_len = 0;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) {
initag = p;
uint8_t tag = *p++; uint8_t tag = *p++;
uint8_t tag_len = *p++; uint16_t tag_len = *p++;
if (tag_len == 0x82) {
tag_len = *p++ << 8;
tag_len |= *p++;
}
else if (tag_len == 0x81) {
tag_len = *p++;
}
if (tag & 0x1) { if (tag & 0x1) {
memcpy(input+input_len, p-2, tag_len+2); memcpy(input+input_len, initag, tag_len+(p-initag));
input_len += tag_len+2; input_len += tag_len+(p-initag);
some_added = true; some_added = true;
} }
if (tag == 0x8E) { if (tag == 0x8E) {

1
src/hsm/eac.h
View File

@@ -39,5 +39,6 @@ int sm_get_le();
extern int sm_unwrap(); extern int sm_unwrap();
int sm_remove_padding(const uint8_t *data, size_t data_len); int sm_remove_padding(const uint8_t *data, size_t data_len);
extern int sm_wrap(); extern int sm_wrap();
extern bool is_secured_apdu();
#endif #endif