From 9a137e59b5b594c2d638b0f1032979bb38407dc9 Mon Sep 17 00:00:00 2001 From: Phil Date: Sun, 16 Jan 2022 23:52:19 +0100 Subject: [PATCH 1/2] Update mfc_default_keys.dic Adding keys for access cards of Eurothermes group in Switzerland. Enjoy! --- client/dictionaries/mfc_default_keys.dic | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic index be3a5a000..1adffdba4 100644 --- a/client/dictionaries/mfc_default_keys.dic +++ b/client/dictionaries/mfc_default_keys.dic @@ -1475,3 +1475,18 @@ D3F3B958B8A3 2196FAD8115B 7C469FE86855 CE99FBC8BD26 +# keys from Eurothermes group (Switzerland) +d66d91829013 +75b691829013 +83e391829013 +a23c91829013 +e46a91829013 +d9e091829013 +fed791829013 +155f91829013 +06cc91829013 +8ddc91829013 +54af91829013 +29a791829013 +668091829013 +00008627c10a From 21f556149b8b47f0e8e0d8d837545409abb23082 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Mon, 17 Jan 2022 22:25:07 +0100 Subject: [PATCH 2/2] Fix libpm3: make sure mainret is defined. Thanks @bettse --- client/src/proxmark3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c index 548d35ef8..8f8ab4240 100644 --- a/client/src/proxmark3.c +++ b/client/src/proxmark3.c @@ -37,6 +37,8 @@ #include "flash.h" #include "preferences.h" +static int mainret = PM3_ESOFT; + #ifndef LIBPM3 #define BANNERMSG1 "" #define BANNERMSG2 " [ Iceman :snowflake: ]" @@ -44,8 +46,6 @@ typedef enum LogoMode { UTF8, ANSI, ASCII } LogoMode; -static int mainret = PM3_ESOFT; - static void showBanner_logo(LogoMode mode) { switch (mode) { case UTF8: {