Merge branch 'master' into allin

update 201101
2020-11-01 22:57:07 +01:00
parent 6af4bc1f1b ddae148613
commit 836ca5da40
9 changed files with 234 additions and 94 deletions
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -97,6 +97,7 @@ typedef enum {
 typedef enum {
    MFDES_KDF_ALGO_NONE = 0,
    MFDES_KDF_ALGO_AN10922 = 1,
+    MFDES_KDF_ALGO_GALLAGHER = 2,
 } mifare_des_kdf_algo_t;

 //-----------------------------------------------------------------------------