From e54f0e3a33faad679287a2d620f47f5ce1b2fb99 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Sat, 10 Jul 2021 15:10:15 +0300
Subject: [PATCH] move crc to new file

---
 client/src/mifare/desfire_crypto.c | 28 ----------------------------
 client/src/mifare/desfire_crypto.h |  6 ------
 client/src/mifare/desfirecrypto.c  | 28 ++++++++++++++++++++++++++++
 client/src/mifare/desfirecrypto.h  |  6 ++++++
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/client/src/mifare/desfire_crypto.c b/client/src/mifare/desfire_crypto.c
index 23c8b1fd9..fd3cb427d 100644
--- a/client/src/mifare/desfire_crypto.c
+++ b/client/src/mifare/desfire_crypto.c
@@ -967,31 +967,3 @@ void mifare_cypher_blocks_chained(desfiretag_t tag, desfirekey_t key, uint8_t *i
         offset += block_size;
     }
 }
-
-void desfire_crc32(const uint8_t *data, const size_t len, uint8_t *crc) {
-    crc32_ex(data, len, crc);
-}
-
-void desfire_crc32_append(uint8_t *data, const size_t len) {
-    crc32_ex(data, len, data + len);
-}
-
-bool desfire_crc32_check(uint8_t *data, const size_t len, uint8_t *crc) {
-    uint8_t ccrc[4] = {0};
-    desfire_crc32(data, len, ccrc);
-    return (memcmp(ccrc, crc, 4) == 0);
-}
-
-void iso14443a_crc_append(uint8_t *data, size_t len) {
-    return compute_crc(CRC_14443_A, data, len, data + len, data + len + 1);
-}
-
-void iso14443a_crc(uint8_t *data, size_t len, uint8_t *pbtCrc) {
-    return compute_crc(CRC_14443_A, data, len, pbtCrc, pbtCrc + 1);
-}
-
-bool iso14443a_crc_check(uint8_t *data, const size_t len, uint8_t *crc) {
-    uint8_t ccrc[2] = {0};
-    iso14443a_crc(data, len, ccrc);
-    return (memcmp(ccrc, crc, 2) == 0);
-}
diff --git a/client/src/mifare/desfire_crypto.h b/client/src/mifare/desfire_crypto.h
index 689c0d56c..c4c879ef3 100644
--- a/client/src/mifare/desfire_crypto.h
+++ b/client/src/mifare/desfire_crypto.h
@@ -147,10 +147,4 @@ void cmac(const desfirekey_t  key, uint8_t *ivect, const uint8_t *data, size_t l
 
 void mifare_kdf_an10922(const desfirekey_t key, const uint8_t *data, size_t len);
 
-void desfire_crc32(const uint8_t *data, const size_t len, uint8_t *crc);
-void desfire_crc32_append(uint8_t *data, const size_t len);
-bool desfire_crc32_check(uint8_t *data, const size_t len, uint8_t *crc);
-void iso14443a_crc_append(uint8_t *data, size_t len);
-void iso14443a_crc(uint8_t *data, size_t len, uint8_t *pbtCrc);
-bool iso14443a_crc_check(uint8_t *data, const size_t len, uint8_t *crc);
 #endif
diff --git a/client/src/mifare/desfirecrypto.c b/client/src/mifare/desfirecrypto.c
index 64773c229..04c6d7dfb 100644
--- a/client/src/mifare/desfirecrypto.c
+++ b/client/src/mifare/desfirecrypto.c
@@ -308,3 +308,31 @@ void DesfireCryptoCMAC(DesfireContext *ctx, uint8_t *data, size_t len, uint8_t *
         memcpy(cmac, ctx->IV, kbs);
 }
 
+
+void desfire_crc32(const uint8_t *data, const size_t len, uint8_t *crc) {
+    crc32_ex(data, len, crc);
+}
+
+void desfire_crc32_append(uint8_t *data, const size_t len) {
+    crc32_ex(data, len, data + len);
+}
+
+bool desfire_crc32_check(uint8_t *data, const size_t len, uint8_t *crc) {
+    uint8_t ccrc[4] = {0};
+    desfire_crc32(data, len, ccrc);
+    return (memcmp(ccrc, crc, 4) == 0);
+}
+
+void iso14443a_crc_append(uint8_t *data, size_t len) {
+    return compute_crc(CRC_14443_A, data, len, data + len, data + len + 1);
+}
+
+void iso14443a_crc(uint8_t *data, size_t len, uint8_t *pbtCrc) {
+    return compute_crc(CRC_14443_A, data, len, pbtCrc, pbtCrc + 1);
+}
+
+bool iso14443a_crc_check(uint8_t *data, const size_t len, uint8_t *crc) {
+    uint8_t ccrc[2] = {0};
+    iso14443a_crc(data, len, ccrc);
+    return (memcmp(ccrc, crc, 2) == 0);
+}
diff --git a/client/src/mifare/desfirecrypto.h b/client/src/mifare/desfirecrypto.h
index 824225b39..6bffa376e 100644
--- a/client/src/mifare/desfirecrypto.h
+++ b/client/src/mifare/desfirecrypto.h
@@ -101,5 +101,11 @@ void DesfireCryptoEncDec(DesfireContext *ctx, bool use_session_key, uint8_t *src
 void DesfireCryptoEncDecEx(DesfireContext *ctx, bool use_session_key, uint8_t *srcdata, size_t srcdatalen, uint8_t *dstdata, bool encode, uint8_t *iv);
 void DesfireCryptoCMAC(DesfireContext *ctx, uint8_t *srcdata, size_t srcdatalen, uint8_t *cmac);
 
+void desfire_crc32(const uint8_t *data, const size_t len, uint8_t *crc);
+void desfire_crc32_append(uint8_t *data, const size_t len);
+bool desfire_crc32_check(uint8_t *data, const size_t len, uint8_t *crc);
+void iso14443a_crc_append(uint8_t *data, size_t len);
+void iso14443a_crc(uint8_t *data, size_t len, uint8_t *pbtCrc);
+bool iso14443a_crc_check(uint8_t *data, const size_t len, uint8_t *crc);
 
 #endif // __DESFIRECRYPTO_H