From 26e8a5a1e051bae20845d92487d6af310d50ce09 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 11:29:44 +0200
Subject: [PATCH 01/32] added check for systemlib python3 in makefile

---
 client/Makefile | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/client/Makefile b/client/Makefile
index 35adc71eb..adc07c88b 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -10,7 +10,7 @@ ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 include ../Makefile.defs
 
 INSTALLBIN = proxmark3
-INSTALLSHARE = cmdscripts lualibs luascripts resources dictionaries
+INSTALLSHARE = cmdscripts lualibs luascripts pyscripts resources dictionaries
 
 VPATH =  ../common src
 vpath %.dic dictionaries
@@ -135,6 +135,18 @@ endif
 LDLIBS += $(LUALIB)
 INCLUDES += $(LUALIBINC)
 
+## Python3
+#PYTHON_CONFIG := python3-config
+PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3 2>/dev/null)
+PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3 2>/dev/null)
+ifneq ($(PYTHONLDLIBS),)
+    PYTHONLIB = $(PYTHONLDLIBS)
+    PYTHONLIBINC = $(PYTHONINCLUDES)
+    PYTHON_FOUND = 1
+endif
+LDLIBS += $(PYTHONLIB)
+INCLUDES += $(PYTHONLIBINC)
+
 ## mbed TLS
 # system library cannot be used because it is compiled by default without CMAC support
 LDLIBS +=$(MBEDTLSLIB)
@@ -256,6 +268,9 @@ endif
 LDLIBS += $(QTLDLIBS)
 CXXINCLUDES += $(QTINCLUDES)
 
+## Python
+
+
 #######################################################################################################
 CFLAGS ?= $(DEFCFLAGS)
 # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
@@ -345,6 +360,12 @@ else
     endif
 endif
 
+ifeq ($(PYTHON_FOUND),1)
+    $(info Python library:    system library found)
+else
+    $(info Python library:    system library not found, disabled)
+endif
+
 ifeq ($(SKIPWHEREAMISYSTEM),1)
     $(info Whereami library:  local library forced)
 else

From 06927f983a3f20bfc2c5e6a120c0ec659eda1ce2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 11:30:17 +0200
Subject: [PATCH 02/32] added python3 as script engine, if installed on system

---
 client/src/cmdscript.c | 113 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 106 insertions(+), 7 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index 4f4a372d8..b2ad53f50 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -7,10 +7,17 @@
 //-----------------------------------------------------------------------------
 // Some lua scripting glue to proxmark core.
 //-----------------------------------------------------------------------------
+// 2020, added Python support (@iceman100)
+
 
 #include <stdlib.h>
 #include <string.h>
 
+#define PY_SSIZE_T_CLEAN
+#include <Python.h>
+#include <wchar.h>
+
+
 #include "cmdparser.h"    // command_t
 #include "scripting.h"
 #include "comms.h"
@@ -24,6 +31,12 @@
 #include "ui.h"
 #include "fileutils.h"
 
+typedef enum {
+    PM3_LUA,
+    PM3_CMD,
+    PM3_PY
+} pm3_scriptfile_t;
+
 static int CmdHelp(const char *Cmd);
 
 /**
@@ -36,7 +49,12 @@ static int CmdScriptList(const char *Cmd) {
     int ret = searchAndList(LUA_SCRIPTS_SUBDIR, ".lua");
     if (ret != PM3_SUCCESS)
         return ret;
-    return searchAndList(CMD_SCRIPTS_SUBDIR, ".cmd");
+    
+    ret = searchAndList(CMD_SCRIPTS_SUBDIR, ".cmd");
+    if (ret != PM3_SUCCESS)
+        return ret;
+   
+    return searchAndList(PYTHON_SCRIPTS_SUBDIR, ".py");
 }
 
 /**
@@ -54,9 +72,18 @@ static int CmdScriptRun(const char *Cmd) {
     int arg_len = 0;
     static uint8_t luascriptfile_idx = 0;
     sscanf(Cmd, "%127s%n %255[^\n\r]%n", preferredName, &name_len, arguments, &arg_len);
-
+    
+    char *extension_chk;
+    extension_chk = str_dup(preferredName);
+    str_lower(extension_chk);
+    pm3_scriptfile_t ext = PM3_LUA;
+    if (str_endswith(preferredName, ".cmd"))
+        ext = PM3_CMD;
+    if (str_endswith(preferredName, ".py"))
+        ext = PM3_PY;
+        
     char *script_path = NULL;
-    if ((!str_endswith(preferredName, ".cmd")) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) {
+    if ((ext == PM3_LUA) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) {
         int error;
         if (luascriptfile_idx == MAX_NESTED_LUASCRIPT) {
             PrintAndLogEx(ERR, "too many nested scripts, skipping %s\n", script_path);
@@ -112,7 +139,7 @@ static int CmdScriptRun(const char *Cmd) {
         return PM3_SUCCESS;
     }
 
-    if ((!str_endswith(preferredName, ".lua")) && (searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", true) == PM3_SUCCESS)) {
+    if ((ext == PM3_CMD) && (searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", true) == PM3_SUCCESS)) {
 
         PrintAndLogEx(SUCCESS, "executing Cmd " _YELLOW_("%s"), script_path);
         PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
@@ -123,11 +150,83 @@ static int CmdScriptRun(const char *Cmd) {
         free(script_path);
         return ret;
     }
+    
+    /*
+    
+    For apt (Ubuntu, Debian...):
+        sudo apt-get install python3-dev  # for python3.x installs
+
+    For yum (CentOS, RHEL...):
+        sudo yum install python3-devel   # for python3.x installs
+
+    For dnf (Fedora...):
+        sudo dnf install python3-devel  # for python3.x installs
+
+    For zypper (openSUSE...):
+        sudo zypper in python3-devel  # for python3.x installs
+
+    For apk (Alpine...):
+
+        # This is a departure from the normal Alpine naming
+        # scheme, which uses py2- and py3- prefixes
+
+        sudo apk add python3-dev  # for python3.x installs
+
+    For apt-cyg (Cygwin...):
+        apt-cyg install python3-devel  # for python3.x installs
+        
+    */
+
+    if ((ext == PM3_PY) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
+
+        PrintAndLogEx(SUCCESS, "executing python s " _YELLOW_("%s"), script_path);
+        PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
+
+        wchar_t *program = Py_DecodeLocale(script_path, NULL);
+        if (program == NULL) {
+            PrintAndLogEx(ERR, "could not decode " _YELLOW_("%s"), script_path);
+            free(script_path);
+            return PM3_ESOFT;
+        }
+
+        // optional but recommended
+        Py_SetProgramName(program);
+        Py_Initialize();
+//        PySys_SetArgv(arguments, script_path);  // we dont have  argc , argv here
+        
+        FILE *f = fopen(script_path, "r");
+        if (f == NULL) {
+            PrintAndLogEx(ERR, "could not decode " _YELLOW_("%s"), script_path);
+            free(script_path);
+            return PM3_ESOFT;            
+        }
+
+        PyRun_SimpleFile(f, script_path);
+
+        fclose(f);
+
+        if (Py_FinalizeEx() < 0) {
+            free(script_path);
+            return PM3_ESOFT;
+        }
+        
+        PyMem_RawFree(program);
+        free(script_path);
+        PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), preferredName);
+        return PM3_SUCCESS;
+    }
 
     // file not found, let's search again to display the error messages
     int ret = PM3_EUNDEF;
-    if (!str_endswith(preferredName, ".cmd")) ret = searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", false);
-    if (!str_endswith(preferredName, ".lua")) ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", false);
+    if (ext == PM3_LUA)
+        ret = searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", false);
+
+    if (ext == PM3_CMD)
+        ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", false);
+
+    if (ext == PM3_PY)
+        ret = searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", false);
+
     free(script_path);
     return ret;
 }
@@ -135,7 +234,7 @@ static int CmdScriptRun(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",  CmdHelp,          AlwaysAvailable, "This help"},
     {"list",  CmdScriptList,    AlwaysAvailable, "List available scripts"},
-    {"run",   CmdScriptRun,     AlwaysAvailable, "<name> -- Execute a script"},
+    {"run",   CmdScriptRun,     AlwaysAvailable, "<name> -- execute a script"},
     {NULL, NULL, NULL, NULL}
 };
 

From 00ece05e79b4a74de8dcad1857cb9574a5687276 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 11:30:37 +0200
Subject: [PATCH 03/32] added python3 scripts has their own folder

---
 include/common.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/common.h b/include/common.h
index 4d6efcce2..9f04d75c7 100644
--- a/include/common.h
+++ b/include/common.h
@@ -24,6 +24,7 @@
 #define PM3_USER_DIRECTORY   PATHSEP ".proxmark3" PATHSEP
 
 // PM3 subdirectories:
+#define PYTHON_SCRIPTS_SUBDIR "pyscripts" PATHSEP
 #define CMD_SCRIPTS_SUBDIR   "cmdscripts" PATHSEP
 #define DICTIONARIES_SUBDIR  "dictionaries" PATHSEP
 #define LUA_LIBRARIES_SUBDIR "lualibs" PATHSEP

From 0e57a1c6cda97648ae42d5ac7bf605f28215e154 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 11:48:37 +0200
Subject: [PATCH 04/32] optional python.. Thanks @doegox!

---
 client/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/Makefile b/client/Makefile
index adc07c88b..9ee678a4b 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -293,6 +293,11 @@ ifeq ($(BT_FOUND),1)
     PM3CFLAGS += -DHAVE_BLUEZ
 endif
 
+ifeq ($(PYTHON_FOUND),1)
+    PM3CFLAGS += -DHAVE_PYTHON
+endif
+
+
 CXXFLAGS ?= -Wall -Werror -O3
 PM3CXXFLAGS = $(CXXFLAGS)
 PM3CXXFLAGS += -I../include

From f852bf41c3a5bfde85f3f729bb6da75436839d9a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 11:49:26 +0200
Subject: [PATCH 05/32] adapt to optional python,  Thanks @doegox!

---
 client/src/cmdscript.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index b2ad53f50..0264a16f6 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -13,9 +13,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define PY_SSIZE_T_CLEAN
+#ifdef DHAVE_PYTHON
+//#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <wchar.h>
+#endif
 
 
 #include "cmdparser.h"    // command_t
@@ -79,8 +81,10 @@ static int CmdScriptRun(const char *Cmd) {
     pm3_scriptfile_t ext = PM3_LUA;
     if (str_endswith(preferredName, ".cmd"))
         ext = PM3_CMD;
+#ifdef DHAVE_PYTHON
     if (str_endswith(preferredName, ".py"))
         ext = PM3_PY;
+#endif
         
     char *script_path = NULL;
     if ((ext == PM3_LUA) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) {
@@ -151,8 +155,7 @@ static int CmdScriptRun(const char *Cmd) {
         return ret;
     }
     
-    /*
-    
+    /*    
     For apt (Ubuntu, Debian...):
         sudo apt-get install python3-dev  # for python3.x installs
 
@@ -177,6 +180,7 @@ static int CmdScriptRun(const char *Cmd) {
         
     */
 
+#ifdef DHAVE_PYTHON
     if ((ext == PM3_PY) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
 
         PrintAndLogEx(SUCCESS, "executing python s " _YELLOW_("%s"), script_path);
@@ -215,6 +219,7 @@ static int CmdScriptRun(const char *Cmd) {
         PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), preferredName);
         return PM3_SUCCESS;
     }
+#endif
 
     // file not found, let's search again to display the error messages
     int ret = PM3_EUNDEF;
@@ -223,10 +228,10 @@ static int CmdScriptRun(const char *Cmd) {
 
     if (ext == PM3_CMD)
         ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", false);
-
+#ifdef DHAVE_PYTHON
     if (ext == PM3_PY)
         ret = searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", false);
-
+#endif
     free(script_path);
     return ret;
 }

From 6e3e1baef76bf60a1ff2b256386ba6eea341fb72 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 12:00:42 +0200
Subject: [PATCH 06/32] logsss

---
 client/src/cmdscript.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index 0264a16f6..f8fde1a40 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef DHAVE_PYTHON
+#ifdef HAVE_PYTHON
 //#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <wchar.h>
@@ -79,11 +79,15 @@ static int CmdScriptRun(const char *Cmd) {
     extension_chk = str_dup(preferredName);
     str_lower(extension_chk);
     pm3_scriptfile_t ext = PM3_LUA;
-    if (str_endswith(preferredName, ".cmd"))
+    
+    if (str_endswith(extension_chk, ".cmd"))  {
         ext = PM3_CMD;
-#ifdef DHAVE_PYTHON
-    if (str_endswith(preferredName, ".py"))
+    }
+    
+#ifdef HAVE_PYTHON
+    if (str_endswith(extension_chk, ".py")) {
         ext = PM3_PY;
+    }
 #endif
         
     char *script_path = NULL;
@@ -180,9 +184,15 @@ static int CmdScriptRun(const char *Cmd) {
         
     */
 
-#ifdef DHAVE_PYTHON
+#ifdef HAVE_PYTHON
+
+    PrintAndLogEx(SUCCESS, "script engine detected: %s", ( ext == PM3_PY) ? "PYTHON" : ( ext == PM3_CMD) ? "CMD" : "LUA");
+    PrintAndLogEx(SUCCESS, "script engine,  folder %s", PYTHON_SCRIPTS_SUBDIR);
+    
     if ((ext == PM3_PY) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
 
+        PrintAndLogEx(SUCCESS, "ICE");
+        
         PrintAndLogEx(SUCCESS, "executing python s " _YELLOW_("%s"), script_path);
         PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
 
@@ -200,7 +210,7 @@ static int CmdScriptRun(const char *Cmd) {
         
         FILE *f = fopen(script_path, "r");
         if (f == NULL) {
-            PrintAndLogEx(ERR, "could not decode " _YELLOW_("%s"), script_path);
+            PrintAndLogEx(ERR, "Could open file " _YELLOW_("%s"), script_path);
             free(script_path);
             return PM3_ESOFT;            
         }
@@ -228,7 +238,7 @@ static int CmdScriptRun(const char *Cmd) {
 
     if (ext == PM3_CMD)
         ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", false);
-#ifdef DHAVE_PYTHON
+#ifdef HAVE_PYTHON
     if (ext == PM3_PY)
         ret = searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", false);
 #endif

From 6b8f1b141e9531334123001a3227ecaf62e20341 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 12:07:01 +0200
Subject: [PATCH 07/32] change, search in python dir..

---
 client/src/fileutils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/fileutils.c b/client/src/fileutils.c
index a650e3929..d5315e3b9 100644
--- a/client/src/fileutils.c
+++ b/client/src/fileutils.c
@@ -1446,6 +1446,7 @@ static int searchFinalFile(char **foundpath, const char *pm3dir, const char *sea
              (strcmp(LUA_LIBRARIES_SUBDIR, pm3dir) == 0) ||
              (strcmp(LUA_SCRIPTS_SUBDIR, pm3dir) == 0) ||
              (strcmp(CMD_SCRIPTS_SUBDIR, pm3dir) == 0) ||
+             (strcmp(PYTHON_SCRIPTS_SUBDIR, pm3dir) == 0) ||
              (strcmp(RESOURCES_SUBDIR, pm3dir) == 0))) {
         char *path = calloc(strlen(exec_path) + strlen(pm3dir) + strlen(filename) + 1, sizeof(char));
         if (path == NULL)

From e106a5717c7c464751aa28d1c2160b61992d5f41 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 12:17:41 +0200
Subject: [PATCH 08/32] simple script working

---
 client/pyscripts/ice.py | 5 +++++
 client/src/cmdscript.c  | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 client/pyscripts/ice.py

diff --git a/client/pyscripts/ice.py b/client/pyscripts/ice.py
new file mode 100644
index 000000000..a9d486813
--- /dev/null
+++ b/client/pyscripts/ice.py
@@ -0,0 +1,5 @@
+
+lrc= 0x00
+for i in range(5):
+    lrc ^= 42
+print('\n final LRC XOR byte value: %02X\n' % (lrc))
diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index f8fde1a40..b5929c0ae 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -185,13 +185,8 @@ static int CmdScriptRun(const char *Cmd) {
     */
 
 #ifdef HAVE_PYTHON
-
-    PrintAndLogEx(SUCCESS, "script engine detected: %s", ( ext == PM3_PY) ? "PYTHON" : ( ext == PM3_CMD) ? "CMD" : "LUA");
-    PrintAndLogEx(SUCCESS, "script engine,  folder %s", PYTHON_SCRIPTS_SUBDIR);
     
     if ((ext == PM3_PY) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
-
-        PrintAndLogEx(SUCCESS, "ICE");
         
         PrintAndLogEx(SUCCESS, "executing python s " _YELLOW_("%s"), script_path);
         PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);

From 366ac6a41f8a49b5de09a3555ca0030df200547b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 12:35:26 +0200
Subject: [PATCH 09/32] creating argc/argv

---
 client/src/cmdscript.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index b5929c0ae..52b24562a 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -191,9 +191,9 @@ static int CmdScriptRun(const char *Cmd) {
         PrintAndLogEx(SUCCESS, "executing python s " _YELLOW_("%s"), script_path);
         PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
 
-        wchar_t *program = Py_DecodeLocale(script_path, NULL);
+        wchar_t *program = Py_DecodeLocale(preferredName, NULL);
         if (program == NULL) {
-            PrintAndLogEx(ERR, "could not decode " _YELLOW_("%s"), script_path);
+            PrintAndLogEx(ERR, "could not decode " _YELLOW_("%s"), preferredName);
             free(script_path);
             return PM3_ESOFT;
         }
@@ -201,7 +201,20 @@ static int CmdScriptRun(const char *Cmd) {
         // optional but recommended
         Py_SetProgramName(program);
         Py_Initialize();
-//        PySys_SetArgv(arguments, script_path);  // we dont have  argc , argv here
+
+
+        int argc = 6;
+        wchar_t *args[argc];
+        args[0] = Py_DecodeLocale(preferredName, NULL);
+        args[1] = Py_DecodeLocale("04", NULL);
+        args[2] = Py_DecodeLocale("00", NULL);
+        args[3] = Py_DecodeLocale("80", NULL);
+        args[4] = Py_DecodeLocale("64", NULL);
+        args[5] = Py_DecodeLocale("ba", NULL);
+
+        PySys_SetArgv(argc, args);
+        
+        //PySys_SetArgv(arguments, script_path);
         
         FILE *f = fopen(script_path, "r");
         if (f == NULL) {
@@ -210,7 +223,7 @@ static int CmdScriptRun(const char *Cmd) {
             return PM3_ESOFT;            
         }
 
-        PyRun_SimpleFile(f, script_path);
+        PyRun_SimpleFile(f, preferredName);
 
         fclose(f);
 

From 4aa40061671fbfaa8564a3fe8aebc1d813e2ffd9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 13:09:18 +0200
Subject: [PATCH 10/32] chg,  python should close the script file

---
 client/src/cmdscript.c | 61 +++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 15 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index 52b24562a..6fef662f3 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -36,11 +36,39 @@
 typedef enum {
     PM3_LUA,
     PM3_CMD,
+#ifdef HAVE_PYTHON    
     PM3_PY
+#endif    
 } pm3_scriptfile_t;
 
 static int CmdHelp(const char *Cmd);
 
+#ifdef HAVE_PYTHON
+static int split(char *str, char **arr) {
+    int begin_index = 0;
+    int word_cnt = 0;
+
+    while (1) {
+        while (isspace(str[begin_index])) {
+            ++begin_index;
+        }
+        if (str[begin_index] == '\0') {
+            break;
+        }
+        int end_index = begin_index;
+        while (str[end_index] && !isspace(str[end_index])) {
+            ++end_index;
+        }
+        int len = end_index - begin_index;
+        char *tmp = calloc(len + 1, sizeof(char));
+        memcpy(tmp, &str[begin_index], len);
+        arr[word_cnt++] = tmp;
+        begin_index = end_index;
+    }
+    return word_cnt;
+}
+#endif
+
 /**
 * Generate a sorted list of available commands, what it does is
 * generate a file listing of the script-directory for files
@@ -188,7 +216,7 @@ static int CmdScriptRun(const char *Cmd) {
     
     if ((ext == PM3_PY) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
         
-        PrintAndLogEx(SUCCESS, "executing python s " _YELLOW_("%s"), script_path);
+        PrintAndLogEx(SUCCESS, "executing python " _YELLOW_("%s"), script_path);
         PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
 
         wchar_t *program = Py_DecodeLocale(preferredName, NULL);
@@ -202,19 +230,22 @@ static int CmdScriptRun(const char *Cmd) {
         Py_SetProgramName(program);
         Py_Initialize();
 
+        //int argc, char ** argv
+        char *argv[128];
+        int argc = split(arguments, argv);
+    
+        wchar_t *py_args[argc];
+        py_args[0] = Py_DecodeLocale(preferredName, NULL);
+        for (int i = 0; i < argc; i++) {
+            py_args[i+1] = Py_DecodeLocale(argv[i], NULL);
+        }
 
-        int argc = 6;
-        wchar_t *args[argc];
-        args[0] = Py_DecodeLocale(preferredName, NULL);
-        args[1] = Py_DecodeLocale("04", NULL);
-        args[2] = Py_DecodeLocale("00", NULL);
-        args[3] = Py_DecodeLocale("80", NULL);
-        args[4] = Py_DecodeLocale("64", NULL);
-        args[5] = Py_DecodeLocale("ba", NULL);
-
-        PySys_SetArgv(argc, args);
+        PySys_SetArgv(argc, py_args);
         
-        //PySys_SetArgv(arguments, script_path);
+        // clean up
+        for (int i = 0; i < argc; ++i) {
+            free(argv[i]);
+        }
         
         FILE *f = fopen(script_path, "r");
         if (f == NULL) {
@@ -223,9 +254,9 @@ static int CmdScriptRun(const char *Cmd) {
             return PM3_ESOFT;            
         }
 
-        PyRun_SimpleFile(f, preferredName);
-
-        fclose(f);
+        // to we need to manually call all importmodules?
+        //PyImport_ImportModule("requests");
+        PyRun_SimpleFileExFlags(f, preferredName, 1, NULL);
 
         if (Py_FinalizeEx() < 0) {
             free(script_path);

From 5fcb031a681403d0a1d23b7f089a1e45cfc298c3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 13:10:33 +0200
Subject: [PATCH 11/32] chg, python scripts can not have "exit" calls...

---
 client/pyscripts/xorcheck.py | 51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100755 client/pyscripts/xorcheck.py

diff --git a/client/pyscripts/xorcheck.py b/client/pyscripts/xorcheck.py
new file mode 100755
index 000000000..f4605a5e7
--- /dev/null
+++ b/client/pyscripts/xorcheck.py
@@ -0,0 +1,51 @@
+#  xorcheck.py - find xor values for 8-bit LRC
+#
+#  Adam Laurie <adam@algroup.co.uk>
+#  http://rfidiot.org/
+#
+#  This code is copyright (c) Adam Laurie, 2009, All rights reserved.
+#  For non-commercial use only, the following terms apply - for all other
+#  uses, please contact the author:
+#
+#    This code is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This code is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+# 2020, Modified (@iceman1001)
+
+import sys
+
+def main():
+    if(len(sys.argv) < 3):
+        print("""
+    \t{0} - Generate final byte for XOR LRC
+
+    Usage: {0} <ID Byte1> <ID Byte2> ... <LRC>
+
+    \tSpecifying the bytes of a UID with a known LRC will find the last byte value
+    \tneeded to generate that LRC with a rolling XOR. All bytes should be specified in HEX.
+
+    Example:
+
+    \t{0} 04 00 80 64 ba
+
+    Should produce the output:
+
+    \tTarget (BA) requires final LRC XOR byte value: 5A\n""".format(sys.argv[0]))
+        return 0
+
+    target= int(sys.argv[len(sys.argv) - 1],16)
+
+    lrc= 0x00
+    for i in range(len(sys.argv) - 1):
+        lrc ^= int(sys.argv[i + 1],16)
+    print('\nTarget (%02X) requires final LRC XOR byte value: %02X\n' % (target,lrc))
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file

From 3f02fa6e34844ef7c0e170b863e2e3a7c1e5fc46 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 13:37:28 +0200
Subject: [PATCH 12/32] chg,  right number of args..

---
 client/src/cmdscript.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index 6fef662f3..4bbe3b631 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -233,14 +233,14 @@ static int CmdScriptRun(const char *Cmd) {
         //int argc, char ** argv
         char *argv[128];
         int argc = split(arguments, argv);
-    
+   
         wchar_t *py_args[argc];
         py_args[0] = Py_DecodeLocale(preferredName, NULL);
         for (int i = 0; i < argc; i++) {
             py_args[i+1] = Py_DecodeLocale(argv[i], NULL);
         }
 
-        PySys_SetArgv(argc, py_args);
+        PySys_SetArgv(argc+1, py_args);
         
         // clean up
         for (int i = 0; i < argc; ++i) {

From f7537519ff10909349fd1ea47372e69dd44f7966 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 14:41:58 +0200
Subject: [PATCH 13/32] chg, make python aware of pm3 search paths

---
 client/pyscripts/ice.py |  7 +++--
 client/src/cmdscript.c  | 58 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/client/pyscripts/ice.py b/client/pyscripts/ice.py
index a9d486813..9a223a059 100644
--- a/client/pyscripts/ice.py
+++ b/client/pyscripts/ice.py
@@ -1,5 +1,4 @@
+import os
+import sys
 
-lrc= 0x00
-for i in range(5):
-    lrc ^= 42
-print('\n final LRC XOR byte value: %02X\n' % (lrc))
+print("SP %s" % sys.path)
diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index 4bbe3b631..cad94cafe 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -44,6 +44,9 @@ typedef enum {
 static int CmdHelp(const char *Cmd);
 
 #ifdef HAVE_PYTHON
+
+#define PYTHON_LIBRARIES_WILDCARD  "?.py"
+
 static int split(char *str, char **arr) {
     int begin_index = 0;
     int word_cnt = 0;
@@ -67,6 +70,58 @@ static int split(char *str, char **arr) {
     }
     return word_cnt;
 }
+
+static void set_python_path(char *path) {
+    PyObject *syspath = PySys_GetObject("path");
+    if (syspath == 0) {
+        PrintAndLogEx(WARNING, "Python failed to getobject");
+    }
+    
+    PyObject *pName = PyUnicode_FromString(path);
+    if (PyList_Insert(syspath, 0, pName)) {
+        PrintAndLogEx(WARNING, "Error inserting extra path into sys.path list");
+    }
+    
+    if (PySys_SetObject("path", syspath)) {
+        PrintAndLogEx(WARNING,"Error setting sys.path object");
+    }
+}
+
+static void set_python_paths(void) {
+    //--add to the LUA_PATH (package.path in lua)
+    // so we can load scripts from various places:
+    const char *exec_path = get_my_executable_directory();
+    if (exec_path != NULL) {
+        // from the ./luascripts/ directory
+        char scripts_path[strlen(exec_path) + strlen(PYTHON_SCRIPTS_SUBDIR) + strlen(PYTHON_LIBRARIES_WILDCARD) + 1];
+        strcpy(scripts_path, exec_path);
+        strcat(scripts_path, PYTHON_SCRIPTS_SUBDIR);
+//        strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
+        set_python_path(scripts_path);
+    }
+
+    const char *user_path = get_my_user_directory();
+    if (user_path != NULL) {
+        // from the $HOME/.proxmark3/luascripts/ directory
+        char scripts_path[strlen(user_path) + strlen(PM3_USER_DIRECTORY) + strlen(PYTHON_SCRIPTS_SUBDIR) + strlen(PYTHON_LIBRARIES_WILDCARD) + 1];
+        strcpy(scripts_path, user_path);
+        strcat(scripts_path, PM3_USER_DIRECTORY);
+        strcat(scripts_path, PYTHON_SCRIPTS_SUBDIR);
+//        strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
+        set_python_path(scripts_path);
+
+    }
+
+    if (exec_path != NULL) {
+        // from the $PREFIX/share/proxmark3/luascripts/ directory
+        char scripts_path[strlen(exec_path) + strlen(PM3_SHARE_RELPATH) + strlen(PYTHON_SCRIPTS_SUBDIR) + strlen(PYTHON_LIBRARIES_WILDCARD) + 1];
+        strcpy(scripts_path, exec_path);
+        strcat(scripts_path, PM3_SHARE_RELPATH);
+        strcat(scripts_path, PYTHON_SCRIPTS_SUBDIR);
+//        strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
+        set_python_path(scripts_path);
+    }
+}
 #endif
 
 /**
@@ -247,6 +302,9 @@ static int CmdScriptRun(const char *Cmd) {
             free(argv[i]);
         }
         
+        // setup search paths.
+        set_python_paths();
+        
         FILE *f = fopen(script_path, "r");
         if (f == NULL) {
             PrintAndLogEx(ERR, "Could open file " _YELLOW_("%s"), script_path);

From 698a56a91978c02cd0665eed2af6fc81bcf1be35 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 14:43:40 +0200
Subject: [PATCH 14/32] moved and modified some existing pyton scripts for
 testing

---
 client/pyscripts/findbits.py         | 99 ++++++++++++++++++++++++++++
 client/pyscripts/parity.py           | 78 ++++++++++++++++++++++
 client/pyscripts/pm3_eml2mfd.py      | 26 ++++++++
 client/pyscripts/pm3_eml_mfd_test.py | 51 ++++++++++++++
 client/pyscripts/pm3_mfd2eml.py      | 28 ++++++++
 5 files changed, 282 insertions(+)
 create mode 100755 client/pyscripts/findbits.py
 create mode 100644 client/pyscripts/parity.py
 create mode 100755 client/pyscripts/pm3_eml2mfd.py
 create mode 100755 client/pyscripts/pm3_eml_mfd_test.py
 create mode 100755 client/pyscripts/pm3_mfd2eml.py

diff --git a/client/pyscripts/findbits.py b/client/pyscripts/findbits.py
new file mode 100755
index 000000000..809465a2e
--- /dev/null
+++ b/client/pyscripts/findbits.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+
+#  findbits.py - find Binary, Octal, Decimal or Hex number in bitstream
+#
+#  Adam Laurie <adam@algroup.co.uk>
+#  http://rfidiot.org/
+#
+#  This code is copyright (c) Adam Laurie, 2009, All rights reserved.
+#  For non-commercial use only, the following terms apply - for all other
+#  uses, please contact the author:
+#
+#    This code is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This code is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+
+import sys
+import os
+
+# invert binary string
+def invert(data):
+    return ''.join('0' if c == '1' else '1' for c in data)
+
+# do the actual search
+def search(target,data):
+    location = data.find(target)
+    if location >= 0:
+        print('*** Match at bit {:d}: {}<{}>{}'.format(location, data[:location],target,data[location+len(target):]))
+    else:
+        print('Not found')
+
+# convert integer to binary string
+def binstring(number):
+    return bin(number)[2:] if number > 0 else ''
+
+# reverse string order
+def stringreverse(data):
+    return data[::-1]
+
+# match forward, backward and inverted
+def domatch(binary,number):
+    reversed= stringreverse(number)
+    inverted= invert(binary)
+
+    print('  Forward: (%s) ' % number, end = '')
+    search(binary,number)
+    print('  Reverse: (%s) ' % reversed, end = '')
+    search(binary,reversed)
+    print('  Inverse: (%s) ' % inverted)
+    print('    Forward: (%s) ' % number, end = '')
+    search(inverted,number)
+    print('    Reverse: (%s) ' % reversed, end = '')
+    search(inverted,reversed)
+
+def main():
+    if(len(sys.argv) < 3):
+        print("""
+\t{0} - Search bitstream for a known number
+
+Usage: {0} <NUMBER> <BITSTREAM>
+
+\tNUMBER will be converted to it\'s BINARY equivalent for all valid
+\tinstances of BINARY, OCTAL, DECIMAL and HEX, and the bitstream
+\tand it\'s inverse will be searched for a pattern match. Note that
+\tNUMBER must be specified in BINARY to match leading zeros.
+
+Example:
+
+\t{0} 73 0110010101110011
+""".format(sys.argv[0]))
+        os._exit(True)
+
+    bases=    {
+        2:'BINARY',
+        8:'OCTAL',
+        10:'DECIMAL',
+        16:'HEX',
+            }
+
+    for base, base_name in sorted(bases.items()):
+        try:
+            number= int(sys.argv[1],base)
+            print('\nTrying ' + base_name)
+            # do BINARY as specified to preserve leading zeros
+            if base == 2:
+                domatch(sys.argv[1],sys.argv[2])
+            else:
+                domatch(binstring(number),sys.argv[2])
+        except:
+            continue
+
+if __name__ == '__main__':
+    main()
diff --git a/client/pyscripts/parity.py b/client/pyscripts/parity.py
new file mode 100644
index 000000000..6be9d979d
--- /dev/null
+++ b/client/pyscripts/parity.py
@@ -0,0 +1,78 @@
+# This code is contributed by
+# Shubham Singh(SHUBHAMSINGH10)
+# 2020, modified (@iceman1001)
+
+import sys
+
+# Python3 program to illustrate Compute the
+# parity of a number using XOR
+# Generating the look-up table while pre-processing
+def P2(n, table):
+    table.extend([n, n ^ 1, n ^ 1, n])
+def P4(n, table):
+    return (P2(n, table), P2(n ^ 1, table),
+            P2(n ^ 1, table), P2(n, table))
+def P6(n, table):
+    return (P4(n, table), P4(n ^ 1, table),
+            P4(n ^ 1, table), P4(n, table))
+def LOOK_UP(table):
+    return (P6(0, table), P6(1, table),
+            P6(1, table), P6(0, table))
+
+# LOOK_UP is the macro expansion to generate the table
+table = [0] * 256
+LOOK_UP(table)
+
+# Function to find the parity
+def Parity(num) :
+    # Number is considered to be of 32 bits
+    max = 16
+
+    # Dividing the number o 8-bit
+    # chunks while performing X-OR
+    while (max >= 8):
+        num = num ^ (num >> max)
+        max = max // 2
+
+    # Masking the number with 0xff (11111111)
+    # to produce valid 8-bit result
+    return table[num & 0xff]
+
+def main():
+    if(len(sys.argv) < 2):
+        print("""
+    \t{0} - Calculate parity of a given number
+
+    Usage: {0} <2,10,16> <number>
+
+    \t Specify type as in 2 Bin, 10 Decimal, 16 Hex, and  number in that particular format
+    \t number can only be 32bit long.
+
+    Example:
+
+    \t{0} 10 1234
+
+    Should produce the output:
+
+    \tOdd parity\n""".format(sys.argv[0]))
+        return 0
+
+
+    numtype=  int(sys.argv[1], 10)
+    print("numtype: {0}".format(numtype))
+    input= int(sys.argv[2], numtype)
+    print("num: {0} 0x{0:X}".format(input))
+
+    #num = "001111100010100011101010111101011110"
+    # Result is 1 for odd parity
+    # 0 for even parity
+#    result = Parity( int(input, numtype) )
+    result = Parity(input)
+    print("Odd parity") if result else print("Even parity")
+
+
+if __name__ == "__main__":
+    main()
+
+
+
diff --git a/client/pyscripts/pm3_eml2mfd.py b/client/pyscripts/pm3_eml2mfd.py
new file mode 100755
index 000000000..90803cf5e
--- /dev/null
+++ b/client/pyscripts/pm3_eml2mfd.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+
+'''
+# Andrei Costin <zveriu@gmail.com>, 2011
+# pm3_eml2mfd.py
+# Converts PM3 Mifare Classic emulator EML text file to MFD binary dump file
+'''
+
+import sys
+import binascii
+
+def main(argv):
+    argc = len(argv)
+    if argc < 3:
+        print('Usage:', argv[0], 'input.eml output.mfd')
+        return 1
+
+    with open(argv[1], "r") as file_inp, open(argv[2], "wb") as file_out:
+        for line in file_inp:
+            line = line.rstrip('\n').rstrip('\r')
+            print(line)
+            data = binascii.unhexlify(line)
+            file_out.write(data)
+
+if __name__ == '__main__':
+    main(sys.argv)
diff --git a/client/pyscripts/pm3_eml_mfd_test.py b/client/pyscripts/pm3_eml_mfd_test.py
new file mode 100755
index 000000000..8fae5965e
--- /dev/null
+++ b/client/pyscripts/pm3_eml_mfd_test.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+
+from tempfile import mkdtemp
+from shutil import rmtree
+from string import hexdigits
+import unittest, os
+import pm3_eml2mfd, pm3_mfd2eml
+
+class TestEmlMfd(unittest.TestCase):
+    def setUp(self):
+        self.tmpdir = mkdtemp()
+
+    def tearDown(self):
+        rmtree(self.tmpdir)
+
+    EML2MFD_TESTCASES = [
+            ('', ''),
+            ("41424344\r\n45464748\n494A4B4C\n", "ABCDEFGHIJKL")
+            ]
+    def test_eml2mfd(self):
+        self.three_argument_test(pm3_eml2mfd.main, self.EML2MFD_TESTCASES)
+
+    def test_mfd2eml(self):
+        self.three_argument_test(pm3_mfd2eml.main,
+                map(reversed, self.EML2MFD_TESTCASES), c14n=hex_c14n)
+
+    def three_argument_test(self, operation, cases, c14n=str):
+        for case_input, case_output in cases:
+            try:
+                inp_name = os.path.join(self.tmpdir, 'input')
+                out_name = os.path.join(self.tmpdir, 'output')
+                with open(inp_name, 'w') as in_file:
+                    in_file.write(case_input)
+                operation(['', inp_name, out_name])
+                with open(out_name, 'r') as out_file:
+                    self.assertEqual(c14n(case_output), c14n(out_file.read()))
+            finally:
+                for file_name in inp_name, out_name:
+                    if os.path.exists(file_name):
+                        os.remove(file_name)
+
+
+def hex_c14n(inp):
+    """
+    Canonicalizes the input string by removing non-hexadecimal
+    characters and making everything uppercase
+    """
+    return ''.join(c.upper() for c in inp if c in hexdigits)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/client/pyscripts/pm3_mfd2eml.py b/client/pyscripts/pm3_mfd2eml.py
new file mode 100755
index 000000000..ae7a79825
--- /dev/null
+++ b/client/pyscripts/pm3_mfd2eml.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+'''
+# Andrei Costin <zveriu@gmail.com>, 2011
+# pm3_eml2mfd.py
+# Converts PM3 Mifare Classic MFD binary dump file to emulator EML text file
+'''
+import sys
+
+READ_BLOCKSIZE = 16
+
+def main(argv):
+    argc = len(argv)
+    if argc < 3:
+        print('Usage:', argv[0], 'input.mfd output.eml')
+        return 1
+
+    with open(argv[1], "rb") as file_inp, open(argv[2], "w") as file_out:
+        while True:
+            byte_s = file_inp.read(READ_BLOCKSIZE)
+            if not byte_s:
+                break
+            hex_char_repr = byte_s.hex()
+            file_out.write(hex_char_repr)
+            file_out.write("\n")
+
+if __name__ == '__main__':
+    main(sys.argv)

From 748c0772680725f4e6073cd6d6d522dc142dd823 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 15:49:28 +0200
Subject: [PATCH 15/32] chg,  python3 in cmake?

---
 client/CMakeLists.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 64cfca623..3938f76d5 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -38,6 +38,8 @@ endforeach()
 find_package(PkgConfig)
 pkg_search_module(BLUEZ QUIET bluez)
 
+pkg_search_module(PYTHON3 QUIET python3)
+
 SET (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 add_subdirectory(deps)
@@ -224,6 +226,14 @@ if (BLUEZ_FOUND)
     set(ADDITIONAL_LNK bluetooth ${ADDITIONAL_LNK})
 endif (BLUEZ_FOUND)
 
+if (PYTHON3_FOUND)
+    message("Python3 library found, building with python3 support :)")
+    add_definitions("-DHAVE_PYTHON")
+#    include_directories ( ${PYTHON_INCLUDE_DIRS} )
+    set(ADDITIONAL_LNK python3 ${PYTHON_LIBRARIES})
+endif (PYTHON3_FOUND)
+
+
 add_executable(
         proxmark3
         ${TARGET_SOURCES}
@@ -286,7 +296,7 @@ target_link_libraries(proxmark3 PRIVATE
         ${ADDITIONAL_LNK})
 
 install(TARGETS proxmark3 DESTINATION "bin")
-install(DIRECTORY cmdscripts lualibs luascripts resources dictionaries DESTINATION "share/proxmark3")
+install(DIRECTORY cmdscripts lualibs luascripts pyscripts resources dictionaries DESTINATION "share/proxmark3")
 
 add_custom_command(OUTPUT lualibs/pm3_cmd.lua
         COMMAND "awk -f pm3_cmd_h2lua.awk ../include/pm3_cmd.h >  lualibs/pm3_cmd.lua"

From e7230fa5d7a3a17b3e26a4add3bc1dd98a09413c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 16:47:54 +0200
Subject: [PATCH 16/32] chg,  cmake woodo. almost there

---
 client/CMakeLists.txt | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 3938f76d5..20cb1cbbe 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -37,7 +37,6 @@ endforeach()
 
 find_package(PkgConfig)
 pkg_search_module(BLUEZ QUIET bluez)
-
 pkg_search_module(PYTHON3 QUIET python3)
 
 SET (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -190,7 +189,6 @@ add_custom_command(
 
 set(ADDITIONAL_SRC "")
 set(ADDITIONAL_LNK "")
-
 set(X86_CPUS x86 x86_64 i686)
 
 message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}")
@@ -229,10 +227,19 @@ endif (BLUEZ_FOUND)
 if (PYTHON3_FOUND)
     message("Python3 library found, building with python3 support :)")
     add_definitions("-DHAVE_PYTHON")
-#    include_directories ( ${PYTHON_INCLUDE_DIRS} )
-    set(ADDITIONAL_LNK python3 ${PYTHON_LIBRARIES})
-endif (PYTHON3_FOUND)
 
+    #PYTHON3_LIBRARIES      ... only the libraries (w/o the '-l')
+    #PYTHON3_LIBRARY_DIRS   ... the paths of the libraries (w/o the '-L')
+    #PYTHON3_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
+
+    message(STATUS "PYTHON3 LIBS := ${PYTHON3_LIBRARIES}")    
+    message(STATUS "PYTHON3 INC DIRS := ${PYTHON3_INCLUDE_DIRS}")
+    
+    set(ADDITIONAL_LNK ${ADDITIONAL_LNK} ${PYTHON3_LIBRARIES})
+    
+#PYTHONINCLUDES = pkg-config --cflags python3    == -I/usr/include/python3.6m -I/usr/include/x86_64-linux-gnu/python3.6m
+#PYTHONLDLIBS = pkg-config --libs python3        == -lpython3.6m
+endif (PYTHON3_FOUND)
 
 add_executable(
         proxmark3

From feafa62dede43839704cc4f70e7698f4ebeb2a9b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 16:57:54 +0200
Subject: [PATCH 17/32] chg,  cmake compiles

---
 client/CMakeLists.txt | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 20cb1cbbe..285a20144 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -189,6 +189,7 @@ add_custom_command(
 
 set(ADDITIONAL_SRC "")
 set(ADDITIONAL_LNK "")
+set(ADDITIONAL_DIRS "")
 set(X86_CPUS x86 x86_64 i686)
 
 message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}")
@@ -227,18 +228,8 @@ endif (BLUEZ_FOUND)
 if (PYTHON3_FOUND)
     message("Python3 library found, building with python3 support :)")
     add_definitions("-DHAVE_PYTHON")
-
-    #PYTHON3_LIBRARIES      ... only the libraries (w/o the '-l')
-    #PYTHON3_LIBRARY_DIRS   ... the paths of the libraries (w/o the '-L')
-    #PYTHON3_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
-
-    message(STATUS "PYTHON3 LIBS := ${PYTHON3_LIBRARIES}")    
-    message(STATUS "PYTHON3 INC DIRS := ${PYTHON3_INCLUDE_DIRS}")
-    
+    set(ADDITIONAL_DIRS ${ADDITIONAL_DIRS} ${PYTHON3_INCLUDE_DIRS})
     set(ADDITIONAL_LNK ${ADDITIONAL_LNK} ${PYTHON3_LIBRARIES})
-    
-#PYTHONINCLUDES = pkg-config --cflags python3    == -I/usr/include/python3.6m -I/usr/include/x86_64-linux-gnu/python3.6m
-#PYTHONLDLIBS = pkg-config --libs python3        == -lpython3.6m
 endif (PYTHON3_FOUND)
 
 add_executable(
@@ -265,6 +256,7 @@ target_include_directories(proxmark3 PRIVATE
         ../common_fpga
         ../include
         src
+        ${ADDITIONAL_DIRS}
 )
 
 if (APPLE)

From 9edb30f1665a97861ad6b49a5ef280dd78c75c76 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 17:01:53 +0200
Subject: [PATCH 18/32] chg,  python3-embed checks (@doegox)

---
 client/Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/Makefile b/client/Makefile
index 9ee678a4b..70f45ca81 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -136,13 +136,20 @@ LDLIBS += $(LUALIB)
 INCLUDES += $(LUALIBINC)
 
 ## Python3
-#PYTHON_CONFIG := python3-config
 PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3 2>/dev/null)
 PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3 2>/dev/null)
 ifneq ($(PYTHONLDLIBS),)
     PYTHONLIB = $(PYTHONLDLIBS)
     PYTHONLIBINC = $(PYTHONINCLUDES)
     PYTHON_FOUND = 1
+else
+    PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3-embed 2>/dev/null)
+    PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3-embed 2>/dev/null)
+    ifneq ($(PYTHONLDLIBS),)
+        PYTHONLIB = $(PYTHONLDLIBS)
+        PYTHONLIBINC = $(PYTHONINCLUDES)
+        PYTHON_FOUND = 1
+    endif
 endif
 LDLIBS += $(PYTHONLIB)
 INCLUDES += $(PYTHONLIBINC)

From 6feb408071ba34c50d69cfb91dd812e63c26b3d6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 17:15:42 +0200
Subject: [PATCH 19/32] travis needs dev...

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ad23bf6f8..7f3d79a46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ addons:
       - gcc-arm-none-eabi
       - libnewlib-dev
       - libbluetooth-dev
+      - python3-dev
   homebrew:
     packages:
       - readline

From 646a4cc4a6a4f1ec214047bd37663825b15823b3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 17:32:16 +0200
Subject: [PATCH 20/32] more version info

---
 client/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 70f45ca81..28ac1f87c 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -373,9 +373,9 @@ else
 endif
 
 ifeq ($(PYTHON_FOUND),1)
-    $(info Python library:    system library found)
+    $(info Python3 version:   Python3 v${shell pkg-config --modversion python3} found, enabled)
 else
-    $(info Python library:    system library not found, disabled)
+    $(info Python library:    Python3 not found, disabled)
 endif
 
 ifeq ($(SKIPWHEREAMISYSTEM),1)

From 176f0dfe757525e1560fe44d55863b037c198b72 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 17:35:27 +0200
Subject: [PATCH 21/32] chg, function available in v3.6  Travis has v3.5...

---
 client/src/cmdscript.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index cad94cafe..07764db88 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -316,10 +316,7 @@ static int CmdScriptRun(const char *Cmd) {
         //PyImport_ImportModule("requests");
         PyRun_SimpleFileExFlags(f, preferredName, 1, NULL);
 
-        if (Py_FinalizeEx() < 0) {
-            free(script_path);
-            return PM3_ESOFT;
-        }
+        Py_Finalize();
         
         PyMem_RawFree(program);
         free(script_path);

From 0464fd476ba9476288915d3cf41988bb07e26520 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 26 May 2020 17:37:03 +0200
Subject: [PATCH 22/32] Makefile python

---
 client/Makefile                   | 60 +++++++++++++++----------------
 doc/md/Development/Maintainers.md |  1 +
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 28ac1f87c..bbaee39b0 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -135,25 +135,6 @@ endif
 LDLIBS += $(LUALIB)
 INCLUDES += $(LUALIBINC)
 
-## Python3
-PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3 2>/dev/null)
-PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3 2>/dev/null)
-ifneq ($(PYTHONLDLIBS),)
-    PYTHONLIB = $(PYTHONLDLIBS)
-    PYTHONLIBINC = $(PYTHONINCLUDES)
-    PYTHON_FOUND = 1
-else
-    PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3-embed 2>/dev/null)
-    PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3-embed 2>/dev/null)
-    ifneq ($(PYTHONLDLIBS),)
-        PYTHONLIB = $(PYTHONLDLIBS)
-        PYTHONLIBINC = $(PYTHONINCLUDES)
-        PYTHON_FOUND = 1
-    endif
-endif
-LDLIBS += $(PYTHONLIB)
-INCLUDES += $(PYTHONLIBINC)
-
 ## mbed TLS
 # system library cannot be used because it is compiled by default without CMAC support
 LDLIBS +=$(MBEDTLSLIB)
@@ -219,13 +200,6 @@ endif
 LDLIBS += $(BTLIB)
 INCLUDES += $(BTLIBINC)
 
-## Readline
-ifeq ($(platform),Darwin)
-    LDLIBS += -L/usr/local/opt/readline/lib
-    INCLUDES += -I/usr/local/opt/readline/include
-endif
-LDLIBS += -lreadline
-
 ## Math
 LDLIBS += -lm
 
@@ -235,6 +209,28 @@ ifneq ($(SKIPPTHREAD),1)
     LDLIBS += -lpthread
 endif
 
+## Python3 (optional)
+ifneq ($(SKIPPYTHON),1)
+    PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3 2>/dev/null)
+    PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3 2>/dev/null)
+    ifneq ($(PYTHONLDLIBS),)
+        PYTHONLIB = $(PYTHONLDLIBS)
+        PYTHONLIBINC = $(PYTHONINCLUDES)
+        PYTHON_FOUND = 1
+    else
+        # since python3.8, applications willing to embed python must use -embed:
+        PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3-embed 2>/dev/null)
+        PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3-embed 2>/dev/null)
+        ifneq ($(PYTHONLDLIBS),)
+            PYTHONLIB = $(PYTHONLDLIBS)
+            PYTHONLIBINC = $(PYTHONINCLUDES)
+            PYTHON_FOUND = 1
+        endif
+    endif
+endif
+LDLIBS += $(PYTHONLIB)
+INCLUDES += $(PYTHONLIBINC)
+
 ## QT5 (or QT4 fallback) (optional)
 ifneq ($(SKIPQT),1)
     # Check for correctly configured Qt5
@@ -275,8 +271,12 @@ endif
 LDLIBS += $(QTLDLIBS)
 CXXINCLUDES += $(QTINCLUDES)
 
-## Python
-
+## Readline
+ifeq ($(platform),Darwin)
+    LDLIBS += -L/usr/local/opt/readline/lib
+    INCLUDES += -I/usr/local/opt/readline/include
+endif
+LDLIBS += -lreadline
 
 #######################################################################################################
 CFLAGS ?= $(DEFCFLAGS)
@@ -373,9 +373,9 @@ else
 endif
 
 ifeq ($(PYTHON_FOUND),1)
-    $(info Python3 version:   Python3 v${shell pkg-config --modversion python3} found, enabled)
+    $(info Python3 library:   Python3 v$(shell pkg-config --modversion python3) found, enabled)
 else
-    $(info Python library:    Python3 not found, disabled)
+    $(info Python3 library:   Python3 not found, disabled)
 endif
 
 ifeq ($(SKIPWHEREAMISYSTEM),1)
diff --git a/doc/md/Development/Maintainers.md b/doc/md/Development/Maintainers.md
index 0ea33b924..293fd3999 100644
--- a/doc/md/Development/Maintainers.md
+++ b/doc/md/Development/Maintainers.md
@@ -61,6 +61,7 @@ It's also possible to skip parts even if libraries are present in the compilatio
 
 * `make client SKIPQT=1` to skip GUI even if Qt is present
 * `make client SKIPBT=1` to skip native Bluetooth support even if libbluetooth is present
+* `make client SKIPPYTHON=1` to skip embedded Python 3 interpreter even if libpython3 is present
 * `make client SKIPLUASYSTEM=1` to skip system Lua lib even if liblua5.2 is present, use embedded Lua lib instead
 * `make client SKIPJANSSONSYSTEM=1` to skip system Jansson lib even if libjansson is present, use embedded Jansson lib instead
 * `make client SKIPWHEREAMISYSTEM=1` to skip system Whereami lib even if libwhereami is present, use embedded whereami lib instead

From 8498c32a785882fae25072ec65c4be6de9a1b7ab Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 26 May 2020 18:41:24 +0200
Subject: [PATCH 23/32] cmake support python < 3.8 and 3.8

---
 client/CMakeLists.txt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 285a20144..644008497 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -38,6 +38,7 @@ endforeach()
 find_package(PkgConfig)
 pkg_search_module(BLUEZ QUIET bluez)
 pkg_search_module(PYTHON3 QUIET python3)
+pkg_search_module(PYTHON3EMBED QUIET python3-embed)
 
 SET (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
@@ -225,12 +226,17 @@ if (BLUEZ_FOUND)
     set(ADDITIONAL_LNK bluetooth ${ADDITIONAL_LNK})
 endif (BLUEZ_FOUND)
 
-if (PYTHON3_FOUND)
+if (PYTHON3EMBED_FOUND)
     message("Python3 library found, building with python3 support :)")
     add_definitions("-DHAVE_PYTHON")
-    set(ADDITIONAL_DIRS ${ADDITIONAL_DIRS} ${PYTHON3_INCLUDE_DIRS})
-    set(ADDITIONAL_LNK ${ADDITIONAL_LNK} ${PYTHON3_LIBRARIES})
-endif (PYTHON3_FOUND)
+    set(ADDITIONAL_DIRS ${PYTHON3EMBED_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
+    set(ADDITIONAL_LNK ${PYTHON3EMBED_LIBRARIES} ${ADDITIONAL_LNK})
+elseif (PYTHON3_FOUND)
+    message("Python3 library found, building with python3 support :)")
+    add_definitions("-DHAVE_PYTHON")
+    set(ADDITIONAL_DIRS ${PYTHON3_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
+    set(ADDITIONAL_LNK ${PYTHON3_LIBRARIES} ${ADDITIONAL_LNK})
+endif (PYTHON3EMBED_FOUND)
 
 add_executable(
         proxmark3

From 25c5eebfcfbba7a22cc6da726c3705d2d15e5a82 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 26 May 2020 18:54:58 +0200
Subject: [PATCH 24/32] attempt to fix cmake+osx+python

---
 client/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 644008497..baf1dad44 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -231,11 +231,13 @@ if (PYTHON3EMBED_FOUND)
     add_definitions("-DHAVE_PYTHON")
     set(ADDITIONAL_DIRS ${PYTHON3EMBED_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
     set(ADDITIONAL_LNK ${PYTHON3EMBED_LIBRARIES} ${ADDITIONAL_LNK})
+    set(ADDITIONAL_LNKDIRS ${PYTHON3EMBED_LIBRARY_DIRS} ${ADDITIONAL_LNKDIRS})
 elseif (PYTHON3_FOUND)
     message("Python3 library found, building with python3 support :)")
     add_definitions("-DHAVE_PYTHON")
     set(ADDITIONAL_DIRS ${PYTHON3_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
     set(ADDITIONAL_LNK ${PYTHON3_LIBRARIES} ${ADDITIONAL_LNK})
+    set(ADDITIONAL_LNKDIRS ${PYTHON3_LIBRARY_DIRS} ${ADDITIONAL_LNKDIRS})
 endif (PYTHON3EMBED_FOUND)
 
 add_executable(
@@ -300,6 +302,8 @@ target_link_libraries(proxmark3 PRIVATE
         pm3rrg_rdv4_whereami
         ${ADDITIONAL_LNK})
 
+target_link_directories(proxmark3 PRIVATE ${ADDITIONAL_LNKDIRS})
+
 install(TARGETS proxmark3 DESTINATION "bin")
 install(DIRECTORY cmdscripts lualibs luascripts pyscripts resources dictionaries DESTINATION "share/proxmark3")
 

From 1781837bf98fb10a0f31bd0a99be19f4d6220f17 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 21:57:26 +0200
Subject: [PATCH 25/32] chg, cmake for OSX,  (Thanks @doegex!)

---
 client/CMakeLists.txt | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index baf1dad44..505073d7e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -191,6 +191,7 @@ add_custom_command(
 set(ADDITIONAL_SRC "")
 set(ADDITIONAL_LNK "")
 set(ADDITIONAL_DIRS "")
+set(ADDITIONAL_LNKDIRS "")
 set(X86_CPUS x86 x86_64 i686)
 
 message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}")
@@ -227,7 +228,7 @@ if (BLUEZ_FOUND)
 endif (BLUEZ_FOUND)
 
 if (PYTHON3EMBED_FOUND)
-    message("Python3 library found, building with python3 support :)")
+    message("Python3-embed library found, building with python3 support :)")
     add_definitions("-DHAVE_PYTHON")
     set(ADDITIONAL_DIRS ${PYTHON3EMBED_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
     set(ADDITIONAL_LNK ${PYTHON3EMBED_LIBRARIES} ${ADDITIONAL_LNK})
@@ -237,7 +238,7 @@ elseif (PYTHON3_FOUND)
     add_definitions("-DHAVE_PYTHON")
     set(ADDITIONAL_DIRS ${PYTHON3_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
     set(ADDITIONAL_LNK ${PYTHON3_LIBRARIES} ${ADDITIONAL_LNK})
-    set(ADDITIONAL_LNKDIRS ${PYTHON3_LIBRARY_DIRS} ${ADDITIONAL_LNKDIRS})
+    set(ADDITIONAL_LNKDIRS ${PYTHON3_LIBRARY_DIRS} ${ADDITIONAL_LNKDIRS})   
 endif (PYTHON3EMBED_FOUND)
 
 add_executable(
@@ -302,8 +303,15 @@ target_link_libraries(proxmark3 PRIVATE
         pm3rrg_rdv4_whereami
         ${ADDITIONAL_LNK})
 
-target_link_directories(proxmark3 PRIVATE ${ADDITIONAL_LNKDIRS})
-
+# OSX have a hard time compiling python3 dependency with older cmake.
+if (PYTHON3EMBED_FOUND AND PYTHON3_FOUND)
+    if (NOT CMAKE_VERSION VERSION_LESS 3.13)
+           target_link_directories(proxmark3 PRIVATE ${ADDITIONAL_LNKDIRS})
+    elseif (APPLE)
+           message( SEND_ERROR "Your CMAKE version is too old for Apple platform, please update to a version >=3.13" )
+    endif()
+endif()
+    
 install(TARGETS proxmark3 DESTINATION "bin")
 install(DIRECTORY cmdscripts lualibs luascripts pyscripts resources dictionaries DESTINATION "share/proxmark3")
 

From 125e05ec0e6522ba116e8265faa7499a3bf5483b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 26 May 2020 21:58:50 +0200
Subject: [PATCH 26/32] chg, clean up

---
 client/src/cmdscript.c | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index 07764db88..6d95c40ea 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -157,22 +157,22 @@ static int CmdScriptRun(const char *Cmd) {
     int arg_len = 0;
     static uint8_t luascriptfile_idx = 0;
     sscanf(Cmd, "%127s%n %255[^\n\r]%n", preferredName, &name_len, arguments, &arg_len);
-    
+
     char *extension_chk;
     extension_chk = str_dup(preferredName);
     str_lower(extension_chk);
     pm3_scriptfile_t ext = PM3_LUA;
-    
+
     if (str_endswith(extension_chk, ".cmd"))  {
         ext = PM3_CMD;
     }
-    
+
 #ifdef HAVE_PYTHON
     if (str_endswith(extension_chk, ".py")) {
         ext = PM3_PY;
     }
 #endif
-        
+
     char *script_path = NULL;
     if ((ext == PM3_LUA) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) {
         int error;
@@ -241,8 +241,8 @@ static int CmdScriptRun(const char *Cmd) {
         free(script_path);
         return ret;
     }
-    
-    /*    
+
+    /*
     For apt (Ubuntu, Debian...):
         sudo apt-get install python3-dev  # for python3.x installs
 
@@ -264,13 +264,12 @@ static int CmdScriptRun(const char *Cmd) {
 
     For apt-cyg (Cygwin...):
         apt-cyg install python3-devel  # for python3.x installs
-        
     */
 
 #ifdef HAVE_PYTHON
-    
+
     if ((ext == PM3_PY) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
-        
+
         PrintAndLogEx(SUCCESS, "executing python " _YELLOW_("%s"), script_path);
         PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
 
@@ -288,7 +287,6 @@ static int CmdScriptRun(const char *Cmd) {
         //int argc, char ** argv
         char *argv[128];
         int argc = split(arguments, argv);
-   
         wchar_t *py_args[argc];
         py_args[0] = Py_DecodeLocale(preferredName, NULL);
         for (int i = 0; i < argc; i++) {
@@ -296,28 +294,24 @@ static int CmdScriptRun(const char *Cmd) {
         }
 
         PySys_SetArgv(argc+1, py_args);
-        
+
         // clean up
         for (int i = 0; i < argc; ++i) {
             free(argv[i]);
         }
-        
+
         // setup search paths.
         set_python_paths();
-        
+
         FILE *f = fopen(script_path, "r");
         if (f == NULL) {
             PrintAndLogEx(ERR, "Could open file " _YELLOW_("%s"), script_path);
             free(script_path);
-            return PM3_ESOFT;            
+            return PM3_ESOFT;
         }
 
-        // to we need to manually call all importmodules?
-        //PyImport_ImportModule("requests");
         PyRun_SimpleFileExFlags(f, preferredName, 1, NULL);
-
         Py_Finalize();
-        
         PyMem_RawFree(program);
         free(script_path);
         PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), preferredName);

From 02c76f39e284d36f461173a660de8d48d78df5aa Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 26 May 2020 22:20:34 +0200
Subject: [PATCH 27/32] fix cmake for osx+python

---
 client/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 505073d7e..c01c199d9 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -304,7 +304,7 @@ target_link_libraries(proxmark3 PRIVATE
         ${ADDITIONAL_LNK})
 
 # OSX have a hard time compiling python3 dependency with older cmake.
-if (PYTHON3EMBED_FOUND AND PYTHON3_FOUND)
+if (PYTHON3EMBED_FOUND OR PYTHON3_FOUND)
     if (NOT CMAKE_VERSION VERSION_LESS 3.13)
            target_link_directories(proxmark3 PRIVATE ${ADDITIONAL_LNKDIRS})
     elseif (APPLE)

From 24bdecac8e44e202d2709c78401cc20e62357dea Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 26 May 2020 19:06:08 +0200
Subject: [PATCH 28/32] cmake: use less hardcoded items

---
 client/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index c01c199d9..28735b9b7 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -30,6 +30,7 @@ set(QT_PACKAGELIST
 set(Qt5_FOUND ON)
 foreach(_qt_package IN LISTS QT_PACKAGELIST)
     find_package(${_qt_package} QUIET ${QT_FIND_PACKAGE_OPTIONS})
+    set(Qt5_LIBRARIES ${${_qt_package}_LIBRARIES} ${Qt5_LIBRARIES})
     if(NOT ${_qt_package}_FOUND)
         set(Qt5_FOUND OFF)
     endif(NOT ${_qt_package}_FOUND)
@@ -213,7 +214,7 @@ if (Qt5_FOUND)
             ${TARGET_SOURCES})
 
     add_definitions("-DHAVE_GUI")
-    set(ADDITIONAL_LNK Qt5::Core Qt5::Widgets Qt5::Gui ${ADDITIONAL_LNK})
+    set(ADDITIONAL_LNK ${Qt5_LIBRARIES} ${ADDITIONAL_LNK})
 else (Qt5_FOUND)
     message("Qt5 library not found, not building gui")
     set(TARGET_SOURCES
@@ -224,7 +225,7 @@ endif (Qt5_FOUND)
 if (BLUEZ_FOUND)
     message("Bluez library found, building native Bluetooth support :)")
     add_definitions("-DHAVE_BLUEZ")
-    set(ADDITIONAL_LNK bluetooth ${ADDITIONAL_LNK})
+    set(ADDITIONAL_LNK ${BLUEZ_LIBRARIES} ${ADDITIONAL_LNK})
 endif (BLUEZ_FOUND)
 
 if (PYTHON3EMBED_FOUND)

From b4c715d8fb69f81a7d0abf4d9b0195321c351648 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 27 May 2020 00:40:01 +0200
Subject: [PATCH 29/32] script run: look for all three extensions if not
 specified

---
 client/src/cmdscript.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index 6d95c40ea..c9b485231 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -34,11 +34,12 @@
 #include "fileutils.h"
 
 typedef enum {
+    PM3_UNSPECIFIED,
     PM3_LUA,
     PM3_CMD,
 #ifdef HAVE_PYTHON    
     PM3_PY
-#endif    
+#endif
 } pm3_scriptfile_t;
 
 static int CmdHelp(const char *Cmd);
@@ -161,20 +162,20 @@ static int CmdScriptRun(const char *Cmd) {
     char *extension_chk;
     extension_chk = str_dup(preferredName);
     str_lower(extension_chk);
-    pm3_scriptfile_t ext = PM3_LUA;
-
-    if (str_endswith(extension_chk, ".cmd"))  {
+    pm3_scriptfile_t ext = PM3_UNSPECIFIED;
+    if (str_endswith(extension_chk, ".lua"))  {
+        ext = PM3_LUA;
+    } else if (str_endswith(extension_chk, ".cmd"))  {
         ext = PM3_CMD;
     }
-
 #ifdef HAVE_PYTHON
-    if (str_endswith(extension_chk, ".py")) {
+    else if (str_endswith(extension_chk, ".py")) {
         ext = PM3_PY;
     }
 #endif
 
     char *script_path = NULL;
-    if ((ext == PM3_LUA) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) {
+    if (((ext == PM3_LUA) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) {
         int error;
         if (luascriptfile_idx == MAX_NESTED_LUASCRIPT) {
             PrintAndLogEx(ERR, "too many nested scripts, skipping %s\n", script_path);
@@ -230,7 +231,7 @@ static int CmdScriptRun(const char *Cmd) {
         return PM3_SUCCESS;
     }
 
-    if ((ext == PM3_CMD) && (searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", true) == PM3_SUCCESS)) {
+    if (((ext == PM3_CMD) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", true) == PM3_SUCCESS)) {
 
         PrintAndLogEx(SUCCESS, "executing Cmd " _YELLOW_("%s"), script_path);
         PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
@@ -268,7 +269,7 @@ static int CmdScriptRun(const char *Cmd) {
 
 #ifdef HAVE_PYTHON
 
-    if ((ext == PM3_PY) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
+    if (((ext == PM3_PY)  || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
 
         PrintAndLogEx(SUCCESS, "executing python " _YELLOW_("%s"), script_path);
         PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
@@ -323,13 +324,14 @@ static int CmdScriptRun(const char *Cmd) {
     int ret = PM3_EUNDEF;
     if (ext == PM3_LUA)
         ret = searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", false);
-
-    if (ext == PM3_CMD)
+    else if (ext == PM3_CMD)
         ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", false);
 #ifdef HAVE_PYTHON
-    if (ext == PM3_PY)
+    else if (ext == PM3_PY)
         ret = searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", false);
 #endif
+    else if (ext == PM3_UNSPECIFIED)
+        PrintAndLogEx(FAILED, "Error - can't find %s.[lua|cmd|py]", preferredName);
     free(script_path);
     return ret;
 }

From fcfdd92407f60190b577130d7ae742d740dbbdf7 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 27 May 2020 01:15:20 +0200
Subject: [PATCH 30/32] python: adjust help, hide more if no python available,
 search lua/cmd/py if no extension given

---
 client/Makefile        | 10 +++++++---
 client/src/cmdscript.c | 23 ++++++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index bbaee39b0..52ccfc23f 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -372,10 +372,14 @@ else
     endif
 endif
 
-ifeq ($(PYTHON_FOUND),1)
-    $(info Python3 library:   Python3 v$(shell pkg-config --modversion python3) found, enabled)
+ifeq ($(SKIPPYTHON),1)
+        $(info Python3 library:   skipped)
 else
-    $(info Python3 library:   Python3 not found, disabled)
+    ifeq ($(PYTHON_FOUND),1)
+        $(info Python3 library:   Python3 v$(shell pkg-config --modversion python3) found, enabled)
+    else
+        $(info Python3 library:   Python3 not found, disabled)
+    endif
 endif
 
 ifeq ($(SKIPWHEREAMISYSTEM),1)
diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index c9b485231..bc8116849 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -139,8 +139,11 @@ static int CmdScriptList(const char *Cmd) {
     ret = searchAndList(CMD_SCRIPTS_SUBDIR, ".cmd");
     if (ret != PM3_SUCCESS)
         return ret;
-   
+#ifdef HAVE_PYTHON
     return searchAndList(PYTHON_SCRIPTS_SUBDIR, ".py");
+#else
+    return ret;
+#endif
 }
 
 /**
@@ -158,7 +161,10 @@ static int CmdScriptRun(const char *Cmd) {
     int arg_len = 0;
     static uint8_t luascriptfile_idx = 0;
     sscanf(Cmd, "%127s%n %255[^\n\r]%n", preferredName, &name_len, arguments, &arg_len);
-
+    if (strlen(preferredName) == 0) {
+        PrintAndLogEx(FAILED, "no script name provided");
+        return PM3_EINVARG;
+    }
     char *extension_chk;
     extension_chk = str_dup(preferredName);
     str_lower(extension_chk);
@@ -329,15 +335,18 @@ static int CmdScriptRun(const char *Cmd) {
 #ifdef HAVE_PYTHON
     else if (ext == PM3_PY)
         ret = searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", false);
-#endif
     else if (ext == PM3_UNSPECIFIED)
         PrintAndLogEx(FAILED, "Error - can't find %s.[lua|cmd|py]", preferredName);
+#else
+    else if (ext == PM3_UNSPECIFIED)
+        PrintAndLogEx(FAILED, "Error - can't find %s.[lua|cmd]", preferredName);
+#endif
     free(script_path);
     return ret;
 }
 
 static command_t CommandTable[] = {
-    {"help",  CmdHelp,          AlwaysAvailable, "This help"},
+    {"help",  CmdHelp,          AlwaysAvailable, "Usage info"},
     {"list",  CmdScriptList,    AlwaysAvailable, "List available scripts"},
     {"run",   CmdScriptRun,     AlwaysAvailable, "<name> -- execute a script"},
     {NULL, NULL, NULL, NULL}
@@ -351,7 +360,11 @@ static command_t CommandTable[] = {
  */
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place Lua-scripts within the luascripts/-folder. ");
+#ifdef HAVE_PYTHON
+    PrintAndLogEx(NORMAL, "This is a feature to run Lua/Cmd/Python scripts. You can place scripts within the luascripts/cmdscripts/pyscripts folders. ");
+#else
+    PrintAndLogEx(NORMAL, "This is a feature to run Lua/Cmd scripts. You can place scripts within the luascripts/cmdscripts folders. ");
+#endif
     return PM3_SUCCESS;
 }
 

From a8c3859ed18cc9f10a76a1d0ef04ea1e8f4dd1f6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 27 May 2020 10:19:22 +0200
Subject: [PATCH 31/32] chg, 'script run' - added hint

---
 client/src/cmdscript.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index bc8116849..38c980765 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -37,7 +37,7 @@ typedef enum {
     PM3_UNSPECIFIED,
     PM3_LUA,
     PM3_CMD,
-#ifdef HAVE_PYTHON    
+#ifdef HAVE_PYTHON
     PM3_PY
 #endif
 } pm3_scriptfile_t;
@@ -77,12 +77,12 @@ static void set_python_path(char *path) {
     if (syspath == 0) {
         PrintAndLogEx(WARNING, "Python failed to getobject");
     }
-    
+
     PyObject *pName = PyUnicode_FromString(path);
     if (PyList_Insert(syspath, 0, pName)) {
         PrintAndLogEx(WARNING, "Error inserting extra path into sys.path list");
     }
-    
+
     if (PySys_SetObject("path", syspath)) {
         PrintAndLogEx(WARNING,"Error setting sys.path object");
     }
@@ -135,7 +135,7 @@ static int CmdScriptList(const char *Cmd) {
     int ret = searchAndList(LUA_SCRIPTS_SUBDIR, ".lua");
     if (ret != PM3_SUCCESS)
         return ret;
-    
+
     ret = searchAndList(CMD_SCRIPTS_SUBDIR, ".cmd");
     if (ret != PM3_SUCCESS)
         return ret;
@@ -163,6 +163,7 @@ static int CmdScriptRun(const char *Cmd) {
     sscanf(Cmd, "%127s%n %255[^\n\r]%n", preferredName, &name_len, arguments, &arg_len);
     if (strlen(preferredName) == 0) {
         PrintAndLogEx(FAILED, "no script name provided");
+        PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`script list`") " to see available scripts");
         return PM3_EINVARG;
     }
     char *extension_chk;

From fa2e952dc9609c199860c35ce7f2ca8f989c73a9 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 27 May 2020 10:19:45 +0200
Subject: [PATCH 32/32] chg, swapped prefix for HINT

---
 client/src/ui.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/ui.c b/client/src/ui.c
index 798ed165a..cc256d8e3 100644
--- a/client/src/ui.c
+++ b/client/src/ui.c
@@ -207,6 +207,8 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
             strncpy(prefix, _BLUE_("[#] "), sizeof(prefix) - 1);
             break;
         case HINT:
+            strncpy(prefix, _YELLOW_("[?] "), sizeof(prefix) - 1);
+            break;
         case SUCCESS:
             strncpy(prefix, _GREEN_("[+] "), sizeof(prefix) - 1);
             break;