Skip to content

Fix: align CMAC output parameter and initialize key_index to remove compiler warnings #1033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dbarzin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: align CMAC output parameter and initialize key_index to remove compiler warnings #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f678ed
fix type warning
dbarzin Oct 16, 2025
5d2586e
fix size warning
dbarzin Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/mifare/mifarehost.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,9 @@ static int nested_fixed_nonce(StateList_t statelist, uint32_t fixed_nt, uint32_t
}

// test each {ar} response
uint32_t key_index;
size_t key_index;

int isOK = mfCheckKeysFixedNonce(statelist.blockNo, statelist.keyType, authentication_timeout, true, num_ar_par, ar_par, &key_index);
int isOK = mfCheckKeysFixedNonce(statelist.blockNo, statelist.keyType, authentication_timeout, true, num_ar_par, ar_par, (uint32_t*)&key_index);

if (isOK == 0) { // success, key found
// key_index contains the index into the cypher state list
Expand Down
2 changes: 1 addition & 1 deletion common/mbedtls/cmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ int mbedtls_cipher_cmac( const mbedtls_cipher_info_t *cipher_info,
*/
int mbedtls_aes_cmac_prf_128( const unsigned char *key, size_t key_length,
const unsigned char *input, size_t in_len,
unsigned char *output )
unsigned char output[16] )
{
int ret;
const mbedtls_cipher_info_t *cipher_info;
Expand Down