github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

style

Browse source
This commit is contained in:
iceman1001 2025-07-28 15:45:04 +02:00
commit 79d1e102af
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/luascripts/paxton_clone.lua
View file

@ -24,10 +24,10 @@ command('clear')
author = ' Author: jareckib - 30.01.2025' author = ' Author: jareckib - 30.01.2025'
tutorial = ' Based on Equipter tutorial - Downgrade Paxton to EM4102' tutorial = ' Based on Equipter tutorial - Downgrade Paxton to EM4102'
version = ' version v1.20' version = ' version v1.20'
desc = [[ desc = [[
The script automates the copying of Paxton fobs read - write. The script automates the copying of Paxton fobs read - write.
It also allows manual input of data for blocks 4-7. It also allows manual input of data for blocks 4-7.
The third option is reading data stored in the log file and create new fob. The third option is reading data stored in the log file and create new fob.
Additionally, the script calculates the ID for downgrading Paxton to EM4102. Additionally, the script calculates the ID for downgrading Paxton to EM4102.
]] ]]
@ -70,7 +70,7 @@ local function reset_log_file()
file:write("") file:write("")
file:close() file:close()
end end
local function read_log_file(logfile) local function read_log_file(logfile)
local file = io.open(logfile, "r") local file = io.open(logfile, "r")
if not file then if not file then
@ -340,7 +340,7 @@ local function main(args)
print(ac.cyan .. ' 1' .. ac.reset .. ' - Read Paxton blocks 4-7 to make a copy') print(ac.cyan .. ' 1' .. ac.reset .. ' - Read Paxton blocks 4-7 to make a copy')
print(ac.cyan .. ' 2' .. ac.reset .. ' - Manually input data for Paxton blocks 4-7') print(ac.cyan .. ' 2' .. ac.reset .. ' - Manually input data for Paxton blocks 4-7')
print(ac.cyan .. " 3" .. ac.reset .. " - Search in Paxton_log by name and use the data") print(ac.cyan .. " 3" .. ac.reset .. " - Search in Paxton_log by name and use the data")
print(dash) print(dash)
while true do while true do
io.write(' Your choice '..ac.cyan..'(1/2/3): ' .. ac.reset) io.write(' Your choice '..ac.cyan..'(1/2/3): ' .. ac.reset)
input_option = io.read() input_option = io.read()
@ -437,7 +437,7 @@ local function main(args)
was_option_3 = true was_option_3 = true
local retries = 3 local retries = 3
while retries > 0 do while retries > 0 do
io.write(' Enter the name to search ('..retries..' attempts) : '..ac.yellow) io.write(' Enter the name to search ('..retries..' attempts) : '..ac.yellow)
local user_input = io.read() local user_input = io.read()
io.write(ac.reset..'') io.write(ac.reset..'')
if user_input == nil or user_input:match("^%s*$") then if user_input == nil or user_input:match("^%s*$") then

4
client/src/cmdlfindala.c
View file

@ -1170,14 +1170,14 @@ int getIndalaBits(uint8_t fc, uint16_t cn, uint8_t *bits) {
bits[62] = 0; bits[62] = 0;
bits[63] = 1; bits[63] = 1;
} }
// add parity // add parity
// bits[34] = 1; // p1 64 - 30 = 34 // bits[34] = 1; // p1 64 - 30 = 34
// bits[38] = 1; // p2 68 - 30 = 38 // bits[38] = 1; // p2 68 - 30 = 38
// 92 = 62 // 92 = 62
// 93 = 63 // 93 = 63
bits[34] = 0; // parity for odd bits bits[34] = 0; // parity for odd bits
bits[38] = 0; // parity for even bits bits[38] = 0; // parity for even bits
uint8_t p1 = 1; uint8_t p1 = 1;

4
client/src/mifare/desfirecore.c
View file

@ -2245,11 +2245,11 @@ int DesfireValueFileOperations(DesfireContext_t *dctx, uint8_t fid, uint8_t oper
PrintAndLogEx(INFO, "MAC mode failed with length error, retrying with plain mode"); PrintAndLogEx(INFO, "MAC mode failed with length error, retrying with plain mode");
DesfireCommunicationMode original_mode = dctx->commMode; DesfireCommunicationMode original_mode = dctx->commMode;
dctx->commMode = DCMPlain; dctx->commMode = DCMPlain;
memset(resp, 0, sizeof(resp)); memset(resp, 0, sizeof(resp));
resplen = 0; resplen = 0;
res = DesfireCommand(dctx, operation, data, datalen, resp, &resplen, -1); res = DesfireCommand(dctx, operation, data, datalen, resp, &resplen, -1);
// Restore original mode for future commands // Restore original mode for future commands
dctx->commMode = original_mode; dctx->commMode = original_mode;
} }