From: Iceman Date: Thu, 22 Feb 2018 13:08:33 +0000 (+0100) Subject: Merge pull request #578 from Tom5ive/master X-Git-Tag: v3.1.0~67 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c50e55a4a5cdda35544cf8566036f7dbd5a15b83?hp=b8196bf8eeb31882fe669d8c0024882555635de0 Merge pull request #578 from Tom5ive/master fix for swapped parity bits --- diff --git a/client/scripts/lf_bulk_program.lua b/client/scripts/lf_bulk_program.lua index 4758c203..274f7510 100644 --- a/client/scripts/lf_bulk_program.lua +++ b/client/scripts/lf_bulk_program.lua @@ -61,8 +61,8 @@ local function cardHex(i,f) --As the function defaults to even parity and returns a boolean, --perform a 'not' function to get odd parity - high = evenparity(string.sub(stream,0,12)) and 1 or 0 - low = not evenparity(string.sub(stream,13)) and 1 or 0 + high = not evenparity(string.sub(stream,0,12)) and 1 or 0 + low = evenparity(string.sub(stream,13)) and 1 or 0 bits = bit32.bor(bit32.lshift(id,1), low) bits = bit32.bor(bits, bit32.lshift(high,25))