github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-14 02:26:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change mbedtls initializers to be compatible with older versions of gcc (#732)

Browse source 
* fix issue #731
This commit is contained in:
pwpiwi 2018-12-06 07:53:25 +01:00 • committed by GitHub
commit aa0b1c431f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/mifareutil.c
View file

@ -296,7 +296,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
/// 3des2k
mbedtls_des3_context ctx = { 0x00 };
mbedtls_des3_context ctx = { {0} };
uint8_t random_a[8] = {1,1,1,1,1,1,1,1};
uint8_t random_b[8] = {0x00};
uint8_t enc_random_b[8] = {0x00};

4
client/cmdhficlass.c
View file

@ -414,7 +414,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {
fseek(f, 0, SEEK_SET);
uint8_t enc_dump[8] = {0};
uint8_t *decrypted = malloc(fsize);
mbedtls_des3_context ctx = { 0 };
mbedtls_des3_context ctx = { {0} };
mbedtls_des3_set2key_dec( &ctx, key);
size_t bytes_read = fread(enc_dump, 1, 8, f);
@ -466,7 +466,7 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
uint8_t encryptedData[16];
uint8_t *encrypted = encryptedData;
mbedtls_des3_context ctx = { 0 };
mbedtls_des3_context ctx = { {0} };
mbedtls_des3_set2key_enc( &ctx, key);
mbedtls_des3_crypt_ecb(&ctx, blkData,encrypted);

2
client/cmdhfmfu.c
View file

@ -1742,7 +1742,7 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
mix[6] = block ^ uid[2];
mix[7] = uid[3];
mbedtls_des3_context ctx = { 0x00 };
mbedtls_des3_context ctx = { {0} };
mbedtls_des3_set2key_enc(&ctx, masterkey);
mbedtls_des3_crypt_cbc(&ctx // des3_context

6
client/loclass/elite_crack.c
View file

@ -179,8 +179,8 @@ void rk(uint8_t *key, uint8_t n, uint8_t *outp_key)
return;
}
static mbedtls_des_context ctx_enc = {0};
static mbedtls_des_context ctx_dec = {0};
static mbedtls_des_context ctx_enc = { {0} };
static mbedtls_des_context ctx_dec = { {0} };
void desdecrypt_iclass(uint8_t *iclass_key, uint8_t *input, uint8_t *output)
{
@ -449,7 +449,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[])
*/
int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[] )
{
mbedtls_des_context ctx_e = {0};
mbedtls_des_context ctx_e = { {0} };
uint8_t z_0[8] = {0};
uint8_t y_0[8] = {0};

4
client/loclass/ikeys.c
View file

@ -72,8 +72,8 @@ From "Dismantling iclass":
uint8_t pi[35] = {0x0F,0x17,0x1B,0x1D,0x1E,0x27,0x2B,0x2D,0x2E,0x33,0x35,0x39,0x36,0x3A,0x3C,0x47,0x4B,0x4D,0x4E,0x53,0x55,0x56,0x59,0x5A,0x5C,0x63,0x65,0x66,0x69,0x6A,0x6C,0x71,0x72,0x74,0x78};
static mbedtls_des_context ctx_enc = {0};
static mbedtls_des_context ctx_dec = {0};
static mbedtls_des_context ctx_enc = { {0} };
static mbedtls_des_context ctx_dec = { {0} };
static int debug_print = 0;