From bcc137af1d10a369c7105bba08151223944d2cc2 Mon Sep 17 00:00:00 2001 From: mwalker33 <51802811+mwalker33@users.noreply.github.com> Date: Tue, 22 Jun 2021 18:55:23 +1000 Subject: [PATCH] Update desfire_crypto.c Coverty 344484 - ensure AES IV is at least 16 bytes long. --- client/src/mifare/desfire_crypto.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/mifare/desfire_crypto.c b/client/src/mifare/desfire_crypto.c index 0699249ff..24a05825f 100644 --- a/client/src/mifare/desfire_crypto.c +++ b/client/src/mifare/desfire_crypto.c @@ -335,6 +335,10 @@ void mifare_kdf_an10922(const desfirekey_t key, const uint8_t *data, size_t len) return; } + // AES uses 16 byte IV + if (kbs < 16) + kbs = 16; + cmac_generate_subkeys(key, MCD_SEND); // reserv atleast 32bytes.