This commit is contained in:
Philippe Teuwen 2021-10-16 23:43:31 +02:00
parent 34a695547c
commit 232843477c
37 changed files with 115 additions and 129 deletions

View file

@ -68,7 +68,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Fix `lf em 4x50/4x70 *` reverted a misunderstanding in byte order macros (@iceman1001)
- Added more keys (@equipter)
- Changed `hf nfc ndefread` - ndef parser now handles more types (@iceman1001)
- Fix `hf desfire` changekey, GetUID, 3DES sesson key tweak. (@mwalker33)
- Fix `hf desfire` changekey, GetUID, 3DES session key tweak. (@mwalker33)
- Fix `hf fido` commands now works correctly (@merlokk)
- Moved / renamed `client/resource/fido2_defparams.json` -> `client/resource/hf_fido2_defparams.json` (@merlokk)
- Added `hf cipurse` commands to work with cipurse transport cards (@merlokk)
@ -99,7 +99,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Changed `lf search` - add option `-c` to continue searching after first hit (@doegox)
- Fix DESFire mis-annotation (@VortixDev)
- Changed `lf pac demod` - now also search for inverted bitstreams (@iceman1001)
- Changed `hf 14b reader` - now supports continous mode (@iceman1001)
- Changed `hf 14b reader` - now supports continuous mode (@iceman1001)
- Fix `hf search` - now doesn't false identify ISO15693 (@iceman1001)
- Changed emv commands now works with tokenized cards (@merlokk)
- Changed `hf 15 restore` - now also support EML/JSON (@iceman1001)
@ -158,7 +158,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added a script to dump originality signatures from MFU EV1s and NTAGs (@aveao)
- Fix `hf emrtd` segfaults (@aveao)
- Fix `lf em 4150` timings on device side (@tharexde)
-Changed dependecies fixes in build scripts (@doegox, @iceman1001, @gator96100)
-Changed dependencies fixes in build scripts (@doegox, @iceman1001, @gator96100)
- Changed `recover_pk.py` to support colors (@iceman1001)
- Changed flashing feedback text to include needed steps (@iceman1001)
- Changed `lf_em4100_bulk.lua` in order to handle Proxspace odd 32b limit (@iceman1001)
@ -184,7 +184,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added `tools/hitag2crack/crack5opencl`, an optimized version of `crack5gpu` (@matrix)
- Fixed Makefile to account for changes when running on Apple Silicon (@tcprst)
- Added support for debugging ARM with JTAG & VSCode (@Gator96100)
- Added MFUL "Gen1b" suport to `hf_mfu_setuid.lua` (@iceman1001)
- Added MFUL "Gen1b" support to `hf_mfu_setuid.lua` (@iceman1001)
- Added possibility to get bargraph in `lf tune` and `hf tune` (@iceman1001, @doegox)
- Added `hf emrtd` ePassport dumping and parsing (@aveao)
- Added `aidsearch` to `hf 14b info` (@iceman1001)
@ -228,14 +228,14 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Change many commands to cliparser (@iceman1001, @tcprst, @mwalker33,...)
- ...
- Change `hf iclass chk/lookup/loclass` speedups (@iceman1001)
- Change - ongoing convertion to cliparser (@tcprst, @iceman1001)
- Change - ongoing conversion to cliparser (@tcprst, @iceman1001)
- Added compilation options for 256k Proxmark versions, see doc (@doegox)
- Added support for 10b UID in `hf 14a sim` (@doegox)
- Added `HF_TCPRST` standalone mode which read and emulate IKEA Rothult cards (@tcprst)
- Add Gallagher key checking/KDF on MIFARE Desfire (@NZSmartie)
- Add dictionaries with common words of proper size (@will-caruana)
- Add `hf mf supercard` (@iceman1001)
- Add initial suport for MIFARE Key Diversification, cf AN10922 (@NZSmartie)
- Add initial support for MIFARE Key Diversification, cf AN10922 (@NZSmartie)
- Change MIFARE detection improved (@VortixDev)
- Change `hf 14b sriread` to `hf 14b rdbl` and `hf 14b dump` (@iceman1001)
- Add continuous mode to `hf 14a reader` (@doegox and @iceman1001)
@ -258,7 +258,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Add low level support for 14b' aka Innovatron (@doegox)
- Add doc/cliparser.md (@mwalker33)
- Add `hf 14b apdu` - send APDU over ISO14443B (@iceman1001)
- Add `lf t55xx chk e <EM4100> option` - Checks calculated password based on the EM4100 id from some white cloners forumla by paleopterix (@mwalker33)
- Add `lf t55xx chk e <EM4100> option` - Checks calculated password based on the EM4100 id from some white cloners formula by paleopterix (@mwalker33)
- Add `lf t55xx sniff` to allow extracting commands and passwords used be cloners. (@mwalker33)
- Add options to `lf read`, `lf cmdread`, `lf sniff` for repeated acquisitions (@doegox)
- Change options of `lf read` to match `lf cmdread`, this affects historical `d` and `s` options (@doegox)
@ -268,7 +268,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Add test for Ultralight gen2 magic 'hf search' (@McEloff)
- Add test for Ultralight EV1 gen2 magic 'hf search' (@McEloff)
- Added `hf mf gen3*`magic gen 3 card operations (@McEloff)
- Readded verichip command which seems missing (@iceman1001)
- Re-added verichip command which seems missing (@iceman1001)
- Fix missing t55x7 config block detection (@iceman1001)
- Fix missing define on proxspace (@mwalker33)
- Added `lf em 4x50_dump` (@iceman1001)
@ -277,7 +277,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added `4x50_write` (@tharexde)
- Added `4x50_write_password` (@tharexde)
- Fix em4x50 demodulation error (@tharexde)
- Fix `hf mfdes` authentification issues, DES working (@bkerler)
- Fix `hf mfdes` authentication issues, DES working (@bkerler)
- Add Android cross-compilation to client cmake (@dxl, @doegox)
- Fix `emv scan` - now saves in current folder and uses unique names (@iceman1001)
- Fix pm3.sh - parse COM ports larger than one digit (@doegox)
@ -356,7 +356,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Fix issue #729. Avoid stalling on non-rdv4 when polling for FeliCa without card in proximity (@doegox)
- Change `lf nexwatch demod` - lenient demod sizes (@iceman1001)
- Change `lf nexwath sim/clone` - now supports 88bit format direct. (@iceman1001)
- Rewrited `standalone mode lf_em4100rwc `, added card bruteforce mode. (Dmitriy Loginoov)
- Rewritten `standalone mode lf_em4100rwc `, added card bruteforce mode. (Dmitriy Loginoov)
- Change `data load` - color (@iceman1001)
- Change appveyor verbose (@doegox)
- Change `lf nexwatch demod` - now detects type, and show parity /chksum (@iceman1001)
@ -417,7 +417,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added Mifare Desfire Read/Write/Create files/records/values functionality and several fixes to `hf mfdes` (@bkerler)
- Added CreateStdFile command to Mifare `hf mfdes` (@bkerler)
- Rework des/3des/3k3des/aes auth. Port to mbedtls crypto library on device (@bkerler)
- Port `hf mfdes` Authentification to CommandNG structure, fix auth session key (@bkerler)
- Port `hf mfdes` Auntentication to CommandNG structure, fix auth session key (@bkerler)
- Updates `hf mfdes` functions, improved logging and added new commands (@bkerler)
- Updated 'legic.lua' and 'legic_clone.lua' script - works with current command set (@Pizza_4u)
- Rewrote `hf mfdes` functions and added apdu debugging (@bkerler)
@ -637,8 +637,8 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Change: lf cotag demod - adjusted error trigger (@iceman1001)
- Added documentation on BT add-on (@iceman1001/@doegox)
- Change: new button behaviour in bootloader mode, no need to keep it pressed, press again to interrupt (@doegox)
- Change: new keys in dicts, new mem layout to accomodate them (@iceman1001/various)
- Fix lf sim - if called with empty graphbuffer all strange things happend, like turning on HF field (@iceman1001)
- Change: new keys in dicts, new mem layout to accommodate them (@iceman1001/various)
- Fix lf sim - if called with empty graphbuffer all strange things happen, like turning on HF field (@iceman1001)
- Change: hf 14a sim / hf mf sim - check buttonpress/usb frame fewer times in order not to disrupt simulation (@McEloff)
- Change: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data (@iceman1001)
- Change: lf em 410x_demod - now can demod the simulation data (@iceman1001)
@ -654,7 +654,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Change legic.lua saves data in EML and BIN formats (@iceman1001)
- Change hf tune - is now synchronous (for BT add-on) and can be interrupted by kbd (@doegox)
- Change: update macOS install instruction (@ Uli Heilmeier)
- Added trace ouput in hexdump format for Wireshark import (@ Uli Heilmeier)
- Added trace output in hexdump format for Wireshark import (@ Uli Heilmeier)
- Added usart btpin - to change BT add-on PIN (@doegox)
- Added reconnection support (@iceman1001/@doegox)
- Added usart tx/rx/... - USART developer commands (@doegox)
@ -937,7 +937,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Change 512kb detection when flashing (@iceman1001)
- Fixed compilation GCC4.9 or higher detection (@winguru)
- Fixed compiler warnings in Ubuntu 17.04 (@iceman1001)
- Ripped out `standalone` code into separete folder to be continued. (@iceman1001)
- Ripped out `standalone` code into separate folder to be continued. (@iceman1001)
- `hf mf nested`, added key validation to entered key (@merlokk)
- `hf mf hardnested`, added key validation to enterd key (@iceman1001)
- Change a lot of help texts (@iceman1001)
@ -1007,7 +1007,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
## [1.6.9 iceman fork] [2017-02-06]
- Serial speedup, if possible 408600baud otherwise default to 115200baud (@iceman1001)
- `hf emv` - Added Peter Fillmore EMV branch now compiles on iceman fork. See seperate issue. (@iceman1001)
- `hf emv` - Added Peter Fillmore EMV branch now compiles on iceman fork. See separate issue. (@iceman1001)
- `hf 14a reader` - Aztek detection. (@iceman1001)
- `standalone mode` - added more detection of tags and refactored (@iceman1001)
- `script run ufodump` - dumps an Aztek tag. (@iceman1001)

View file

@ -1,2 +1,2 @@
Refer to doc/md/Installation_Instructions/ for up-to-date intructions for various platforms.
Refer to doc/md/Installation_Instructions/ for up-to-date instructions for various platforms.

View file

@ -157,7 +157,7 @@ The [public roadmap](https://github.com/RfidResearchGroup/proxmark3/wiki/Public-
This repo compiles nicely on
- WSL1 on Windows 10
- Proxspace enviroment [release v3.10](https://github.com/Gator96100/ProxSpace/releases)
- Proxspace environment [release v3.10](https://github.com/Gator96100/ProxSpace/releases)
- Windows/MinGW environment
- Ubuntu, ParrotOS, Gentoo, Pentoo, Kali, NetHunter, Arch Linux, Fedora, Debian, Raspbian
- Android / Termux

View file

@ -739,7 +739,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
| (response_bit[6] << 5) | (response_bit[7] << 4)
| (response_bit[8] << 3) | (response_bit[9] << 2)
| (response_bit[10] << 1) | response_bit[11]);
//check wich memorysize this tag has
//check which memorysize this tag has
if (response_bit[10] == 0 && response_bit[11] == 0)
tag.max_page = 32 / 32;
if (response_bit[10] == 0 && response_bit[11] == 1)
@ -1028,7 +1028,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
rxlen++;
} else {
// Ignore wierd value, is to small to mean anything
// Ignore weird value, is to small to mean anything
}
}
}
@ -1509,7 +1509,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
// external trigger rising edge, load RA on falling edge of TIOA.
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK

View file

@ -41,7 +41,7 @@ static crc_t legic_crc;
// harder. The current approach forwards the prng data based if there is data on
// air and time based, using GET_TICKS, during computational and wait periodes.
//
// To not have the necessity to calculate/guess execution time dependend timeouts
// To not have the necessity to calculate/guess execution time dependent timeouts
// tx_frame and rx_frame use a shared timestamp to coordinate tx and rx timeslots.
//-----------------------------------------------------------------------------

View file

@ -160,7 +160,7 @@ void MifareDesfireGetInformation(void) {
len = DesfireAPDU(cmd, cmd_len, resp);
if (!len) {
print_result("ERROR <--: ", resp, len);
payload.isOK = 3; // 3 == DOESNT ANSWER TO GET_VERSION
payload.isOK = 3; // 3 == DOESN'T ANSWER TO GET_VERSION
reply_ng(CMD_HF_DESFIRE_INFO, PM3_ESOFT, (uint8_t *)&payload, sizeof(payload));
switch_off();
return;
@ -173,7 +173,7 @@ void MifareDesfireGetInformation(void) {
len = DesfireAPDU(cmd, cmd_len, resp);
if (!len) {
print_result("ERROR <--: ", resp, len);
payload.isOK = 3; // 3 == DOESNT ANSWER TO GET_VERSION
payload.isOK = 3; // 3 == DOESN'T ANSWER TO GET_VERSION
reply_ng(CMD_HF_DESFIRE_INFO, PM3_ESOFT, (uint8_t *)&payload, sizeof(payload));
switch_off();
return;
@ -184,7 +184,7 @@ void MifareDesfireGetInformation(void) {
len = DesfireAPDU(cmd, cmd_len, resp);
if (!len) {
print_result("ERROR <--: ", resp, len);
payload.isOK = 3; // 3 == DOESNT ANSWER TO GET_VERSION
payload.isOK = 3; // 3 == DOESN'T ANSWER TO GET_VERSION
reply_ng(CMD_HF_DESFIRE_INFO, PM3_ESOFT, (uint8_t *)&payload, sizeof(payload));
switch_off();
return;

View file

@ -376,7 +376,7 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
//programming mode (0 or 1)
AddBitPCF7931(0, tab, l, p);
//block adress on 6 bits
//block address on 6 bits
for (u = 0; u < 6; ++u) {
if (address & (1 << u)) { // bit 1
++parity;

View file

@ -225,7 +225,7 @@ local Utils =
end,
-- input parameter is a string
-- Swaps the endianess and returns a string,
-- Swaps the endianness and returns a string,
-- IE: 'cd7a' -> '7acd' -> 0x7acd
SwapEndiannessStr = function(s, len)
if s == nil then return nil end

View file

@ -399,7 +399,7 @@
"system_integrator": "Mikron GmbH"
},
{
"application": "Employer indentification card",
"application": "Employer identification card",
"company": "VFJ Technology Pty Ltd",
"mad": "0x0113",
"service_provider": "VFJ Electronics Pty Ltd.",
@ -413,7 +413,7 @@
"system_integrator": "Cubic - VFJ"
},
{
"application": "Card Administratin, cardholder adminstration, access control & security, company services, miscellaneous applications",
"application": "Card Administration, cardholder administration, access control & security, company services, miscellaneous applications",
"company": "Ministry of Defense",
"mad": "0x0115",
"service_provider": "Ministry of Defence",
@ -1092,28 +1092,28 @@
"system_integrator": "INID"
},
{
"application": "Public transport sytems. Parking systems. Catering. Electronic wallet. Reservation system. Access services. Attendance services. Industrial identification. City card.",
"application": "Public transport systems. Parking systems. Catering. Electronic wallet. Reservation system. Access services. Attendance services. Industrial identification. City card.",
"company": "Duha systém s.r.o.",
"mad": "0x0735",
"service_provider": "DUHA systém s.r.o.",
"system_integrator": "DUHA systém s.r.o."
},
{
"application": "Public transport sytems. Parking systems. Catering. Electronic wallet. Reservation system. Access services. Attendance services. Industrial identification. City card.",
"application": "Public transport systems. Parking systems. Catering. Electronic wallet. Reservation system. Access services. Attendance services. Industrial identification. City card.",
"company": "Duha systém s.r.o.",
"mad": "0x0736",
"service_provider": "DUHA systém s.r.o.",
"system_integrator": "DUHA systém s.r.o."
},
{
"application": "Public transport sytems. Parking systems. Catering. Electronic wallet. Reservation system. Access services. Attendance services. Industrial identification. City card.",
"application": "Public transport systems. Parking systems. Catering. Electronic wallet. Reservation system. Access services. Attendance services. Industrial identification. City card.",
"company": "Duha systém s.r.o.",
"mad": "0x0737",
"service_provider": "DUHA systém s.r.o.",
"system_integrator": "DUHA systém s.r.o."
},
{
"application": "Public transport sytems. Parking systems. Catering. Electronic wallet. Reservation system. Access services. Attendance services. Industrial identification. City card.",
"application": "Public transport systems. Parking systems. Catering. Electronic wallet. Reservation system. Access services. Attendance services. Industrial identification. City card.",
"company": "Duha systém s.r.o.",
"mad": "0x0738",
"service_provider": "DUHA systém s.r.o.",
@ -2412,7 +2412,7 @@
"company": "Ascom Monétel",
"mad": "0x2013",
"service_provider": "ZTM (Transport Company of Marsaw)",
"system_integrator": "Ascom Monetel (porject leader Mr. Pascal Valette)"
"system_integrator": "Ascom Monetel (project leader Mr. Pascal Valette)"
},
{
"application": "Electronic transportation voucher",
@ -3731,7 +3731,7 @@
"system_integrator": "GiroVend"
},
{
"application": "Card Administratin, cardholder adminstration, access control & security, company services, miscellaneous applications",
"application": "Card Administratin, cardholder administration, access control & security, company services, miscellaneous applications",
"company": "Ministry of Defense",
"mad": "0x3802",
"service_provider": "Ministry of Defence",
@ -4683,7 +4683,7 @@
"system_integrator": "Interflex Datensysteme GmbH"
},
{
"application": "Employer indentification card",
"application": "Employer identification card",
"company": "VFJ Technology Pty Ltd",
"mad": "0x4808",
"service_provider": "VFJ Electronics Pty Ltd.",
@ -4725,7 +4725,7 @@
"system_integrator": "Siemens AG"
},
{
"application": "Card Administratin, cardholder adminstration, access control & security, company services, miscellaneous applications",
"application": "Card Administration, cardholder administration, access control & security, company services, miscellaneous applications",
"company": "Ministry of Defense",
"mad": "0x480E",
"service_provider": "Ministry of Defence",
@ -6105,14 +6105,14 @@
"system_integrator": "NORALSY"
},
{
"application": "Card Administratin, cardholder adminstration, access control & security, company services, miscellaneous applications",
"application": "Card Administration, cardholder administration, access control & security, company services, miscellaneous applications",
"company": "Ministry of Defense",
"mad": "0x4A01",
"service_provider": "Ministry of Defence",
"system_integrator": ""
},
{
"application": "Card Administratin, cardholder adminstration, access control & security, company services, miscellaneous applications",
"application": "Card Administration, cardholder administration, access control & security, company services, miscellaneous applications",
"company": "Ministry of Defense",
"mad": "0x4A02",
"service_provider": "Ministry of Defence",
@ -6847,14 +6847,14 @@
"system_integrator": "Honeywell"
},
{
"application": "Electronic purse, access control for buliding automation",
"application": "Electronic purse, access control for building automation",
"company": "CDE Communication Data Engineering GmbH",
"mad": "0x5138",
"service_provider": "CDE",
"system_integrator": "CDE"
},
{
"application": "Electronic purse, access control for buliding automation",
"application": "Electronic purse, access control for building automation",
"company": "CDE Communication Data Engineering GmbH",
"mad": "0x5139",
"service_provider": "CDE",
@ -7022,14 +7022,14 @@
"system_integrator": "Sogedex"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x5152",
"service_provider": "Sogedex",
"system_integrator": "Sogedex"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x5153",
"service_provider": "Sogedex",
@ -7491,70 +7491,70 @@
"system_integrator": "EMGROUP"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x5195",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x5196",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x5197",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x5198",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x5199",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x519A",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x519B",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x519C",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x519D",
"service_provider": "SOGEDEX",
"system_integrator": "SOGEDEX"
},
{
"application": "Identification and authentification system",
"application": "Identification and authentication system",
"company": "Sogedex",
"mad": "0x519E",
"service_provider": "SOGEDEX",
@ -7792,21 +7792,21 @@
"system_integrator": "DAS Card AB"
},
{
"application": "Accesss Control; biometric Identification",
"application": "Access Control; biometric Identification",
"company": "SYTEL",
"mad": "0x51C0",
"service_provider": "SYTEL",
"system_integrator": "SYTEL"
},
{
"application": "Accesss Control; biometric Identification",
"application": "Access Control; biometric Identification",
"company": "SYTEL",
"mad": "0x51C1",
"service_provider": "SYTEL",
"system_integrator": "SYTEL"
},
{
"application": "Accesss Control; biometric Identification",
"application": "Access Control; biometric Identification",
"company": "SYTEL",
"mad": "0x51C2",
"service_provider": "SYTEL",
@ -8408,7 +8408,7 @@
"system_integrator": "n/a"
},
{
"application": "High performance physical Accesss Control (reacting and writing on ccard in real time)",
"application": "High performance physical Access Control (reacting and writing on ccard in real time)",
"company": "Qontinuum Plus",
"mad": "0x5325",
"service_provider": "the users themselves",
@ -10571,7 +10571,7 @@
"system_integrator": "VFJ Hong Kong"
},
{
"application": "Security and safty services",
"application": "Security and safety services",
"company": "Staat der Nederlanden, Ministerie van Financien Belastingdienst/Centrum voor facilitaire dienstverlening",
"mad": "0x8006",
"service_provider": "Siemens Nederland BV",
@ -10585,7 +10585,7 @@
"system_integrator": "Voestalpine Informationstechnologie GmbH"
},
{
"application": "Accesss control in sport stadiums and e-purse",
"application": "Access control in sport stadiums and e-purse",
"company": "FortressGb",
"mad": "0x8008",
"service_provider": "FORTRESSGB",
@ -10627,7 +10627,7 @@
"system_integrator": "Fourth Way"
},
{
"application": "Employer indentification card",
"application": "Employer identification card",
"company": "VFJ Technology Pty Ltd",
"mad": "0x8805",
"service_provider": "VFJ Electronics Pty Ltd.",
@ -11054,14 +11054,14 @@
"system_integrator": "PVT"
},
{
"application": "Electronic purse, access control for buliding automation",
"application": "Electronic purse, access control for building automation",
"company": "CDE Communication Data Engineering GmbH",
"mad": "0x8843",
"service_provider": "CDE",
"system_integrator": "CDE"
},
{
"application": "Electronic purse, access control for buliding automation",
"application": "Electronic purse, access control for building automation",
"company": "CDE Communication Data Engineering GmbH",
"mad": "0x8844",
"service_provider": "CDE",
@ -11754,7 +11754,7 @@
"system_integrator": "SIT Solution for IT Payment GmbH"
},
{
"application": "Accesss control in sport stadiums and e-purse",
"application": "Access control in sport stadiums and e-purse",
"company": "FortressGb",
"mad": "0x88AB",
"service_provider": "FORTRESSGB",
@ -12167,7 +12167,7 @@
"system_integrator": "Siemens AG"
},
{
"application": "Security and safty services",
"application": "Security and safety services",
"company": "Staat der Nederlanden, Ministerie van Financien Belastingdienst/Centrum voor facilitaire dienstverlening",
"mad": "0xC006",
"service_provider": "Siemens Nederland BV",
@ -12601,7 +12601,7 @@
"system_integrator": "efkon"
},
{
"application": "Security and safty services",
"application": "Security and safety services",
"company": "Staat der Nederlanden, Ministerie van Financien Belastingdienst/Centrum voor facilitaire dienstverlening",
"mad": "0xC819",
"service_provider": "Siemens Nederland BV",
@ -12811,7 +12811,7 @@
"system_integrator": "Retail Petroleum Systems"
},
{
"application": "Driver Vehicle Indentification / fueling",
"application": "Driver Vehicle Identification / fueling",
"company": "Nedap - CTP B.V.",
"mad": "0xD004",
"service_provider": "Nedap CTP B.V.",
@ -13364,7 +13364,7 @@
"system_integrator": "Honeywell Automation India Limited"
},
{
"application": "Security and safty services",
"application": "Security and safety services",
"company": "Staat der Nederlanden, Ministerie van Financien Belastingdienst/Centrum voor facilitaire dienstverlening",
"mad": "0xD801",
"service_provider": "Siemens Nederland BV",
@ -13427,7 +13427,7 @@
"system_integrator": "IE Holding"
},
{
"application": "Security and safty services",
"application": "Security and safety services",
"company": "Staat der Nederlanden, Ministerie van Financien Belastingdienst/Centrum voor facilitaire dienstverlening",
"mad": "0xE802",
"service_provider": "Siemens Nederland BV",

View file

@ -593,7 +593,7 @@ const static atr_t AtrTable[] = {
{ "3B6900002494010000000001A9", "Kazakhstan Helios gas station debit card\nhttp://helios.kz/" },
{ "3B6900002494010201000101A9", "Chipcard from SUN to be used in SunRay's\n370-4328-01 (31091)" },
{ "3B6900002494010301000100A9", "Schlumberger MicroPayflex S card" },
{ "3B6900004944353056312E....", "eID Card to user autheticate and save paswords in the Card. Product ID50 Password manager from IDENTOS GmbH (eID)\nhttps://identos.com/id50-password-manager/" },
{ "3B6900004944353056312E....", "eID Card to user authenticate and save paswords in the Card. Product ID50 Password manager from IDENTOS GmbH (eID)\nhttps://identos.com/id50-password-manager/" },
{ "3B6900004944363056312E....", "token appidkey ID60-USB (Other)\nhttps://identsmart.com/en/products/id60-datasafe/" },
{ "3B6900004A434F503331563232", "Visa Europe Sample Card / Axalto" },
{ "3B6900005001010401000101A9", "Sample card given to all attendees of the CTST 2004 SmartCard Conference" },
@ -978,7 +978,7 @@ const static atr_t AtrTable[] = {
{ "3B6F00008031E06B04310502AF555555555555", "debit card (Bank)\nhttps://www.usaa.com/inet/wc/banking" },
{ "3B6F00008031E06B04310502D1555555555555", "Pockit Pre-Paid Mastercard (Contact Chip). (Bank)\nhttps://revolut.com/" },
{ "3B6F00008031E06B04310502D6555555555555", "Bank IN - Slovenian bank (Bank)\nhttps://www.bankain.si/BIN/vstopna.seam" },
{ "3B6F00008031E06B04520502BB555555555555", "AlfaBROU - Mastercard (prepaid card emited by Banco Republica - Uruguay) (Bank)\nhttps://www.brou.com.uy/personas/tarjetas/prepaga-alfabrou" },
{ "3B6F00008031E06B04520502BB555555555555", "AlfaBROU - Mastercard (prepaid card emitted by Banco Republica - Uruguay) (Bank)\nhttps://www.brou.com.uy/personas/tarjetas/prepaga-alfabrou" },
{ "3B6F00008031E06B04520502FD555555555555", "C6 Bank Mastercard Global Account (Bank)\nhttps://www.c6bank.com.br/conta-global\nC6 Bank Mastercard Brazil Account (Bank)\nhttps://www.c6bank.com.br/nossos-produtos" },
{ "3B6F00008031E06B04520502FE555555555555", "CITIBanamex 'Perfiles' debit card (Bank)\nhttps://www.banamex.com/es/personas/cuentas/cuenta-perfiles.html" },
{ "3B6F00008031E06B0505050280555555555555", "Banamex cuenta perfiles (Bank)\nhttp://banamex.com" },
@ -1082,7 +1082,7 @@ const static atr_t AtrTable[] = {
{ "3B6F0000805A28114210122B27558E85829000", "Stif Navigo Pass (French Syndicate of Transport in Ile de France) (Transport)" },
{ "3B6F0000805A28114210122B275DCF41829000", "Pass navigo (Transport)" },
{ "3B6F0000805A28114210122B276132D6829000", "Navigo (Transport)" },
{ "3B6F0000805A28114210122B2764E735829000", "Navigo pass, Paris (France) trasport network (https://en.wikipedia.org/wiki/Navigo_pass) (Transport)" },
{ "3B6F0000805A28114210122B2764E735829000", "Navigo pass, Paris (France) transport network (https://en.wikipedia.org/wiki/Navigo_pass) (Transport)" },
{ "3B6F0000805A28114210122B276562F7829000", "French NAVIGO Card (simple Navigo model, not annual or Imagin'R) (Transport)" },
{ "3B6F0000805A28114210122B276780D9829000", "Navigo (Transport)\nhttps://www.navigo.fr/" },
{ "3B6F0000805A28114210122B276D6BB5829000", "Navigo (Transport)" },
@ -2026,7 +2026,7 @@ const static atr_t AtrTable[] = {
{ "3B8F8001804F0CA00000030601....00000000..", "RFID - ISO 14443 Type A Part 1 (as per PCSC std part3)" },
{ "3B8F8001804F0CA00000030602....00000000..", "RFID - ISO 14443 Type A Part 2 (as per PCSC std part3)" },
{ "3B8F8001804F0CA00000030603....00000000..", "RFID - ISO 14443 Type A Part 3 (as per PCSC std part3)" },
{ "3B8F8001804F0CA000000306030000000000006B", "buss/train pass for use with Skanetrafiken (www.skanetrafiken.se) busses and trains.\npublic libary of Dusseldorf\nhttp://www.duesseldorf.de/stadtbuechereien/\nspecialized Mifare Ultralight card" },
{ "3B8F8001804F0CA000000306030000000000006B", "buss/train pass for use with Skanetrafiken (www.skanetrafiken.se) busses and trains.\npublic library of Dusseldorf\nhttp://www.duesseldorf.de/stadtbuechereien/\nspecialized Mifare Ultralight card" },
{ "3B8F8001804F0CA000000306030001000000006A", "NXP/Philips MIFARE Classic 1K (as per PCSC std part3)\nhttp://www.nxp.com/#/pip/pip=[pfp=41863]|pp=[t=pfp,i=41863]\nOyster card - Transport for London (first-gen)\nhttps://en.wikipedia.org/wiki/Oyster_card\nACOS5/1k Mirfare\nvivotech ViVOcard Contactless Test Card\nBangkok BTS Sky SmartPass\nMifare Classic 1K (block 0 re-writeable)\nElectic vehicle charging card of the German Telekom, acting as EMSP GetCharge\nElectic vehicle charging card of the EMSP Stadtwerke Muenchen (SWM), ladenetz.de, Germany\nElectic vehicle charging card of the EMSP EinfachStromLaden of Maingau-Energie, Germany\nScouter carsharing customer card in Germany\nhttps://scouter.de/" },
{ "3B8F8001804F0CA0000003060300020000000069", "RFID - ISO 14443 Type A - NXP Mifare card with 4k EEPROM" },
{ "3B8F8001804F0CA0000003060300030000000068", "RFID - ISO 14443 Type A - NXP Mifare Ultralight or UltralightC" },
@ -2968,7 +2968,7 @@ const static atr_t AtrTable[] = {
{ "3BDF18008131FE7D006B150C0180011101434E53103180E9", "Provider: Actalis S.p.A.\ncode: AT00006181\nhttp://www.actalis.it" },
{ "3BDF18008131FE7D006B150C0181011101434E53103180E8", "Italian healthcare card (TS) National Service Card (CNS)\nCarta Regionale dei Servizi - Regione Lombardia\nTuscany TS-CNS\nhttp://www.regione.toscana.it/cartasanitaria" },
{ "3BDF18FF8131FE4580590180484944433730307300011B33", "Crescendo C700 + MiFare 4K\nhttp://www.smartcardfocus.com/shop/ilp/id~265/p/index.shtml" },
{ "3BDF18FF8191FE1FC3003138644790ECC273140150829000BA", "Card store authentification and signature keys (JavaCard)\nhttps://ants.gouv.fr/Les-titres/Cartes-Agents/Adhesion/Telechargement-et-support" },
{ "3BDF18FF8191FE1FC3003138644790ECC273140150829000BA", "Card store authentication and signature keys (JavaCard)\nhttps://ants.gouv.fr/Les-titres/Cartes-Agents/Adhesion/Telechargement-et-support" },
{ "3BDF18FF8191FE1FC30031B8640000EC0073940000829000FE", "NXP Jcop3 P60 ChipDoc v7b4 (JavaCard)\nhttps://www.javacardos.com/store/products/10029" },
{ "3BDF18FF8191FE1FC30031B86404216010739401C005900001", "Dutch Governement Identity Card using physical (eID)\nhttps://nl.wikipedia.org/wiki/Rijkspas" },
{ "3BDF18FF8191FE1FC30031B8640C01ECC173940180829000B3", "ebee card\nhttps://www.ebeeoffice.ca/ebee-home/public\nDigital Signature Costa Rica (issued since 09/2019) (eID)\nhttps://www.mifirmadigital.go.cr/" },
@ -3081,7 +3081,7 @@ const static atr_t AtrTable[] = {
{ "3BEE00008131804280318066B0840C016E01830090008E", "MultiApp Cards (Easy 72K Type B and Combi 72K Type B)\nE.SUN Commercial bank debit master card (Bank)\nTaiwan EasyCard (Transport)\nhttps://www.easycard.com.tw/english/index.asp" },
{ "3BEE00008131804380318066B1A1110100F683009000", "Optelio/Desineo Cards (D72 FXR1)" },
{ "3BEE00008131804380318066B1A11101A0F683009000", "Optelio D72 FXR1 (MD) T=1" },
{ "3BEE00008131FE45003180718665016702A00A8390001B", "IBM JCOP 'Java Card 2.1.1' et 'Open Plaform 2.0.1'" },
{ "3BEE00008131FE45003180718665016702A00A8390001B", "IBM JCOP 'Java Card 2.1.1' et 'Open Platform 2.0.1'" },
{ "3BEE00008131FE4580318066409093060F1783019000FD", "Health insurance (HealthCare)" },
{ "3BEE00008131FE4580318066409093060F17830F9000F3", "IC card for the National Health Insurance, Taiwan" },
{ "3BEF..0040148025434552455357....0101039000", "Electronic Identification Card from the FNMT, the Spanish Official\nCertification Authority (Fabrica Nacional de Moneda y Timbre)\nFNMT-Ceres Siemens Infineon SLE 19" },
@ -3302,7 +3302,7 @@ const static atr_t AtrTable[] = {
{ "3BFA1300FF813180450031C173C00100009000B1", "OpenPGP" },
{ "3BFA1800008031FE45FE654944202F20504B4903", "Estonian Identity Card (EstEID v3.5 (10.2014) cold) (eID)\nhttp://id.ee/" },
{ "3BFA1800008131FE4506082A841001876E0805BC", "Dutch Rijkspas (eID)" },
{ "3BFA1800008131FE4506082A841001876E0807BE", "Rijkspas (identification card dutch government employees) (eID)\nhttps://nl.wikipedia.org/wiki/Rijkspas\nDutch goverment multifunctional smartcard (Other)\nhttps://nl.wikipedia.org/wiki/Rijkspas" },
{ "3BFA1800008131FE4506082A841001876E0807BE", "Rijkspas (identification card dutch government employees) (eID)\nhttps://nl.wikipedia.org/wiki/Rijkspas\nDutch government multifunctional smartcard (Other)\nhttps://nl.wikipedia.org/wiki/Rijkspas" },
{ "3BFA1800008131FE45060860841001876F0602FE", "Card used by the Dutch health insurers to give medical personell access to patient insurance information" },
{ "3BFA1800008131FE454A33413034305632343184", "NXP J3A 40K\nJava Card v2.2.2 - Global Platform v2.2.1\nDual-interface functionality (features 1K Mifare emulation)" },
{ "3BFA1800008131FE454A33413038315632343189", "NXP JCOP CJ3A081\nhttp://www.usmartcards.com/media/downloads/492/NXP%20P5CX012%2002X%2040%2073%2080%20144%20%20%202011.pdf" },
@ -3459,7 +3459,7 @@ const static atr_t AtrTable[] = {
{ "3BFF1800008131FE45006B04050100012101434E5310318059", "CNS - Carta Nazionale dei Servizi (Italia)\nPA emittente: Regione Autonoma della Sardegna\nCarta del Servizio Sanitario Regionale - Emilia Romagna" },
{ "3BFF1800008131FE45006B05051017012101434E531031805E", "Regional Card - Regione Liguria, Veneto - Italy (eID)\nTessera Sanitaria - Carta Regionale dei Servizi" },
{ "3BFF1800008131FE45006B05052000012101434E5310318079", "health card (HealthCare)\nhttps://tscns.regione.sardegna.it/" },
{ "3BFF1800008131FE45006B11050700011101434E531131807B", "Italian National Fire Corps -special indentification card (eID)" },
{ "3BFF1800008131FE45006B11050700011101434E531131807B", "Italian National Fire Corps -special identification card (eID)" },
{ "3BFF1800008131FE45006B11050700012101434E531031804A", "Oberthur ID-One Cosmo V7-n it's a java card 2.2.2\nIzenpe Certificado Ciudadano (eID)\nhttps://www.izenpe.eus/informacion/certificado-ciudadano/s15-content/es/" },
{ "3BFF1800008131FE4D8025A00000005657444B3430300600DD", "DataKey 400 (DK400)" },
{ "3BFF1800008131FE55006B02090403010101434E5310318065", "Italian Chambers of Commerce CNS (PKI)\nhttp://www.card.infocamere.it/infocard/pub/" },

View file

@ -612,7 +612,7 @@ static int CmdHFiClassSim(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "hf iclass sim",
"Simulate a iCLASS legacy/standard tag",
"hf iclass sim -t 0 --csn 031FEC8AF7FF12E0 --> simulate with specficied CSN\n"
"hf iclass sim -t 0 --csn 031FEC8AF7FF12E0 --> simulate with specified CSN\n"
"hf iclass sim -t 1 --> simulate with default CSN\n"
"hf iclass sim -t 2 --> execute loclass attack online part\n"
"hf iclass sim -t 3 --> simulate full iCLASS 2k tag\n"
@ -3923,7 +3923,7 @@ static command_t CommandTable[] = {
{"encrypt", CmdHFiClassEncryptBlk, AlwaysAvailable, "Encrypt given block data"},
{"decrypt", CmdHFiClassDecrypt, AlwaysAvailable, "Decrypt given block data or tag dump file" },
{"managekeys", CmdHFiClassManageKeys, AlwaysAvailable, "Manage keys to use with iclass commands"},
{"permutekey", CmdHFiClassPermuteKey, IfPm3Iclass, "Permute function from 'heart of darkness' paper"},
{"permutekey", CmdHFiClassPermuteKey, AlwaysAvailable, "Permute function from 'heart of darkness' paper"},
{"view", CmdHFiClassView, AlwaysAvailable, "Display content from tag dump file"},
{NULL, NULL, NULL, NULL}
};

View file

@ -11,13 +11,6 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by
* Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
* Milosch Meriac in the paper "Dismantling IClass".
*
* Copyright (C) 2014 Martin Holst Swende
*
* This is free software: you can redistribute it and/or modify

View file

@ -11,13 +11,6 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by
* Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
* Milosch Meriac in the paper "Dismantling IClass".
*
* Copyright (C) 2014 Martin Holst Swende
*
* This is free software: you can redistribute it and/or modify

View file

@ -11,7 +11,7 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* This file is part of loclass. It is a reconstruction of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by

View file

@ -11,7 +11,7 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* This file is part of loclass. It is a reconstruction of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by

View file

@ -11,7 +11,7 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* This file is part of loclass. It is a reconstruction of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by

View file

@ -11,7 +11,7 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* This file is part of loclass. It is a reconstruction of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by

View file

@ -11,7 +11,7 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* This file is part of loclass. It is a reconstruction of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by

View file

@ -11,7 +11,7 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* This file is part of loclass. It is a reconstruction of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by

View file

@ -11,7 +11,7 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* This file is part of loclass. It is a reconstruction of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by

View file

@ -11,7 +11,7 @@
*
*****************************************************************************
*
* This file is part of loclass. It is a reconstructon of the cipher engine
* This file is part of loclass. It is a reconstruction of the cipher engine
* used in iClass, and RFID techology.
*
* The implementation is based on the work performed by

View file

@ -145,7 +145,7 @@ static const char *getstatus(uint16_t *sw) {
case MFDES_E_APPL_INTEGRITY:
return "Application integrity error, application will be disabled";
case MFDES_E_AUTHENTIFICATION_ERROR:
case MFDES_E_AUTHENTICATION_ERROR:
return "Current authentication status does not allow the requested command";
case MFDES_E_BOUNDARY:

View file

@ -249,7 +249,7 @@ ProxGuiQT::~ProxGuiQT(void) {
// Event override functions
// -------------------------------------------------
PictureWidget::PictureWidget() {
// Set the initial postion and size from settings
// Set the initial position and size from settings
// if (g_session.preferences_loaded)
// setGeometry(g_session.pw.x, g_session.pw.y, g_session.pw.w, g_session.pw.h);
// else
@ -268,7 +268,7 @@ void PictureWidget::closeEvent(QCloseEvent *event) {
// -------------------------------------------------
SliderWidget::SliderWidget() {
// Set the initial postion and size from settings
// Set the initial position and size from settings
if (g_session.preferences_loaded)
setGeometry(g_session.overlay.x, g_session.overlay.y, g_session.overlay.w, g_session.overlay.h);
else
@ -330,7 +330,7 @@ void ProxWidget::vchange_dthr_down(int v) {
ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
this->master = master;
// Set the initial postion and size from settings
// Set the initial position and size from settings
if (g_session.preferences_loaded)
setGeometry(g_session.plot.x, g_session.plot.y, g_session.plot.w, g_session.plot.h);
else
@ -379,7 +379,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
controlWidget->resize(size().width(), 200);
}
// Olverlays / slider window title
// Overlays / slider window title
QString ct = QString("[*]Slider [ %1 ]").arg(g_conn.serial_port_name);
controlWidget->setWindowTitle(ct);

View file

@ -79,7 +79,7 @@ begin
to_arm_shiftreg <= adc_d;
else begin
to_arm_shiftreg[7:1] <= to_arm_shiftreg[6:0];
// simulation showed a glitch occuring due to the LSB of the shifter
// simulation showed a glitch occurring due to the LSB of the shifter
// not being set as we shift bits out
// this ensures the ssp_din remains low after a transfer and suppresses
// the glitch that would occur when the last data shifted out ended in

View file

@ -31,7 +31,7 @@ begin
to_arm_shiftreg <= adc_d;
else begin
to_arm_shiftreg[7:1] <= to_arm_shiftreg[6:0];
// simulation showed a glitch occuring due to the LSB of the shifter
// simulation showed a glitch occurring due to the LSB of the shifter
// not being set as we shift bits out
// this ensures the ssp_din remains low after a transfer and suppresses
// the glitch that would occur when the last data shifted out ended in

View file

@ -79,7 +79,7 @@ begin
to_arm_shiftreg <= adc_d;
else begin
to_arm_shiftreg[7:1] <= to_arm_shiftreg[6:0];
// simulation showed a glitch occuring due to the LSB of the shifter
// simulation showed a glitch occurring due to the LSB of the shifter
// not being set as we shift bits out
// this ensures the ssp_din remains low after a transfer and suppresses
// the glitch that would occur when the last data shifted out ended in

View file

@ -31,7 +31,7 @@ begin
to_arm_shiftreg <= adc_d;
else begin
to_arm_shiftreg[7:1] <= to_arm_shiftreg[6:0];
// simulation showed a glitch occuring due to the LSB of the shifter
// simulation showed a glitch occurring due to the LSB of the shifter
// not being set as we shift bits out
// this ensures the ssp_din remains low after a transfer and suppresses
// the glitch that would occur when the last data shifted out ended in

View file

@ -490,7 +490,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
#define MFDES_E_PARAMETER_ERROR 0x9E
#define MFDES_E_APPLICATION_NOT_FOUND 0xA0
#define MFDES_E_APPL_INTEGRITY 0xA1
#define MFDES_E_AUTHENTIFICATION_ERROR 0xAE
#define MFDES_E_AUTHENTICATION_ERROR 0xAE
#define MFDES_E_BOUNDARY 0xBE
#define MFDES_E_PICC_INTEGRITY 0xC1
#define MFDES_E_COMMAND_ABORTED 0xCA

View file

@ -1,7 +1,7 @@
#!/bin/bash
# (Need bash because of Bash Arrays)
# These vars can be overriden by env variables
# These vars can be overridden by env variables
echo "Makefile flags: ${MKFLAGS:=-j8}"
echo "Destination: ${DEST:=firmware}"
echo "Produce stats?: ${STATS:=false}"

View file

@ -408,7 +408,7 @@ static inline uint32_t sm_right(const uint8_t *ks, uint8_t *mask, vector<uint64_
for (it = bincstates.begin(); it != bincstates.end(); ++it) {
pcrstates->push_back(it->second);
}
// Reverse the vector order (so the higest bin comes first)
// Reverse the vector order (so the highest bin comes first)
reverse(pcrstates->begin(), pcrstates->end());
return topbits;
@ -588,7 +588,7 @@ static inline void sm_left(const uint8_t *ks, uint8_t *mask, vector<cs_t> *pcsta
for (it = bincstates.begin(); it != bincstates.end(); ++it) {
pcstates->push_back(it->second);
}
// Reverse the vector order (so the higest bin comes first)
// Reverse the vector order (so the highest bin comes first)
reverse(pcstates->begin(), pcstates->end());
}
@ -733,8 +733,8 @@ int main(int argc, const char *argv[]) {
uint64_t nCi; // Card random
uint64_t nQ; // Reader random
uint64_t nCh; // Reader challange
uint64_t nCi_1; // Card anwser
uint64_t nCh; // Reader challenge
uint64_t nCi_1; // Card answer
if ((argc != 2) && (argc != 5)) {
printf("SecureMemory recovery - (c) Radboud University Nijmegen\n\n");

View file

@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Modifed Iceman, 2020
* Modified Iceman, 2020
*/
#include <stdio.h>
@ -470,7 +470,7 @@ static uint32_t ice_sm_right(const uint8_t *ks, uint8_t *mask, vector<uint64_t>
pcrstates->push_back(it->second);
}
// Reverse the vector order (so the higest bin comes first)
// Reverse the vector order (so the highest bin comes first)
reverse(pcrstates->begin(), pcrstates->end());
return g_topbits;
@ -583,7 +583,7 @@ static void ice_sm_left(const uint8_t *ks, uint8_t *mask, vector<cs_t> *pcstates
for (it = bincstates.begin(); it != bincstates.end(); ++it) {
pcstates->push_back(it->second);
}
// Reverse the vector order (so the higest bin comes first)
// Reverse the vector order (so the highest bin comes first)
reverse(pcstates->begin(), pcstates->end());
}
@ -649,7 +649,7 @@ static inline uint32_t sm_right(const uint8_t *ks, uint8_t *mask, vector<uint64_
pcrstates->push_back(it->second);
}
// Reverse the vector order (so the higest bin comes first)
// Reverse the vector order (so the highest bin comes first)
reverse(pcrstates->begin(), pcrstates->end());
return topbits;
@ -825,7 +825,7 @@ static inline void sm_left(const uint8_t *ks, uint8_t *mask, vector<cs_t> *pcsta
for (it = bincstates.begin(); it != bincstates.end(); ++it) {
pcstates->push_back(it->second);
}
// Reverse the vector order (so the higest bin comes first)
// Reverse the vector order (so the highest bin comes first)
reverse(pcstates->begin(), pcstates->end());
}
@ -991,8 +991,8 @@ int main(int argc, const char *argv[]) {
uint64_t nCi; // Card random
uint64_t nQ; // Reader random
uint64_t nCh; // Reader challange
uint64_t nCi_1; // Card anwser
uint64_t nCh; // Reader challenge
uint64_t nCi_1; // Card answer
if ((argc != 2) && (argc != 5)) {
printf("SecureMemory recovery - (c) Radboud University Nijmegen\n\n");

View file

@ -19,7 +19,7 @@ paper and the fourth attack comes from the second paper.
_note_
There are no Proxmark3 client implemented commands for these attacks. Only seperate executables to be compiled and run on your own system.
There are no Proxmark3 client implemented commands for these attacks. Only separate executables to be compiled and run on your own system.
No guarantees of working binaries on all systems. Some work on linux only.
There is no easy way to extract the needed data from a live system and use with these tools.
You can use the `RFIdler` device but the Proxmark3 client needs some more love. Feel free to contribute.

View file

@ -388,7 +388,7 @@ void find_state(const uint candidate_index_base,
for (uint i = lid; i < 4; i+= lsize) checks[i] = _checks[i];
#endif
// threads syncronization
// threads synchronization
barrier (CLK_LOCAL_MEM_FENCE);
#else
#define keystream _keystream

View file

@ -1,14 +1,14 @@
mf_nonce_brute
==============
Nested authentificated sector key recovery tool
Nested auntenticated sector key recovery tool
-----------------------------------------------
Compatible tags:
* Mifare Classic 1k (4k)
* Mifare Plus in SL1 mode
To recover keys to nested authentificated sectors you need a reader-card communication log. To get it use
To recover keys to nested auntenticated sectors you need a reader-card communication log. To get it use
hardware tools that able to sniff communication (for example Proxmark3 or HydraNFC).
This enhanced version:

View file

@ -19,7 +19,7 @@ my $ctime;
# GIT status 0 = dirty, 1 = clean , 2 = undecided
my $clean = 2;
my $undecided = (defined $ARGV[0]) && ($ARGV[0] =~ '--undecided');
# Do we have acces to git command?
# Do we have access to git command?
#######
# solves some bug on macos i.e:
##

View file

@ -19,7 +19,7 @@ fullgitinfo="RRG/Iceman"
# GIT status 0 = dirty, 1 = clean , 2 = undecided
clean=2
# Do we have acces to git command?
# Do we have access to git command?
commandGIT=$(env git)
if [ "$commandGIT" != "" ]; then

View file

@ -242,7 +242,7 @@ nextttt00000:
; ---------------------------------------------------------------------------
; ---------------------------------------------------------------------------
; ---------------------------------------------------------------------------
cjne R7,#060h,nextttt00001 ;START+MY ADRESS
cjne R7,#060h,nextttt00001 ;START+MY ADDRESS
clr pin_led ;LED ON
clr bit_command_receive