github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #478 from 0xDRRB/master

Browse source 
switch from lua CRC16/ARC to CRC RevEng
This commit is contained in:
Iceman 2019-11-19 11:18:32 +01:00 • committed by GitHub
commit 051e008f11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -372,6 +372,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk) - Added `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
- Added trailer block decoding to `hf mf rdbl` and `hf mf cgetbl` (@merlokk) - Added trailer block decoding to `hf mf rdbl` and `hf mf cgetbl` (@merlokk)
- Added `hf mf mad` and `hf mfp mad` MAD decode, check and print commands (@merlokk) - Added `hf mf mad` and `hf mfp mad` MAD decode, check and print commands (@merlokk)
- Add `script run luxeodump` (@0xdrrb)
### Fixed ### Fixed

38
client/luascripts/luxeodump.lua
View file

@ -121,38 +121,6 @@ local function createxteakey(mfuid)
return xteakey return xteakey
end end
-- CRC16/ARC from core.reveng_runmodel() does not seem to return the right values.
-- So here is an implementation in Lua.
local function bitreflect(data, nbits)
local output = 0
for i = 0, nbits-1 do
if bit.band(data,1) ~= 0 then
output = bit32.bor(output, bit32.lshift(1,((nbits - 1) - i)))
else
end
data = bit32.rshift(data,1)
end
return output
end
local function crc16arc(s)
assert(type(s) == 'string')
local crc = 0x0000
for i = 1, #s do
local c = s:byte(i)
dbyte = bitreflect(c, 8)
crc = bit32.bxor(crc, bit32.lshift(dbyte,8))
for j = 0, 7 do
local mix = bit32.band(crc, 0x8000)
crc = bit32.lshift(crc,1)
if mix ~= 0 then
crc = bit32.bxor(crc, 0x8005)
end
end
end
return bitreflect(crc, 16)
end
local function getblockdata(response) local function getblockdata(response)
if not response then if not response then
return nil, 'No response from device' return nil, 'No response from device'
@ -253,9 +221,9 @@ local function main(args)
end end
-- compute CRC for each segment -- compute CRC for each segment
crcH = crc16arc(utils.ConvertHexToAscii(cdata[1]..cdata[2]..cdata[3]:sub(1,28))) crcH = utils.SwapEndianness(core.reveng_runmodel("CRC-16/ARC", cdata[1]..cdata[2]..cdata[3]:sub(1,28), false, '0'),16)
crcA = crc16arc(utils.ConvertHexToAscii(cdata[4]..cdata[5]..cdata[6]..cdata[7]:sub(1,28))) crcA = utils.SwapEndianness(core.reveng_runmodel("CRC-16/ARC", cdata[4]..cdata[5]..cdata[6]..cdata[7]:sub(1,28), false, '0'),16)
crcB = crc16arc(utils.ConvertHexToAscii(cdata[8]..cdata[9]..cdata[10]..cdata[11]:sub(1,28))) crcB = utils.SwapEndianness(core.reveng_runmodel("CRC-16/ARC", cdata[8]..cdata[9]..cdata[10]..cdata[11]:sub(1,28), false, '0'),16)
print("\nHeader:") print("\nHeader:")
for key,value in ipairs(cdata) do for key,value in ipairs(cdata) do