Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3

CHANGELOG.md

@@ -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]		
+ - Improved 'install.sh' to install dependencies for Ubuntu 18.04 and using max number of processors during compilation (@joanbono)				
  - 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 legic'  enhancement of rx / tx in legic commands (@drandreas)

client/default_keys.dic

@@ -611,3 +611,5 @@ C01FC822C6E5
 # More keys:
 8a19d40cf2b5
 ae8587108640
+8829DA9DAF76,-- Meriton Suites Syd, Aus ;). Not sure where this came from...
+135b88a94b8b, SafLock standalone door locks.

install.sh

@@ -4,13 +4,19 @@ set -x
 function installProxmark_Linux {
   # install dependencies for Proxmark3 source code.
   sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev gcc-arm-none-eabi
-  sudo apt-get install libusb-0.1-4 libusb-dev libqt4-dev libncurses5-dev perl pkg-config wget
+  sudo apt-get install libusb-0.1-4 libusb-dev libqt4-dev libncurses5-dev libcanberra-gtk-module perl pkg-config wget
   #cleaning up
   sudo apt-get install -f -y
   sudo apt-get autoremove -y
   sudo apt-get autoclean -y
   sudo apt-get clean -y
   sudo apt-get update
+
+  # Install libcanberragtk in Ubuntu 18.04
+  if [[ $(cat /etc/issue | awk '{print $2}') = *"18.04"* ]]; then 
+    apt-get install libcanberra-gtk-module
+  fi
+
 # install RDV40 - proxmark3
   git clone https://github.com/RfidResearchGroup/proxmark3.git
   (
@@ -18,7 +24,7 @@ function installProxmark_Linux {
       git reset --hard
       git clean -dfx
       make clean
-      make all
+      make -j$(nproc) all 
       # Copy blacklist rules into /etc/udev/rules.d
       # check the Makefile for details
       sudo make udev
@@ -46,7 +52,7 @@ local qt5Core=$(find /usr -name Qt5Core.pc 2>/dev/null)
         git reset --hard
         git clean -dfx
         make clean
-        make
+        make -j$(sysctl -n hw.physicalcpu)
       )
   }
 # Where is my device?

proxmark3.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function wait4wait4proxmark_Linux {
+function wait4proxmark_Linux {
 	echo >&2 "Waiting for Proxmark to appear..."
 	while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
 		sleep .1