github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-16 10:03:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix scripting

Browse source
This commit is contained in:
merlokk 2018-11-07 18:20:24 +02:00
parent aaf7b25c01
commit f0741798e6
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
client/scripting.c
View file

@ -331,10 +331,10 @@ static int l_aes128decrypt_cbc(lua_State *L) {
aes_key[i / 2] = tmp & 0xFF; aes_key[i / 2] = tmp & 0xFF;
} }
aes_context ctx; mbedtls_aes_context ctx;
aes_init(&ctx); mbedtls_aes_init(&ctx);
aes_setkey_dec(&ctx, aes_key, 128); mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
aes_crypt_cbc(&ctx, AES_DECRYPT, sizeof(indata), iv, indata, outdata ); mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, sizeof(indata), iv, indata, outdata );
//Push decrypted array as a string //Push decrypted array as a string
lua_pushlstring(L,(const char *)&outdata, sizeof(outdata)); lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
return 1;// return 1 to signal one return value return 1;// return 1 to signal one return value
@ -360,10 +360,10 @@ static int l_aes128decrypt_ecb(lua_State *L) {
sscanf(&p_key[i], "%02x", &tmp); sscanf(&p_key[i], "%02x", &tmp);
aes_key[i / 2] = tmp & 0xFF; aes_key[i / 2] = tmp & 0xFF;
} }
aes_context ctx; mbedtls_aes_context ctx;
aes_init(&ctx); mbedtls_aes_init(&ctx);
aes_setkey_dec(&ctx, aes_key, 128); mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
aes_crypt_ecb(&ctx, AES_DECRYPT, indata, outdata ); mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_DECRYPT, indata, outdata );
//Push decrypted array as a string //Push decrypted array as a string
lua_pushlstring(L,(const char *)&outdata, sizeof(outdata)); lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
@ -392,10 +392,10 @@ static int l_aes128encrypt_cbc(lua_State *L) {
aes_key[i / 2] = tmp & 0xFF; aes_key[i / 2] = tmp & 0xFF;
} }
aes_context ctx; mbedtls_aes_context ctx;
aes_init(&ctx); mbedtls_aes_init(&ctx);
aes_setkey_enc(&ctx, aes_key, 128); mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
aes_crypt_cbc(&ctx, AES_ENCRYPT, sizeof(indata), iv, indata, outdata ); mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, sizeof(indata), iv, indata, outdata );
//Push encrypted array as a string //Push encrypted array as a string
lua_pushlstring(L,(const char *)&outdata, sizeof(outdata)); lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
return 1;// return 1 to signal one return value return 1;// return 1 to signal one return value
@ -421,10 +421,10 @@ static int l_aes128encrypt_ecb(lua_State *L) {
sscanf(&p_key[i], "%02x", &tmp); sscanf(&p_key[i], "%02x", &tmp);
aes_key[i / 2] = tmp & 0xFF; aes_key[i / 2] = tmp & 0xFF;
} }
aes_context ctx; mbedtls_aes_context ctx;
aes_init(&ctx); mbedtls_aes_init(&ctx);
aes_setkey_enc(&ctx, aes_key, 128); mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
aes_crypt_ecb(&ctx, AES_ENCRYPT, indata, outdata ); mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_ENCRYPT, indata, outdata );
//Push encrypted array as a string //Push encrypted array as a string
lua_pushlstring(L,(const char *)&outdata, sizeof(outdata)); lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
return 1;// return 1 to signal one return value return 1;// return 1 to signal one return value
@ -498,7 +498,7 @@ static int l_sha1(lua_State *L) {
size_t size; size_t size;
const char *p_str = luaL_checklstring(L, 1, &size); const char *p_str = luaL_checklstring(L, 1, &size);
unsigned char outdata[20] = {0x00}; unsigned char outdata[20] = {0x00};
sha1( (uint8_t*) p_str, size, outdata); mbedtls_sha1( (uint8_t*) p_str, size, outdata);
lua_pushlstring(L, (const char *)&outdata, sizeof(outdata)); lua_pushlstring(L, (const char *)&outdata, sizeof(outdata));
return 1; return 1;
} }

4
client/scripting.h
View file

@ -23,8 +23,8 @@
#include "crc.h" #include "crc.h"
#include "crc16.h" #include "crc16.h"
#include "crc64.h" #include "crc64.h"
#include "sha1.h" #include "mbedtls/sha1.h"
#include "aes.h" #include "mbedtls/aes.h"
#include "cmdcrc.h" #include "cmdcrc.h"
#include "cmdhfmfhard.h" #include "cmdhfmfhard.h"
#include "cmdhfmfu.h" #include "cmdhfmfu.h"