Skip to content

Commit 2328434

Browse files
committed
typos
1 parent 34a6955 commit 2328434

37 files changed

+115
-129
lines changed

CHANGELOG.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
6868
- Fix `lf em 4x50/4x70 *` reverted a misunderstanding in byte order macros (@iceman1001)
6969
- Added more keys (@equipter)
7070
- Changed `hf nfc ndefread` - ndef parser now handles more types (@iceman1001)
71-
- Fix `hf desfire` changekey, GetUID, 3DES sesson key tweak. (@mwalker33)
71+
- Fix `hf desfire` changekey, GetUID, 3DES session key tweak. (@mwalker33)
7272
- Fix `hf fido` commands now works correctly (@merlokk)
7373
- Moved / renamed `client/resource/fido2_defparams.json` -> `client/resource/hf_fido2_defparams.json` (@merlokk)
7474
- 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
9999
- Changed `lf search` - add option `-c` to continue searching after first hit (@doegox)
100100
- Fix DESFire mis-annotation (@VortixDev)
101101
- Changed `lf pac demod` - now also search for inverted bitstreams (@iceman1001)
102-
- Changed `hf 14b reader` - now supports continous mode (@iceman1001)
102+
- Changed `hf 14b reader` - now supports continuous mode (@iceman1001)
103103
- Fix `hf search` - now doesn't false identify ISO15693 (@iceman1001)
104104
- Changed emv commands now works with tokenized cards (@merlokk)
105105
- 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
158158
- Added a script to dump originality signatures from MFU EV1s and NTAGs (@aveao)
159159
- Fix `hf emrtd` segfaults (@aveao)
160160
- Fix `lf em 4150` timings on device side (@tharexde)
161-
-Changed dependecies fixes in build scripts (@doegox, @iceman1001, @gator96100)
161+
-Changed dependencies fixes in build scripts (@doegox, @iceman1001, @gator96100)
162162
- Changed `recover_pk.py` to support colors (@iceman1001)
163163
- Changed flashing feedback text to include needed steps (@iceman1001)
164164
- 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
184184
- Added `tools/hitag2crack/crack5opencl`, an optimized version of `crack5gpu` (@matrix)
185185
- Fixed Makefile to account for changes when running on Apple Silicon (@tcprst)
186186
- Added support for debugging ARM with JTAG & VSCode (@Gator96100)
187-
- Added MFUL "Gen1b" suport to `hf_mfu_setuid.lua` (@iceman1001)
187+
- Added MFUL "Gen1b" support to `hf_mfu_setuid.lua` (@iceman1001)
188188
- Added possibility to get bargraph in `lf tune` and `hf tune` (@iceman1001, @doegox)
189189
- Added `hf emrtd` ePassport dumping and parsing (@aveao)
190190
- Added `aidsearch` to `hf 14b info` (@iceman1001)
@@ -228,14 +228,14 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
228228
- Change many commands to cliparser (@iceman1001, @tcprst, @mwalker33,...)
229229
- ...
230230
- Change `hf iclass chk/lookup/loclass` speedups (@iceman1001)
231-
- Change - ongoing convertion to cliparser (@tcprst, @iceman1001)
231+
- Change - ongoing conversion to cliparser (@tcprst, @iceman1001)
232232
- Added compilation options for 256k Proxmark versions, see doc (@doegox)
233233
- Added support for 10b UID in `hf 14a sim` (@doegox)
234234
- Added `HF_TCPRST` standalone mode which read and emulate IKEA Rothult cards (@tcprst)
235235
- Add Gallagher key checking/KDF on MIFARE Desfire (@NZSmartie)
236236
- Add dictionaries with common words of proper size (@will-caruana)
237237
- Add `hf mf supercard` (@iceman1001)
238-
- Add initial suport for MIFARE Key Diversification, cf AN10922 (@NZSmartie)
238+
- Add initial support for MIFARE Key Diversification, cf AN10922 (@NZSmartie)
239239
- Change MIFARE detection improved (@VortixDev)
240240
- Change `hf 14b sriread` to `hf 14b rdbl` and `hf 14b dump` (@iceman1001)
241241
- 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
258258
- Add low level support for 14b' aka Innovatron (@doegox)
259259
- Add doc/cliparser.md (@mwalker33)
260260
- Add `hf 14b apdu` - send APDU over ISO14443B (@iceman1001)
261-
- Add `lf t55xx chk e <EM4100> option` - Checks calculated password based on the EM4100 id from some white cloners forumla by paleopterix (@mwalker33)
261+
- Add `lf t55xx chk e <EM4100> option` - Checks calculated password based on the EM4100 id from some white cloners formula by paleopterix (@mwalker33)
262262
- Add `lf t55xx sniff` to allow extracting commands and passwords used be cloners. (@mwalker33)
263263
- Add options to `lf read`, `lf cmdread`, `lf sniff` for repeated acquisitions (@doegox)
264264
- 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
268268
- Add test for Ultralight gen2 magic 'hf search' (@McEloff)
269269
- Add test for Ultralight EV1 gen2 magic 'hf search' (@McEloff)
270270
- Added `hf mf gen3*`magic gen 3 card operations (@McEloff)
271-
- Readded verichip command which seems missing (@iceman1001)
271+
- Re-added verichip command which seems missing (@iceman1001)
272272
- Fix missing t55x7 config block detection (@iceman1001)
273273
- Fix missing define on proxspace (@mwalker33)
274274
- Added `lf em 4x50_dump` (@iceman1001)
@@ -277,7 +277,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
277277
- Added `4x50_write` (@tharexde)
278278
- Added `4x50_write_password` (@tharexde)
279279
- Fix em4x50 demodulation error (@tharexde)
280-
- Fix `hf mfdes` authentification issues, DES working (@bkerler)
280+
- Fix `hf mfdes` authentication issues, DES working (@bkerler)
281281
- Add Android cross-compilation to client cmake (@dxl, @doegox)
282282
- Fix `emv scan` - now saves in current folder and uses unique names (@iceman1001)
283283
- 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
356356
- Fix issue #729. Avoid stalling on non-rdv4 when polling for FeliCa without card in proximity (@doegox)
357357
- Change `lf nexwatch demod` - lenient demod sizes (@iceman1001)
358358
- Change `lf nexwath sim/clone` - now supports 88bit format direct. (@iceman1001)
359-
- Rewrited `standalone mode lf_em4100rwc `, added card bruteforce mode. (Dmitriy Loginoov)
359+
- Rewritten `standalone mode lf_em4100rwc `, added card bruteforce mode. (Dmitriy Loginoov)
360360
- Change `data load` - color (@iceman1001)
361361
- Change appveyor verbose (@doegox)
362362
- 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
417417
- Added Mifare Desfire Read/Write/Create files/records/values functionality and several fixes to `hf mfdes` (@bkerler)
418418
- Added CreateStdFile command to Mifare `hf mfdes` (@bkerler)
419419
- Rework des/3des/3k3des/aes auth. Port to mbedtls crypto library on device (@bkerler)
420-
- Port `hf mfdes` Authentification to CommandNG structure, fix auth session key (@bkerler)
420+
- Port `hf mfdes` Auntentication to CommandNG structure, fix auth session key (@bkerler)
421421
- Updates `hf mfdes` functions, improved logging and added new commands (@bkerler)
422422
- Updated 'legic.lua' and 'legic_clone.lua' script - works with current command set (@Pizza_4u)
423423
- Rewrote `hf mfdes` functions and added apdu debugging (@bkerler)
@@ -637,8 +637,8 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
637637
- Change: lf cotag demod - adjusted error trigger (@iceman1001)
638638
- Added documentation on BT add-on (@iceman1001/@doegox)
639639
- Change: new button behaviour in bootloader mode, no need to keep it pressed, press again to interrupt (@doegox)
640-
- Change: new keys in dicts, new mem layout to accomodate them (@iceman1001/various)
641-
- Fix lf sim - if called with empty graphbuffer all strange things happend, like turning on HF field (@iceman1001)
640+
- Change: new keys in dicts, new mem layout to accommodate them (@iceman1001/various)
641+
- Fix lf sim - if called with empty graphbuffer all strange things happen, like turning on HF field (@iceman1001)
642642
- Change: hf 14a sim / hf mf sim - check buttonpress/usb frame fewer times in order not to disrupt simulation (@McEloff)
643643
- Change: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data (@iceman1001)
644644
- 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
654654
- Change legic.lua saves data in EML and BIN formats (@iceman1001)
655655
- Change hf tune - is now synchronous (for BT add-on) and can be interrupted by kbd (@doegox)
656656
- Change: update macOS install instruction (@ Uli Heilmeier)
657-
- Added trace ouput in hexdump format for Wireshark import (@ Uli Heilmeier)
657+
- Added trace output in hexdump format for Wireshark import (@ Uli Heilmeier)
658658
- Added usart btpin - to change BT add-on PIN (@doegox)
659659
- Added reconnection support (@iceman1001/@doegox)
660660
- Added usart tx/rx/... - USART developer commands (@doegox)
@@ -937,7 +937,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
937937
- Change 512kb detection when flashing (@iceman1001)
938938
- Fixed compilation GCC4.9 or higher detection (@winguru)
939939
- Fixed compiler warnings in Ubuntu 17.04 (@iceman1001)
940-
- Ripped out `standalone` code into separete folder to be continued. (@iceman1001)
940+
- Ripped out `standalone` code into separate folder to be continued. (@iceman1001)
941941
- `hf mf nested`, added key validation to entered key (@merlokk)
942942
- `hf mf hardnested`, added key validation to enterd key (@iceman1001)
943943
- Change a lot of help texts (@iceman1001)
@@ -1007,7 +1007,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
10071007

10081008
## [1.6.9 iceman fork] [2017-02-06]
10091009
- Serial speedup, if possible 408600baud otherwise default to 115200baud (@iceman1001)
1010-
- `hf emv` - Added Peter Fillmore EMV branch now compiles on iceman fork. See seperate issue. (@iceman1001)
1010+
- `hf emv` - Added Peter Fillmore EMV branch now compiles on iceman fork. See separate issue. (@iceman1001)
10111011
- `hf 14a reader` - Aztek detection. (@iceman1001)
10121012
- `standalone mode` - added more detection of tags and refactored (@iceman1001)
10131013
- `script run ufodump` - dumps an Aztek tag. (@iceman1001)

COMPILING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ The [public roadmap](https://github.com/RfidResearchGroup/proxmark3/wiki/Public-
157157

158158
This repo compiles nicely on
159159
- WSL1 on Windows 10
160-
- Proxspace enviroment [release v3.10](https://github.com/Gator96100/ProxSpace/releases)
160+
- Proxspace environment [release v3.10](https://github.com/Gator96100/ProxSpace/releases)
161161
- Windows/MinGW environment
162162
- Ubuntu, ParrotOS, Gentoo, Pentoo, Kali, NetHunter, Arch Linux, Fedora, Debian, Raspbian
163163
- Android / Termux

armsrc/hitagS.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
739739
| (response_bit[6] << 5) | (response_bit[7] << 4)
740740
| (response_bit[8] << 3) | (response_bit[9] << 2)
741741
| (response_bit[10] << 1) | response_bit[11]);
742-
//check wich memorysize this tag has
742+
//check which memorysize this tag has
743743
if (response_bit[10] == 0 && response_bit[11] == 0)
744744
tag.max_page = 32 / 32;
745745
if (response_bit[10] == 0 && response_bit[11] == 1)
@@ -1028,7 +1028,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, uint8_t *data) {
10281028
rx[rxlen / 8] |= 0 << (7 - (rxlen % 8));
10291029
rxlen++;
10301030
} else {
1031-
// Ignore wierd value, is to small to mean anything
1031+
// Ignore weird value, is to small to mean anything
10321032
}
10331033
}
10341034
}
@@ -1509,7 +1509,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page) {
15091509
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
15101510
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
15111511

1512-
// Capture mode, defaul timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
1512+
// Capture mode, default timer source = MCK/2 (TIMER_CLOCK1), TIOA is external trigger,
15131513
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK;
15141514
// external trigger rising edge, load RA on falling edge of TIOA.
15151515
AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK

armsrc/legicrf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static crc_t legic_crc;
4141
// harder. The current approach forwards the prng data based if there is data on
4242
// air and time based, using GET_TICKS, during computational and wait periodes.
4343
//
44-
// To not have the necessity to calculate/guess execution time dependend timeouts
44+
// To not have the necessity to calculate/guess execution time dependent timeouts
4545
// tx_frame and rx_frame use a shared timestamp to coordinate tx and rx timeslots.
4646
//-----------------------------------------------------------------------------
4747

armsrc/mifaredesfire.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void MifareDesfireGetInformation(void) {
160160
len = DesfireAPDU(cmd, cmd_len, resp);
161161
if (!len) {
162162
print_result("ERROR <--: ", resp, len);
163-
payload.isOK = 3; // 3 == DOESNT ANSWER TO GET_VERSION
163+
payload.isOK = 3; // 3 == DOESN'T ANSWER TO GET_VERSION
164164
reply_ng(CMD_HF_DESFIRE_INFO, PM3_ESOFT, (uint8_t *)&payload, sizeof(payload));
165165
switch_off();
166166
return;
@@ -173,7 +173,7 @@ void MifareDesfireGetInformation(void) {
173173
len = DesfireAPDU(cmd, cmd_len, resp);
174174
if (!len) {
175175
print_result("ERROR <--: ", resp, len);
176-
payload.isOK = 3; // 3 == DOESNT ANSWER TO GET_VERSION
176+
payload.isOK = 3; // 3 == DOESN'T ANSWER TO GET_VERSION
177177
reply_ng(CMD_HF_DESFIRE_INFO, PM3_ESOFT, (uint8_t *)&payload, sizeof(payload));
178178
switch_off();
179179
return;
@@ -184,7 +184,7 @@ void MifareDesfireGetInformation(void) {
184184
len = DesfireAPDU(cmd, cmd_len, resp);
185185
if (!len) {
186186
print_result("ERROR <--: ", resp, len);
187-
payload.isOK = 3; // 3 == DOESNT ANSWER TO GET_VERSION
187+
payload.isOK = 3; // 3 == DOESN'T ANSWER TO GET_VERSION
188188
reply_ng(CMD_HF_DESFIRE_INFO, PM3_ESOFT, (uint8_t *)&payload, sizeof(payload));
189189
switch_off();
190190
return;

armsrc/pcf7931.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ static void RealWritePCF7931(uint8_t *pass, uint16_t init_delay, int32_t l, int3
376376
//programming mode (0 or 1)
377377
AddBitPCF7931(0, tab, l, p);
378378

379-
//block adress on 6 bits
379+
//block address on 6 bits
380380
for (u = 0; u < 6; ++u) {
381381
if (address & (1 << u)) { // bit 1
382382
++parity;

client/lualibs/utils.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ local Utils =
225225
end,
226226

227227
-- input parameter is a string
228-
-- Swaps the endianess and returns a string,
228+
-- Swaps the endianness and returns a string,
229229
-- IE: 'cd7a' -> '7acd' -> 0x7acd
230230
SwapEndiannessStr = function(s, len)
231231
if s == nil then return nil end

0 commit comments

Comments
 (0)