projects
/
proxmark3-svn
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e9b8d0d
)
Iceman's script aes fix #93
98/head
author
marshmellow42
<marshmellowrf@gmail.com>
Tue, 28 Apr 2015 19:53:07 +0000
(15:53 -0400)
committer
marshmellow42
<marshmellowrf@gmail.com>
Tue, 28 Apr 2015 19:53:07 +0000
(15:53 -0400)
Thanks Iceman (note I did not have a tag to double test this one. :)
client/scripting.c
patch
|
blob
|
blame
|
history
diff --git
a/client/scripting.c
b/client/scripting.c
index 0ccdeeec7a8d497d5a288fef2fcc0e8998a0e865..d7f51c234ea0b5751ca2e82f28fe8e77ec771246 100644
(file)
--- a/
client/scripting.c
+++ b/
client/scripting.c
@@
-261,7
+261,7
@@
static int l_aes(lua_State *L)
aes_context ctx;
aes_init(&ctx);
- aes_setkey_
enc(&ctx,(const unsigned char *)p_key,
128);
+ aes_setkey_
dec(&ctx, aes_key,
128);
aes_crypt_cbc(&ctx,AES_DECRYPT,sizeof(indata), iv, indata,outdata );
//Push decrypted array as a string
lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
Impressum
,
Datenschutz