Merge remote-tracking branch 'upstream/master' into pm3+reveng

diff --cc client/Makefile
index ea532099e5ed6fde8eb89003831a1af72cadb7f4,0972f441912280439ca04265472a76ab0d31af6c..5b604b11fd536d5613df2a74804c8b934cf797b3
--- 1/client/Makefile
--- 2/client/Makefile
+++ b/client/Makefile
@@@ -84,7 -84,8 +84,8 @@@ CMDSRCS =     nonce2key/crapto1.c
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
 -            cmdhfmfu.c \
 +                      cmdhfmfu.c \
+                       cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \

diff --cc client/cmdmain.c
index d994f2e5d8aeb6e1ae0e6f2ec98cb71716778ad6,c1d730ee636f13cf92b01f59b71b607ad1791a20..843f9301dc0b554e39f5327ededdf5729e3f67f7
--- 1/client/cmdmain.c
--- 2/client/cmdmain.c
+++ b/client/cmdmain.c
@@@ -68,16 -65,8 +68,15 @@@ int CmdHelp(const char *Cmd
  
  int CmdQuit(const char *Cmd)
  {
-   exit(0);
-   return 0;
+   return 99;
  }
 +
 +int CmdRev(const char *Cmd)
 +{
 +  CmdCrc(Cmd);
 +  return 0;
 +}
 +
  /**
   * @brief This method should be called when sending a new command to the pm3. In case any old
   *  responses from previous commands are stored in the buffer, a call to this method should clear them.

diff --cc client/scripting.c
Simple merge