Skip to content

Commit

Permalink
Get Python support of experimental_client_with_swig working again
Browse files Browse the repository at this point in the history
  • Loading branch information
doegox committed Nov 13, 2023
1 parent 97f2770 commit e0be057
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...

## [unreleased][unreleased]
- Fixed Python support of `experimental_client_with_swig` (@doegox)
- Use proxmark3 as a generic smartcard reader with other software with `smart relay` (@gm3197)
- Added `tools\mfkeys\staticnested` - program to recover static nested keys (@iceman1001)
- Added `pm3_gen_dictionary.py` - python script to extract and save all keys from MFC dump files. (@iceman1001)
Expand Down
1 change: 0 additions & 1 deletion client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,6 @@ endif
ifneq (,$(INSTALLSHARE))
$(Q)$(INSTALLSUDO) $(MKDIR) $(DESTDIR)$(PREFIX)$(PATHSEP)$(INSTALLSHARERELPATH)
$(Q)$(INSTALLSUDO) $(CP) $(INSTALLSHARE) $(DESTDIR)$(PREFIX)$(PATHSEP)$(INSTALLSHARERELPATH)
$(Q)$(INSTALLSUDO) $(CP) src/pm3.py $(DESTDIR)$(PREFIX)$(PATHSEP)$(INSTALLSHARERELPATH)/pyscripts
endif
@true

Expand Down
2 changes: 1 addition & 1 deletion client/experimental_lib/example_py/02run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
#/usr/lib/python3/dist-packages/pm3.py

# need access to pm3.py
PYTHONPATH=../../src ./test.py
PYTHONPATH=../../pyscripts ./test.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

PYTHONPATH=../../src ipython3 -i ./test_grab.py
PYTHONPATH=../../pyscripts ipython3 -i ./test_grab.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

PYTHONPATH=../../src ipython3 -i ./test.py
PYTHONPATH=../../pyscripts ipython3 -i ./test.py
File renamed without changes.
4 changes: 0 additions & 4 deletions pm3
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@ if [ ! "$1" == "--list" ]; then
echo >&2 "[!!] In devel workdir but no executable found, did you compile it?"
exit 1
fi
# Devel mode: point to workdir pm3.py module
EVALENV+=" PYTHONPATH=$PM3PATH/client/src"
# try install dir
elif [ -x "$PM3PATH/proxmark3" ]; then
CLIENT="$PM3PATH/proxmark3"
EVALENV+=" PYTHONPATH=$PM3PATH/../share/proxmark3/pyscripts/"
# or /usr/[local/]lib/python3/dist-packages/pm3.py ?
else
# hope it's installed somehow, still not sure where fw images and pm3.py are...
CLIENT="proxmark3"
Expand Down

0 comments on commit e0be057

Please sign in to comment.