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

Added walker function for TLV parsing.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-04-13 16:55:34 +02:00
parent 9dfe0ee7b3
commit b68920ff45
3 changed files with 96 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/hsm/eac.c
View File

@@ -90,29 +90,20 @@ int sm_unwrap() {
int le = sm_get_le(); int le = sm_get_le();
if (le >= 0) if (le >= 0)
apdu.expected_res_size = le; apdu.expected_res_size = le;
const uint8_t *p = apdu.cmd_apdu_data;
uint8_t *body = NULL; uint8_t *body = NULL;
size_t body_size = 0; size_t body_size = 0;
bool is87 = false; bool is87 = false;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { uint8_t tag = 0x0, *tag_data = NULL, *p = NULL;
uint8_t tag = *p++; size_t tag_len = 0;
uint16_t tag_len = *p++; while (walk_tlv(apdu.cmd_apdu_data, apdu.cmd_apdu_data_len, &p, &tag, &tag_len, &tag_data)) {
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 = tag_data;
body_size = tag_len; body_size = tag_len;
if (tag == 0x87) { if (tag == 0x87) {
is87 = true; is87 = true;
body_size--; body_size--;
} }
} }
p += tag_len;
} }
if (!body) if (!body)
return HSM_WRONG_DATA; return HSM_WRONG_DATA;
@@ -189,24 +180,15 @@ int sm_wrap() {
} }
int sm_get_le() { int sm_get_le() {
const uint8_t *p = apdu.cmd_apdu_data; uint8_t tag = 0x0, *tag_data = NULL, *p = NULL;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { size_t tag_len = 0;
uint8_t tag = *p++; while (walk_tlv(apdu.cmd_apdu_data, apdu.cmd_apdu_data_len, &p, &tag, &tag_len, &tag_data)) {
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++)
le |= (*p++) << (tag_len-t); le |= (*tag_data++) << (tag_len-t);
return le; return le;
} }
p += tag_len;
} }
return -1; return -1;
} }
@@ -247,29 +229,23 @@ 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, *initag = NULL; const uint8_t *mac = NULL;
size_t mac_len = 0; size_t mac_len = 0;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { uint8_t tag = 0x0, *tag_data = NULL, *p = NULL;
initag = p; size_t tag_len = 0;
uint8_t tag = *p++; while (walk_tlv(apdu.cmd_apdu_data, apdu.cmd_apdu_data_len, &p, &tag, &tag_len, &tag_data)) {
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, initag, tag_len+(p-initag)); input[input_len++] = tag;
input_len += tag_len+(p-initag); int tlen = format_tlv_len(tag_len, input+input_len);
input_len += tlen;
memcpy(input+input_len, tag_data, tag_len);
input_len += tag_len;
some_added = true; some_added = true;
} }
if (tag == 0x8E) { if (tag == 0x8E) {
mac = p; mac = tag_data;
mac_len = tag_len; mac_len = tag_len;
} }
p += tag_len;
} }
if (!mac) if (!mac)
return HSM_WRONG_DATA; return HSM_WRONG_DATA;

146
src/hsm/sc_hsm.c
View File

@@ -119,6 +119,53 @@ static void wait_button() {
} }
} }
int format_tlv_len(size_t len, uint8_t *out) {
if (len < 128) {
*out = len;
return 1;
}
else if (len < 256) {
*out++ = 0x81;
*out++ = len;
return 2;
}
else {
*out++ = 0x82;
*out++ = (len >> 8) & 0xff;
*out++ = len & 0xff;
return 3;
}
return 0;
}
int walk_tlv(const uint8_t *cdata, size_t cdata_len, uint8_t **p, uint8_t *tag, size_t *tag_len, uint8_t **data) {
if (!p)
return 0;
if (!*p)
*p = (uint8_t *)cdata;
if (*p-cdata >= cdata_len)
return 0;
uint8_t tg = 0x0;
size_t tgl = 0;
tg = *(*p)++;
tgl = *(*p)++;
if (tgl == 0x82) {
tgl = *(*p)++ << 8;
tgl |= *(*p)++;
}
else if (tgl == 0x81) {
tgl = *(*p)++;
}
if (tag)
*tag = tg;
if (tag_len)
*tag_len = tgl;
if (data)
*data = *p;
*p = *p+tgl;
return 1;
}
static int cmd_select() { static int cmd_select() {
uint8_t p1 = P1(apdu); uint8_t p1 = P1(apdu);
uint8_t p2 = P2(apdu); uint8_t p2 = P2(apdu);
@@ -598,28 +645,20 @@ static int cmd_initialize() {
initialize_flash(true); initialize_flash(true);
scan_flash(); scan_flash();
dkeks = current_dkeks = 0; dkeks = current_dkeks = 0;
const uint8_t *p = apdu.cmd_apdu_data; uint8_t tag = 0x0, *tag_data = NULL, *p = NULL;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { size_t tag_len = 0;
uint8_t tag = *p++; while (walk_tlv(apdu.cmd_apdu_data, apdu.cmd_apdu_data_len, &p, &tag, &tag_len, &tag_data)) {
uint8_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 == 0x80) { //options if (tag == 0x80) { //options
file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF); file_t *tf = search_by_fid(EF_DEVOPS, NULL, SPECIFY_EF);
flash_write_data_to_file(tf, p, tag_len); flash_write_data_to_file(tf, tag_data, tag_len);
} }
else if (tag == 0x81) { //user pin else if (tag == 0x81) { //user pin
if (file_pin1 && file_pin1->data) { if (file_pin1 && file_pin1->data) {
uint8_t dhash[33]; uint8_t dhash[33];
dhash[0] = tag_len; dhash[0] = tag_len;
double_hash_pin(p, tag_len, dhash+1); double_hash_pin(tag_data, tag_len, dhash+1);
flash_write_data_to_file(file_pin1, dhash, sizeof(dhash)); flash_write_data_to_file(file_pin1, dhash, sizeof(dhash));
hash_multi(p, tag_len, session_pin); hash_multi(tag_data, tag_len, session_pin);
has_session_pin = true; has_session_pin = true;
} }
} }
@@ -627,25 +666,24 @@ static int cmd_initialize() {
if (file_sopin && file_sopin->data) { if (file_sopin && file_sopin->data) {
uint8_t dhash[33]; uint8_t dhash[33];
dhash[0] = tag_len; dhash[0] = tag_len;
double_hash_pin(p, tag_len, dhash+1); double_hash_pin(tag_data, tag_len, dhash+1);
flash_write_data_to_file(file_sopin, dhash, sizeof(dhash)); flash_write_data_to_file(file_sopin, dhash, sizeof(dhash));
hash_multi(p, tag_len, session_sopin); hash_multi(tag_data, tag_len, session_sopin);
has_session_sopin = true; has_session_sopin = true;
} }
} }
else if (tag == 0x91) { //retries user pin else if (tag == 0x91) { //retries user pin
file_t *tf = search_by_fid(0x1082, NULL, SPECIFY_EF); file_t *tf = search_by_fid(0x1082, NULL, SPECIFY_EF);
if (tf && tf->data) { if (tf && tf->data) {
flash_write_data_to_file(tf, p, tag_len); flash_write_data_to_file(tf, tag_data, tag_len);
} }
if (file_retries_pin1 && file_retries_pin1->data) { if (file_retries_pin1 && file_retries_pin1->data) {
flash_write_data_to_file(file_retries_pin1, p, tag_len); flash_write_data_to_file(file_retries_pin1, tag_data, tag_len);
} }
} }
else if (tag == 0x92) { else if (tag == 0x92) {
dkeks = *p; dkeks = *tag_data;
} }
p += tag_len;
} }
if (dkeks == 0) { if (dkeks == 0) {
int r = save_dkek_key(random_bytes_get(32)); int r = save_dkek_key(random_bytes_get(32));
@@ -1074,7 +1112,7 @@ static int cmd_keypair_gen() {
static int cmd_update_ef() { static int cmd_update_ef() {
uint8_t p1 = P1(apdu), p2 = P2(apdu); uint8_t p1 = P1(apdu), p2 = P2(apdu);
uint16_t fid = (p1 << 8) | p2; uint16_t fid = (p1 << 8) | p2;
uint8_t *p = apdu.cmd_apdu_data, *data; uint8_t *data;
uint16_t offset = 0; uint16_t offset = 0;
uint16_t data_len = 0; uint16_t data_len = 0;
file_t *ef = NULL; file_t *ef = NULL;
@@ -1088,25 +1126,16 @@ static int cmd_update_ef() {
if (ef && !authenticate_action(ef, ACL_OP_UPDATE_ERASE)) if (ef && !authenticate_action(ef, ACL_OP_UPDATE_ERASE))
return SW_SECURITY_STATUS_NOT_SATISFIED(); return SW_SECURITY_STATUS_NOT_SATISFIED();
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { uint8_t tag = 0x0, *tag_data = NULL, *p = NULL;
uint8_t tag = *p++; size_t tag_len = 0;
uint8_t taglen = *p++; while (walk_tlv(apdu.cmd_apdu_data, apdu.cmd_apdu_data_len, &p, &tag, &tag_len, &tag_data)) {
if (tag == 0x54) { //ofset tag if (tag == 0x54) { //ofset tag
for (int i = 0; i < taglen; i++) for (int i = 1; i <= tag_len; i++)
offset |= (*p++ << (8*(taglen-i-1))); offset |= (*tag_data++ << (8*(tag_len-i)));
} }
else if (tag == 0x53) { //data else if (tag == 0x53) { //data
if (taglen == 0x82) { data_len = tag_len;
data_len = *p++ << 8; data = tag_data;
data_len |= *p++;
}
else if (taglen == 0x81) {
data_len = *p++;
}
else
data_len = taglen;
data = p;
p += data_len;
} }
} }
if (data_len == 0 && offset == 0) { //new file if (data_len == 0 && offset == 0) { //new file
@@ -1826,33 +1855,17 @@ static int cmd_mse() {
int p2 = P2(apdu); int p2 = P2(apdu);
if (p1 & 0x1) { //SET if (p1 & 0x1) { //SET
if (p2 == 0xA4) { //AT if (p2 == 0xA4) { //AT
const uint8_t *p = apdu.cmd_apdu_data; uint8_t tag = 0x0, *tag_data = NULL, *p = NULL;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data_len) { size_t tag_len = 0;
uint8_t tag = *p++; while (walk_tlv(apdu.cmd_apdu_data, apdu.cmd_apdu_data_len, &p, &tag, &tag_len, &tag_data)) {
uint8_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_len == 0x82) {
tag_len = *p++ << 8;
tag_len |= *p++;
}
else if (tag_len == 0x81) {
tag_len = *p++;
}
if (tag == 0x80) { if (tag == 0x80) {
if (tag_len == 10 && memcmp(p, "\x04\x00\x7F\x00\x07\x02\x02\x03\x02\x02", tag_len) == 0) if (tag_len == 10 && memcmp(tag_data, "\x04\x00\x7F\x00\x07\x02\x02\x03\x02\x02", tag_len) == 0)
sm_set_protocol(MSE_AES); sm_set_protocol(MSE_AES);
else if (tag_len == 10 && memcmp(p, "\x04\x00\x7F\x00\x07\x02\x02\x03\x02\x01", tag_len) == 0) else if (tag_len == 10 && memcmp(tag_data, "\x04\x00\x7F\x00\x07\x02\x02\x03\x02\x01", tag_len) == 0)
sm_set_protocol(MSE_3DES); sm_set_protocol(MSE_3DES);
else else
return SW_REFERENCE_NOT_FOUND(); return SW_REFERENCE_NOT_FOUND();
} }
p += tag_len;
} }
} }
else else
@@ -1866,25 +1879,16 @@ static int cmd_mse() {
int cmd_general_authenticate() { int cmd_general_authenticate() {
if (P1(apdu) == 0x0 && P2(apdu) == 0x0) { if (P1(apdu) == 0x0 && P2(apdu) == 0x0) {
if (apdu.cmd_apdu_data[0] == 0x7C) { if (apdu.cmd_apdu_data[0] == 0x7C) {
const uint8_t *p = &apdu.cmd_apdu_data[2];
int r = 0; int r = 0;
size_t pubkey_len = 0; size_t pubkey_len = 0;
const uint8_t *pubkey = NULL; const uint8_t *pubkey = NULL;
while (p-apdu.cmd_apdu_data < apdu.cmd_apdu_data[1]) { uint8_t tag = 0x0, *tag_data = NULL, *p = NULL;
uint8_t tag = *p++; size_t tag_len = 0;
uint8_t tag_len = *p++; while (walk_tlv(apdu.cmd_apdu_data+2, apdu.cmd_apdu_data_len-2, &p, &tag, &tag_len, &tag_data)) {
if (tag_len == 0x82) {
tag_len = *p++ << 8;
tag_len |= *p++;
}
else if (tag_len == 0x81) {
tag_len = *p++;
}
if (tag == 0x80) { if (tag == 0x80) {
pubkey = p-1; //mbedtls ecdh starts reading one pos before pubkey = tag_data-1; //mbedtls ecdh starts reading one pos before
pubkey_len = tag_len+1; pubkey_len = tag_len+1;
} }
p += tag_len;
} }
mbedtls_ecdh_context ctx; mbedtls_ecdh_context ctx;
int key_size = file_read_uint16(termca_pk); int key_size = file_read_uint16(termca_pk);

3
src/hsm/sc_hsm.h
View File

@@ -138,6 +138,9 @@ extern void hash(const uint8_t *input, size_t len, uint8_t output[32]);
extern void hash_multi(const uint8_t *input, size_t len, uint8_t output[32]); extern void hash_multi(const uint8_t *input, size_t len, uint8_t output[32]);
extern void double_hash_pin(const uint8_t *pin, size_t len, uint8_t output[32]); extern void double_hash_pin(const uint8_t *pin, size_t len, uint8_t output[32]);
extern int walk_tlv(const uint8_t *cdata, size_t cdata_len, uint8_t **p, uint8_t *tag, size_t *tag_len, uint8_t **data);
extern int format_tlv_len(size_t len, uint8_t *out);
extern uint8_t session_pin[32], session_sopin[32]; extern uint8_t session_pin[32], session_sopin[32];
#define IV_SIZE 16 #define IV_SIZE 16