Merge branch 'master' into fix-fdxb-iso
Signed-off-by: Iceman <iceman@iuse.se>
This commit is contained in:
2 files changed
+8
-7
No files matched your search
+4
-3
@@ -3,10 +3,11 @@ All notable changes to this project will be documented in this file.
|
|||||||
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
|
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
|
||||||
|
|
||||||
## [unreleased][unreleased]
|
## [unreleased][unreleased]
|
||||||
- Fixed `lf fdxb` decoding - ISO 11784:2024 and ISO 24631-6 fields and names, starting digit apart from the reserved bits, the animal code as `CCC NNNNNNNNNNNN`, values in decimal with their hex, the trailer on its own line, Bio-Thermo only for the chips' exact trailer, the temperature with two decimals, all 249 ISO 3166-1 countries (@matrix)
|
- Fixed `lf fdxb` decoding - ISO 11784:2024 and ISO 24631-6 fields and names, and many more fixes. See commit message (@matrix)
|
||||||
- Fixed `lf fdxb clone` and `sim` - a country above 1023 or a national code above 274877906943 is refused instead of cut, `sim` sends the data block flag for `--extended 000000`, prints the whole trailer and stops with Enter (@matrix)
|
- Fixed `lf fdxb clone` and `sim` - a country above 1023 or a national code above 274877906943 is refused instead of cut, `sim` sends the data block flag for `--extended 000000` (@matrix)
|
||||||
- Added `lf fdxb clone` and `sim` `--biothermo` and `--no-datablock` - a Bio-Thermo temperature, or any `--extended` trailer, sent with the data block flag clear as Bio-Thermo chips do (@matrix)
|
- Added `lf fdxb clone` and `sim` `--biothermo` and `--no-datablock` - a Bio-Thermo temperature, or any `--extended` trailer, sent with the data block flag clear as Bio-Thermo chips do (@matrix)
|
||||||
- Changed `lf fdxb reader` - each read tries 134 kHz, then 125 kHz for emulators tuned there (@matrix)
|
- Changed `lf fdxb reader` - each read tries 134 kHz, then 125 kHz for emulators tuned there (@matrix)
|
||||||
|
- Fixed payload for `CMD_HF_MIFARE_EML_MEMSET` in `hf_mfu_amiibo_sim.lua` (@tpglitch)
|
||||||
- Fixed `hf thinfilm sim` - a second simulation in the same client no longer ends at once with `Done!` (@matrix)
|
- Fixed `hf thinfilm sim` - a second simulation in the same client no longer ends at once with `Done!` (@matrix)
|
||||||
- Added `hf mf supercard -u` - UID change on super card generation 2 (@mishamyte)
|
- Added `hf mf supercard -u` - UID change on super card generation 2 (@mishamyte)
|
||||||
- Changed `hf mf supercard` - a refused `-r`/`-u` now exits non-zero instead of reporting success (@mishamyte)
|
- Changed `hf mf supercard` - a refused `-r`/`-u` now exits non-zero instead of reporting success (@mishamyte)
|
||||||
@@ -23,7 +24,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
|
|||||||
- Fixed `recovery.bin` on the AT91 platforms - the bootrom is padded to 0x102000 again, so the OS image is at its load address (@matrix)
|
- Fixed `recovery.bin` on the AT91 platforms - the bootrom is padded to 0x102000 again, so the OS image is at its load address (@matrix)
|
||||||
- Added `hf mfu info` weak-PRNG backstop - detects counterfeit ULC via RndB collision (@Ryan4n6)
|
- Added `hf mfu info` weak-PRNG backstop - detects counterfeit ULC via RndB collision (@Ryan4n6)
|
||||||
- Updated `/Getting_Started_With_PM5.md` (@innocentbystanderproxmark)
|
- Updated `/Getting_Started_With_PM5.md` (@innocentbystanderproxmark)
|
||||||
- Fixed `hf seos pacs`/`write` - 2K3DES GET/UPDATE DATA no longer fails silently with exit 236; print APDU exchange errors, check DES-CMAC, decode SELECT `85` at its real length, and use short-form `85` when the cryptogram is under 128 bytes
|
- Fixed `hf seos pacs`/`write` - 2K3DES GET/UPDATE DATA no longer fails silently with exit 236; print APDU exchange errors, check DES-CMAC, decode SELECT `85` at its real lengthm ()
|
||||||
- Fixed client build with `-march=x86-64-v3` (CentOS/RHEL 10 default) - false `-Wstringop-overflow` in the EMV AID list table (@r3wretrhy)
|
- Fixed client build with `-march=x86-64-v3` (CentOS/RHEL 10 default) - false `-Wstringop-overflow` in the EMV AID list table (@r3wretrhy)
|
||||||
- Changed `hf seos info` - now prints UID, ATQA, SAK, ATS, MIFARE Classic emulation, which SEOS AIDs answer and the known AIDs found (@antoniovazquezblanco)
|
- Changed `hf seos info` - now prints UID, ATQA, SAK, ATS, MIFARE Classic emulation, which SEOS AIDs answer and the known AIDs found (@antoniovazquezblanco)
|
||||||
- Fixed `hf seos managekeys -p` - key table columns stay aligned for slots 10 and up (@antoniovazquezblanco)
|
- Fixed `hf seos managekeys -p` - key table columns stay aligned for slots 10 and up (@antoniovazquezblanco)
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ local ansicolors = require('ansicolors')
|
|||||||
local amiibo_tools = require('amiibo_tools')
|
local amiibo_tools = require('amiibo_tools')
|
||||||
|
|
||||||
copyright = ''
|
copyright = ''
|
||||||
author = 'George Talusan, modified by Lee Hambley'
|
author = 'George Talusan, modified by Lee Hambley and tpglitch'
|
||||||
version = 'v0.0.3'
|
version = 'v0.0.4'
|
||||||
desc = [[
|
desc = [[
|
||||||
This script will try to load a binary datadump of an Amiibo.
|
This script will try to load a binary datadump of an Amiibo.
|
||||||
It will recalculate PWD and PACK if necessary.
|
It will recalculate PWD and PACK if necessary.
|
||||||
@@ -82,10 +82,10 @@ local function LoadEmulator(uid, blocks)
|
|||||||
io.write('.')
|
io.write('.')
|
||||||
io.flush()
|
io.flush()
|
||||||
core.clearCommandBuffer()
|
core.clearCommandBuffer()
|
||||||
-- Pack blockno (uint16_t LE) + blockcnt (uint8_t) + blockwidth (uint8_t) + data
|
-- Pack blockno (uint16_t LE) + blockcnt (uint8_t) + blockwidth (uint8_t) + flags (uint8_t) + data
|
||||||
local block_lo = bit32.band(i, 0xff)
|
local block_lo = bit32.band(i, 0xff)
|
||||||
local block_hi = bit32.rshift(i, 8)
|
local block_hi = bit32.rshift(i, 8)
|
||||||
local payload = ('%02x%02x%02x%02x'):format(block_lo, block_hi, 1, 4)..blockdata
|
local payload = ('%02x%02x%02x%02x%02x'):format(block_lo, block_hi, 1, 4, 0)..blockdata
|
||||||
cmd = Command:newNG{cmd = cmds.CMD_HF_MIFARE_EML_MEMSET, data = payload}
|
cmd = Command:newNG{cmd = cmds.CMD_HF_MIFARE_EML_MEMSET, data = payload}
|
||||||
local err, msg = cmd:sendNG(true)
|
local err, msg = cmd:sendNG(true)
|
||||||
if err == nil then return err, msg end
|
if err == nil then return err, msg end
|
||||||
|
|||||||
Reference in new issue
Block a user