Merge branch 'desf_update' of https://github.com/merlokk/proxmark3i into desf_update

CHANGELOG.md

@@ -3,6 +3,8 @@ 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]
+ - Fix - move des functions to libcrypto (@merlokk)
+ - Added `CLIGetOptionList` to cliparser that makes it easier to implement text options in the cli (@merlokk) 
  - Added experimental support for macOS users utilizing MacPorts instead of Homebrew (@linuxgemini)
  - Added `pm3_online_check.py` - a script to verify and initialize a Proxmark3 RDV4 device (@iceman1001)
 

client/src/mifare/desfire_crypto.c

@@ -31,6 +31,7 @@
 #include <string.h>
 #include <util.h>
 #include "commonutil.h"
+#include "crypto/libpcrypto.h" 
 #include "aes.h"
 #include "des.h"
 #include "ui.h"
@@ -62,7 +63,6 @@ int desfire_get_key_length(enum DESFIRE_CRYPTOALGO key_type) {
     return 0;
 }
 
-
 /******************************************************************************/
 
 void tdes_nxp_receive(const void *in, void *out, size_t length, const void *key, unsigned char iv[8], int keymode) {

client/src/mifare/desfire_crypto.h

@@ -127,7 +127,6 @@ typedef unsigned long DES3_KS[48][2];  /* Triple-DES key schedule */
 
 extern int Asmversion; /* 1 if we're linked with an asm version, 0 if C */
 
-
 void tdes_nxp_receive(const void *in, void *out, size_t length, const void *key, unsigned char iv[8], int keymode);
 void tdes_nxp_send(const void *in, void *out, size_t length, const void *key, unsigned char iv[8], int keymode);
 void Desfire_des_key_new(const uint8_t value[8], desfirekey_t key);

client/src/util.c

@@ -25,7 +25,7 @@
 
 #include "ui.h"     // PrintAndLog
 
-#define UTIL_BUFFER_SIZE_SPRINT 4097
+#define UTIL_BUFFER_SIZE_SPRINT 8193
 // global client debug variable
 uint8_t g_debugMode = 0;
 // global client disable logging variable