mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-22 22:23:38 -07:00
minor adjustments..
This commit is contained in:
iceman1001
parent
bf5b7e2d91
commit
0e31ed346a
4 changed files with 14 additions and 199 deletions
|
|
@ -1439,7 +1439,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
|
||||||
bool reported_suma8 = false;
|
bool reported_suma8 = false;
|
||||||
FILE *fnonces = NULL;
|
FILE *fnonces = NULL;
|
||||||
UsbCommand resp;
|
UsbCommand resp;
|
||||||
uint8_t timeout = 0;
|
|
||||||
num_acquired_nonces = 0;
|
num_acquired_nonces = 0;
|
||||||
|
|
||||||
clearCommandBuffer();
|
clearCommandBuffer();
|
||||||
|
|
@ -1458,20 +1458,13 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
|
||||||
if (field_off) break;
|
if (field_off) break;
|
||||||
|
|
||||||
if (initialize) {
|
if (initialize) {
|
||||||
while(!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
|
if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
|
||||||
timeout++;
|
UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4}};
|
||||||
printf(".");
|
clearCommandBuffer();
|
||||||
if (timeout > 3) {
|
SendCommand(&c);
|
||||||
PrintAndLog("\nNo response from Proxmark. Aborting...");
|
|
||||||
if (fnonces) fclose(fnonces);
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
if (resp.arg[0]) return resp.arg[0]; // error during nested_hard
|
||||||
|
|
||||||
if (resp.arg[0]) {
|
|
||||||
if (fnonces) fclose(fnonces);
|
|
||||||
return resp.arg[0]; // error during nested_hard
|
|
||||||
}
|
|
||||||
|
|
||||||
cuid = resp.arg[1];
|
cuid = resp.arg[1];
|
||||||
if (nonce_file_write && fnonces == NULL) {
|
if (nonce_file_write && fnonces == NULL) {
|
||||||
|
|
@ -1486,7 +1479,6 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
|
||||||
fwrite(&trgKeyType, 1, 1, fnonces);
|
fwrite(&trgKeyType, 1, 1, fnonces);
|
||||||
fflush(fnonces);
|
fflush(fnonces);
|
||||||
}
|
}
|
||||||
initialize = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!initialize) {
|
if (!initialize) {
|
||||||
|
|
|
||||||
|
|
@ -438,7 +438,6 @@ static int l_crc64_ecma182(lua_State *L)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int l_sha1(lua_State *L)
|
static int l_sha1(lua_State *L)
|
||||||
{
|
{
|
||||||
size_t size;
|
size_t size;
|
||||||
|
|
@ -621,7 +620,6 @@ int set_pm3_libraries(lua_State *L) {
|
||||||
{"GetFromBigBuf", l_GetFromBigBuf},
|
{"GetFromBigBuf", l_GetFromBigBuf},
|
||||||
{"WaitForResponseTimeout", l_WaitForResponseTimeout},
|
{"WaitForResponseTimeout", l_WaitForResponseTimeout},
|
||||||
{"mfDarkside", l_mfDarkside},
|
{"mfDarkside", l_mfDarkside},
|
||||||
//{"PrintAndLog", l_PrintAndLog},
|
|
||||||
{"foobar", l_foobar},
|
{"foobar", l_foobar},
|
||||||
{"ukbhit", l_ukbhit},
|
{"ukbhit", l_ukbhit},
|
||||||
{"clearCommandBuffer", l_clearCommandBuffer},
|
{"clearCommandBuffer", l_clearCommandBuffer},
|
||||||
|
|
|
||||||
|
|
@ -1,175 +0,0 @@
|
||||||
local cmds = require('commands')
|
|
||||||
local getopt = require('getopt')
|
|
||||||
local utils = require('utils')
|
|
||||||
local lib14a = require('read14a')
|
|
||||||
|
|
||||||
example = "script iterates over all possible sectors for a tag and runs hardnested attack against them to collect the keys."
|
|
||||||
author = "Iceman"
|
|
||||||
desc =
|
|
||||||
[[
|
|
||||||
This script iterates over all possible sectors for a tag and runs hardnested attack against them to collect the keys.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
-k Known key, 6 bytes (12 hex digits)
|
|
||||||
Examples :
|
|
||||||
script hard -b 112233445566
|
|
||||||
]]
|
|
||||||
|
|
||||||
local numBlocks = 64
|
|
||||||
local numSectors = 16
|
|
||||||
local DEBUG = true
|
|
||||||
---
|
|
||||||
-- A debug printout-function
|
|
||||||
function dbg(args)
|
|
||||||
if not DEBUG then return end
|
|
||||||
|
|
||||||
if type(args) == "table" then
|
|
||||||
local i = 1
|
|
||||||
while result[i] do
|
|
||||||
dbg(result[i])
|
|
||||||
i = i+1
|
|
||||||
end
|
|
||||||
else
|
|
||||||
print("###", args)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
---
|
|
||||||
-- This is only meant to be used when errors occur
|
|
||||||
function oops(err)
|
|
||||||
print("ERROR: ",err)
|
|
||||||
return nil,err
|
|
||||||
end
|
|
||||||
---
|
|
||||||
-- Usage help
|
|
||||||
function help()
|
|
||||||
print(desc)
|
|
||||||
print("Example usage")
|
|
||||||
print(example)
|
|
||||||
end
|
|
||||||
--
|
|
||||||
-- Exit message
|
|
||||||
function ExitMsg(msg)
|
|
||||||
print( string.rep('--',20) )
|
|
||||||
print( string.rep('--',20) )
|
|
||||||
print(msg)
|
|
||||||
print()
|
|
||||||
end
|
|
||||||
-- A little helper to place an item first in the list
|
|
||||||
local function placeFirst(akey, list)
|
|
||||||
akey = akey:lower()
|
|
||||||
if list[1] == akey then
|
|
||||||
-- Already at pole position
|
|
||||||
return list
|
|
||||||
end
|
|
||||||
local result = {akey}
|
|
||||||
--print(("Putting '%s' first"):format(akey))
|
|
||||||
for i,v in ipairs(list) do
|
|
||||||
if v ~= akey then
|
|
||||||
result[#result+1] = v
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return result
|
|
||||||
end
|
|
||||||
-- A function to display the results
|
|
||||||
-- TODO: iceman 2016, still screws up output when a key is not found.
|
|
||||||
local function displayresults(results)
|
|
||||||
local sector, blockNo, keyA, keyB, succA, succB, _
|
|
||||||
|
|
||||||
print("|---|----------------|---|----------------|---|")
|
|
||||||
print("|sec|key A |res|key B |res|")
|
|
||||||
print("|---|----------------|---|----------------|---|")
|
|
||||||
|
|
||||||
for sector,_ in pairs(results) do
|
|
||||||
succA, succB, keyA, keyB = unpack(_)
|
|
||||||
print(("|%03d| %s | %s | %s | %s |"):format(sector, keyA, succA, keyB, succB))
|
|
||||||
end
|
|
||||||
print("|---|----------------|---|----------------|---|")
|
|
||||||
|
|
||||||
end
|
|
||||||
---
|
|
||||||
-- a simple selftest function,
|
|
||||||
local function selftest()
|
|
||||||
return nil
|
|
||||||
end
|
|
||||||
|
|
||||||
---
|
|
||||||
-- The main entry point
|
|
||||||
function main(args)
|
|
||||||
|
|
||||||
local blockno = '00'
|
|
||||||
local keytype = 0 --A 01==B
|
|
||||||
local key = 'fc00018778f7'
|
|
||||||
local trgkey = ''
|
|
||||||
local numSectors = 16
|
|
||||||
|
|
||||||
-- Read the parameters
|
|
||||||
for o, a in getopt.getopt(args, 'hk:') do
|
|
||||||
if o == "h" then return help() end
|
|
||||||
if o == "k" then key = a end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Turn off Debug
|
|
||||||
local cmdSetDbgOff = "hf mf dbg 0"
|
|
||||||
core.console( cmdSetDbgOff)
|
|
||||||
-- identify tag
|
|
||||||
result, err = lib14a.read1443a(false)
|
|
||||||
if not result then
|
|
||||||
return oops(err)
|
|
||||||
end
|
|
||||||
core.clearCommandBuffer()
|
|
||||||
|
|
||||||
-- Show tag info
|
|
||||||
print((' Found tag %s'):format(result.name))
|
|
||||||
|
|
||||||
if 0x18 == result.sak then --NXP MIFARE Classic 4k | Plus 4k
|
|
||||||
-- IFARE Classic 4K offers 4096 bytes split into forty sectors,
|
|
||||||
-- of which 32 are same size as in the 1K with eight more that are quadruple size sectors.
|
|
||||||
numSectors = 40
|
|
||||||
elseif 0x08 == result.sak then -- NXP MIFARE CLASSIC 1k | Plus 2k
|
|
||||||
-- 1K offers 1024 bytes of data storage, split into 16 sector
|
|
||||||
numSectors = 16
|
|
||||||
elseif 0x09 == result.sak then -- NXP MIFARE Mini 0.3k
|
|
||||||
-- MIFARE Classic mini offers 320 bytes split into five sectors.
|
|
||||||
numSectors = 5
|
|
||||||
elseif 0x10 == result.sak then-- "NXP MIFARE Plus 2k"
|
|
||||||
numSectors = 32
|
|
||||||
else
|
|
||||||
print("I don't know how many sectors there are on this type of card, defaulting to 16")
|
|
||||||
end
|
|
||||||
|
|
||||||
result = {}
|
|
||||||
for sector=1,numSectors do
|
|
||||||
|
|
||||||
--[[
|
|
||||||
The mifare Classic 1k card has 16 sectors of 4 data blocks each.
|
|
||||||
The first 32 sectors of a mifare Classic 4k card consists of 4 data blocks and the remaining
|
|
||||||
8 sectors consist of 16 data blocks.
|
|
||||||
--]]
|
|
||||||
local trgblockno = sector * 4 - 1
|
|
||||||
if sector > 32 then
|
|
||||||
trgblockno = 32 * 4 + (sector-32) * 16 -1
|
|
||||||
end
|
|
||||||
|
|
||||||
trgblockno = ("%02d"):format(trgblockno)
|
|
||||||
|
|
||||||
local succA = 1
|
|
||||||
local succB = 1
|
|
||||||
local errA, keyA = core.hardnested(blockno, keytype, key, trgblockno, '0', trgkey, 0,0,0,0)
|
|
||||||
keyA = keyA or ""
|
|
||||||
if errA == nil or errA > 0 then succA = 0 end
|
|
||||||
|
|
||||||
local errB, keyB = core.hardnested(blockno, keytype, key, trgblockno, '1', trgkey, 0,0,0,0)
|
|
||||||
keyB = keyB or ""
|
|
||||||
if errB == nil or errB > 0 then succB = 0 end
|
|
||||||
result[sector] = { succA, succB, utils.ConvertAsciiToHex(keyA), utils.ConvertAsciiToHex(keyB) }
|
|
||||||
|
|
||||||
-- Check if user aborted
|
|
||||||
if core.ukbhit() then
|
|
||||||
print("Aborted by user")
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
displayresults(result)
|
|
||||||
end
|
|
||||||
|
|
||||||
main(args)
|
|
||||||
|
|
@ -223,13 +223,13 @@ bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen)
|
||||||
|
|
||||||
// Write error
|
// Write error
|
||||||
if (res < 0) {
|
if (res < 0) {
|
||||||
printf("write error\n");
|
printf("UART:: write error\n");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write time-out
|
// Write time-out
|
||||||
if (res == 0) {
|
if (res == 0) {
|
||||||
printf("write time-out\n");
|
printf("UART:: write time-out\n");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -238,7 +238,7 @@ bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen)
|
||||||
|
|
||||||
// Stop if the OS has some troubles sending the data
|
// Stop if the OS has some troubles sending the data
|
||||||
if (res <= 0) {
|
if (res <= 0) {
|
||||||
printf("os troubles\n");
|
printf("UART:: os troubles\n");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue