webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-06-10 11:59:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check MAC length in secure messaging.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2026-03-18 16:24:44 +01:00
parent 0df1914cde
commit 9c0575418e
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/eac.c
View File

@@ -41,12 +41,7 @@ bool is_secured_apdu(void) {
return CLA(apdu) & 0xC; return CLA(apdu) & 0xC;
} }
static void sm_derive_key(const uint8_t *input, static void sm_derive_key(const uint8_t *input, size_t input_len, uint8_t counter, const uint8_t *nonce, size_t nonce_len, uint8_t *out) {
size_t input_len,
uint8_t counter,
const uint8_t *nonce,
size_t nonce_len,
uint8_t *out) {
uint8_t *b = (uint8_t *) calloc(1, input_len + nonce_len + 4); uint8_t *b = (uint8_t *) calloc(1, input_len + nonce_len + 4);
if (input) { if (input) {
memcpy(b, input, input_len); memcpy(b, input, input_len);
@@ -90,13 +85,8 @@ uint8_t *sm_get_nonce(void) {
return sm_nonce; return sm_nonce;
} }
int sm_sign(uint8_t *in, size_t in_len, uint8_t *out) { int sm_sign(uint8_t *in, size_t in_len, uint8_t out[16]) {
return mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_128_ECB), return mbedtls_cipher_cmac(mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_128_ECB), sm_kmac, 128, in, in_len, out);
sm_kmac,
128,
in,
in_len,
out);
} }
int sm_unwrap(void) { int sm_unwrap(void) {
@@ -118,8 +108,7 @@ int sm_unwrap(void) {
uint16_t tag_len = 0; uint16_t tag_len = 0;
asn1_ctx_t ctxi; asn1_ctx_t ctxi;
asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi); asn1_ctx_init(apdu.data, (uint16_t)apdu.nc, &ctxi);
while (walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data)) while (walk_tlv(&ctxi, &p, &tag, &tag_len, &tag_data)) {
{
if (tag == 0x87 || tag == 0x85) { if (tag == 0x87 || tag == 0x85) {
body = tag_data; body = tag_data;
body_size = tag_len; body_size = tag_len;
@@ -289,7 +278,7 @@ int sm_verify(void) {
mac_len = tag_len; mac_len = tag_len;
} }
} }
if (!mac) { if (!mac || mac_len != 8) {
return PICOKEY_WRONG_DATA; return PICOKEY_WRONG_DATA;
} }
if (some_added) { if (some_added) {

2
src/eac.h
View File

@@ -30,7 +30,7 @@ extern void sm_derive_all_keys(const uint8_t *input, size_t input_len);
extern void sm_set_protocol(MSE_protocol proto); extern void sm_set_protocol(MSE_protocol proto);
extern MSE_protocol sm_get_protocol(void); extern MSE_protocol sm_get_protocol(void);
extern uint8_t *sm_get_nonce(void); extern uint8_t *sm_get_nonce(void);
extern int sm_sign(uint8_t *in, size_t in_len, uint8_t *out); extern int sm_sign(uint8_t *in, size_t in_len, uint8_t out[16]);
int sm_verify(void); int sm_verify(void);
void sm_update_iv(void); void sm_update_iv(void);
uint16_t sm_get_le(void); uint16_t sm_get_le(void);