github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 22:33:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'RfidResearchGroup:master' into master

Browse source
This commit is contained in:
bthedorff 2022-01-17 17:45:23 -05:00 • committed by GitHub
commit 661cebf6ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/dictionaries/mfc_default_keys.dic
View file

@ -1475,3 +1475,18 @@ D3F3B958B8A3
2196FAD8115B 2196FAD8115B
7C469FE86855 7C469FE86855
CE99FBC8BD26 CE99FBC8BD26
# keys from Eurothermes group (Switzerland)
d66d91829013
75b691829013
83e391829013
a23c91829013
e46a91829013
d9e091829013
fed791829013
155f91829013
06cc91829013
8ddc91829013
54af91829013
29a791829013
668091829013
00008627c10a

4
client/src/proxmark3.c
View file

@ -37,6 +37,8 @@
#include "flash.h" #include "flash.h"
#include "preferences.h" #include "preferences.h"
static int mainret = PM3_ESOFT;
#ifndef LIBPM3 #ifndef LIBPM3
#define BANNERMSG1 "" #define BANNERMSG1 ""
#define BANNERMSG2 " [ Iceman :snowflake: ]" #define BANNERMSG2 " [ Iceman :snowflake: ]"
@ -44,8 +46,6 @@
typedef enum LogoMode { UTF8, ANSI, ASCII } LogoMode; typedef enum LogoMode { UTF8, ANSI, ASCII } LogoMode;
static int mainret = PM3_ESOFT;
static void showBanner_logo(LogoMode mode) { static void showBanner_logo(LogoMode mode) {
switch (mode) { switch (mode) {
case UTF8: { case UTF8: {