Merge branch 'master' into desf_update

This commit is contained in:
Oleg Moiseenko authored and GitHub committed 2021-07-05 14:02:15 +03:00
commit 6671563fb9
4 files changed
+4 -3

No files matched your search

+1 -1
View File
@@ -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) {
-1
View File
@@ -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);
+1 -1
View File
@@ -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