Added 'proxmark.sh' from joanbono and entry in changelog

This commit is contained in:
TomHarkness 2018-08-17 00:22:54 +10:00
commit 4229f7a1de
2 changed files with 46 additions and 29 deletions

View file

@ -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... 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] ## [unreleased][unreleased]
- Modified 'install.sh' script to work in macOS and Linux + added the 'update.sh' and 'proxmark3.sh' from joanbono (@TomHarkness)
- Fix 'hf emv' - some cards need to have Le=0x00, some need to not to have (@merlokk) - Fix 'hf emv' - some cards need to have Le=0x00, some need to not to have (@merlokk)
- Fix 'hf legic' enhancement of rx / tx in legic commands (@drandreas) - Fix 'hf legic' enhancement of rx / tx in legic commands (@drandreas)
- Fix 'data buffclear' - now frees bigbuff also (@iceman) - Fix 'data buffclear' - now frees bigbuff also (@iceman)
@ -339,5 +340,3 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
### Added ### Added
- iClass functionality: full simulation of iclass tags, so tags can be simulated with data (not only CSN). Not yet support for write/update, but readers don't seem to enforce update. (holiman). - iClass functionality: full simulation of iclass tags, so tags can be simulated with data (not only CSN). Not yet support for write/update, but readers don't seem to enforce update. (holiman).
- iClass decryption. Proxmark can now decrypt data on an iclass tag, but requires you to have the HID decryption key locally on your computer, as this is not bundled with the sourcecode. - iClass decryption. Proxmark can now decrypt data on an iclass tag, but requires you to have the HID decryption key locally on your computer, as this is not bundled with the sourcecode.

View file

@ -10,5 +10,23 @@ function wait4proxmark {
echo $PM3 echo $PM3
} }
function wait4proxmark_macOS {
echo >&2 "Waiting for Proxmark to appear..."
while true; do
PM3=$(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)
if [[ $PM3 != "" ]]; then
#echo >&2 -e "Found proxmark on $(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)\n"
break
fi
sleep .1
done
echo $PM3
}
# start proxmark with first detected interface # start proxmark with first detected interface
client/proxmark3 $(wait4proxmark)
if [[ $(uname | awk '{print toupper($0)}') == "LINUX" ]]; then
client/proxmark3 $(wait4proxmark_Linux)
elif [[ $(uname | awk '{print toupper($0)}') == "DARWIN" ]]; then
client/proxmark3 $(wait4proxmark_macOS)
fi