From 1e345b135682338e7a20e093e61691af8a6d6f01 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Mon, 13 May 2019 13:31:11 +0200 Subject: [PATCH] remove unused arg from MifareAcquireNonces --- armsrc/appmain.c | 2 +- armsrc/apps.h | 2 +- armsrc/mifarecmd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 3c09a30c6..60f1631c3 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1024,7 +1024,7 @@ static void PacketReceived(PacketCommandNG *packet) { MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); break; case CMD_MIFARE_ACQUIRE_NONCES: - MifareAcquireNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); + MifareAcquireNonces(packet->oldarg[0], packet->oldarg[2]); break; case CMD_MIFARE_NESTED: MifareNested(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); diff --git a/armsrc/apps.h b/armsrc/apps.h index fd16e44e6..e7d600b8c 100644 --- a/armsrc/apps.h +++ b/armsrc/apps.h @@ -152,7 +152,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain); void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain); void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain); void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain); -void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain); +void MifareAcquireNonces(uint32_t arg0, uint32_t flags); void MifareChkKeys(uint8_t *datain); void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain); void MifareSetDbgLvl(uint16_t arg0); diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index 2e4cb865b..0ce2a1554 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -616,7 +616,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) { (oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1, 0)))) ? 1 : 0; } -void MifareAcquireNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) { +void MifareAcquireNonces(uint32_t arg0, uint32_t flags) { uint8_t uid[10] = {0x00}; uint8_t answer[MAX_MIFARE_FRAME_SIZE] = {0x00};