Skip to content

Commit

Permalink
typos
Browse files Browse the repository at this point in the history
  • Loading branch information
doegox committed Oct 22, 2020
1 parent 6ffcc82 commit 18a6d3e
Show file tree
Hide file tree
Showing 27 changed files with 55 additions and 54 deletions.
2 changes: 1 addition & 1 deletion client/luascripts/hf_mf_format.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ arguments = [[
-k <key> - the current six byte key with write access
-n <key> - the new key that will be written to the card
-a <access> - the new access bytes that will be written to the card
-x - execute the commands aswell.
-x - execute the commands as well.
]]

local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
Expand Down
6 changes: 3 additions & 3 deletions client/src/cmdhficlass.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ static void mem_app_config(const picopass_hdr *hdr) {
PrintAndLogEx(INFO, " Write A...... credit");
PrintAndLogEx(INFO, " Write B...... credit");
PrintAndLogEx(INFO, " Debit........ debit or credit");
PrintAndLogEx(INFO, " redit........ credit");
PrintAndLogEx(INFO, " Credit....... credit");
}
}

Expand Down Expand Up @@ -715,7 +715,7 @@ static int CmdHFiClassSim(const char *Cmd) {
return PM3_EMALLOC;
}

memset(dump, 0, datalen);//<-- Need zeroes for the EPURSE - field (offical)
memset(dump, 0, datalen);//<-- Need zeroes for the EPURSE - field (official)

uint8_t i = 0;
for (i = 0 ; i < NUM_CSNS ; i++) {
Expand Down Expand Up @@ -2249,7 +2249,7 @@ static int CmdHFiClass_ReadBlock(const char *Cmd) {
}

if (auth == false && verbose) {
PrintAndLogEx(WARNING, "warning: no authentication used with read. Typical for cards configured toin `non-secure page`");
PrintAndLogEx(WARNING, "warning: no authentication used with read. Typical for cards configured into `non-secure page`");

}

Expand Down
2 changes: 1 addition & 1 deletion client/src/cmdhfmf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2962,7 +2962,7 @@ static int CmdHF14AMfChk_fast(const char *Cmd) {
printKeyTable(sectorsCnt, e_sector);

if (use_flashmemory && found_keys == (sectorsCnt << 1)) {
PrintAndLogEx(SUCCESS, "Card dumped aswell. run " _YELLOW_("`%s %c`"),
PrintAndLogEx(SUCCESS, "Card dumped as well. run " _YELLOW_("`%s %c`"),
"hf mf esave",
GetFormatFromSector(sectorsCnt)
);
Expand Down
2 changes: 1 addition & 1 deletion client/src/cmdlfem4x.c
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ static command_t CommandTable[] = {
{"4x50_dump", CmdEM4x50Dump, IfPm3EM4x50, "dump EM4x50 tag"},
{"4x50_info", CmdEM4x50Info, IfPm3EM4x50, "tag information EM4x50"},
{"4x50_write", CmdEM4x50Write, IfPm3EM4x50, "write word data to EM4x50"},
{"4x50_write_password", CmdEM4x50WritePassword, IfPm3EM4x50, "change passwword of EM4x50 tag"},
{"4x50_write_password", CmdEM4x50WritePassword, IfPm3EM4x50, "change password of EM4x50 tag"},
{"4x50_read", CmdEM4x50Read, IfPm3EM4x50, "read word data from EM4x50"},
{"4x50_wipe", CmdEM4x50Wipe, IfPm3EM4x50, "wipe data from EM4x50"},
{NULL, NULL, NULL, NULL}
Expand Down
2 changes: 1 addition & 1 deletion client/src/cmdlfhid.c
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ static int CmdHIDBrute(const char *Cmd) {
cn_low = cn_hi;

// main loop
// iceman: could add options for bruteforcing OEM, ISSUE or FC aswell..
// iceman: could add options for bruteforcing OEM, ISSUE or FC as well..
bool exitloop = false;
bool fin_hi, fin_low;
fin_hi = fin_low = false;
Expand Down
4 changes: 2 additions & 2 deletions client/src/proxmark3.c
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ static void set_my_user_directory(void) {
// if not found, default to current directory
if (my_user_directory == NULL) {
my_user_directory = GetCurrentDir(_cwd_Buffer, sizeof(_cwd_Buffer));
// change all slashs to / (windows should not care...
// change all slashes to / (windows should not care...
for (int i = 0; i < strlen(_cwd_Buffer); i++)
if (_cwd_Buffer[i] == '\\') _cwd_Buffer[i] = '/';
// my_user_directory = ".";
Expand Down Expand Up @@ -1044,7 +1044,7 @@ int main(int argc, char *argv[]) {
InitGraphics(argc, argv, script_cmds_file, script_cmd, stayInCommandLoop);
MainGraphics();
# else
// for *nix distro's, check enviroment variable to verify a display
// for *nix distro's, check environment variable to verify a display
char *display = getenv("DISPLAY");
if (display && strlen(display) > 1) {
InitGraphics(argc, argv, script_cmds_file, script_cmd, stayInCommandLoop);
Expand Down
2 changes: 1 addition & 1 deletion common/legic_prng.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static struct lfsr {
// * someone mentioned iv must be ODD.
// Hack:
// Now we have a special case with iv == 0
// it sets b to 0 aswell to make sure we get a all zero keystream out
// it sets b to 0 as well to make sure we get a all zero keystream out
// which is used in the initialisation phase sending the IV
//
void legic_prng_init(uint8_t iv) {
Expand Down
6 changes: 3 additions & 3 deletions doc/cheatsheet.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<a id="Top"></a>
# Command Cheat Sheet

|Generic|Low Frequence 125 kHz|High Frequence 13.56 MHz|
|Generic|Low Frequency 125 kHz|High Frequency 13.56 MHz|
|---|---|---|
|[Generic](#Generic)|[T55XX](#T55XX)|[MIFARE](#MIFARE)|
|[Data](#Data)|[HID Prox](#HID-Prox)|[iCLASS](#iCLASS)|
Expand Down Expand Up @@ -324,7 +324,7 @@ pm3 --> script run hf_mf_uidbruteforce -s 0x11223344556677 -e 0x11223344556679 -
## Wiegand manipulation
^[Top](#top)

List all available weigand formats in client
List all available wiegand formats in client
```
pm3 --> wiegand list
```
Expand Down Expand Up @@ -592,7 +592,7 @@ Options
-k <key> The current six byte key with write access
-n <key> The new key that will be written to the card
-a <access> The new access bytes that will be written to the card
-x Execute the commands aswell
-x Execute the commands as well
pm3 --> script run hf_mf_format -k FFFFFFFFFFFF -n FFFFFFFFFFFF -x
```
Expand Down
2 changes: 1 addition & 1 deletion doc/cliparser.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ And then it fell into silence since it wasn't well documented how to use the cli
Fast forward today, where more commands has used the cliparser but it still wasn't the natural way when adding a new client command to the Proxmark3 client.
After more discussions among @doegox, @iceman1001 and @mrwalker the concept became more clear on how to use the cliparser lib in the _preferred_ way.

The aftermath was a design and layout specified which lead to a simpler implementation of the cliparser in the client source code while still unifiy all helptexts with the new colours support and a defined layout. As seen below, the simplicity and clearness.
The aftermath was a design and layout specified which lead to a simpler implementation of the cliparser in the client source code while still unifying all helptexts with the new colours support and a defined layout. As seen below, the simplicity and clearness.

![sample of new style helptext](http://www.icedev.se/proxmark3/helptext.png)

Expand Down
8 changes: 4 additions & 4 deletions doc/clocks.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ About 1 us precision
* `void StartCountUS(void)`
* `uint32_t RAMFUNC GetCountUS(void)`

Use two chainer timers TC0 and TC1.
Use two chained timers TC0 and TC1.
TC0 runs at 1.5 MHz and TC1 is clocked when TC0 reaches 0xC000.

Maximal value: 0x7fffffff = 2147 s
Expand All @@ -110,13 +110,13 @@ About 1 cycle of 13.56 MHz? precision
* `uint32_t RAMFUNC GetCountSspClk(void)`
* `uint32_t RAMFUNC GetCountSspClkDelta(uint32_t start)` <= **TODO** could be used more often

Use two chainer timers TC0 and TC1.
Use two chained timers TC0 and TC1.
TC0 runs at SSP_CLK from FPGA (13.56 MHz?) and TC1 is clocked when TC0 loops.

Usage:

* for iso14443 commands to count field cycles
* Also usable with FPGA in LF mode ?? cf `armsrc/legicrfsim.c` SSP Clock is clocked by the FPGA at 212 kHz (subcarrier frequency)
* Also usable with FPGA in LF mode ?? cf `armsrc/legicrfsim.c` SSP Clock is clocked by the FPGA at 212 kHz (sub-carrier frequency)

Can't be used at the same time as CountUS or Ticks functions.

Expand All @@ -133,7 +133,7 @@ cf `armsrc/ticks.c`
* `void WaitMS(uint32_t ms)`
* `void StopTicks(void)` <= **TODO** why a stop for this timer and not for CountUS / CountSspClk ?

Use two chainer timers TC0 and TC1.
Use two chained timers TC0 and TC1.
TC0 runs at 1.5 MHz and TC1 is clocked when TC0 loops.

Maximal value: 0xffffffff = 2863 s (but don't use high value with WaitTicks else you'll trigger WDT)
Expand Down
7 changes: 4 additions & 3 deletions doc/cloner_notes.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Notes on Cloner gunes
# Notes on Cloner guns

This document is based mostly on information posted on http://www.proxmark.org/forum/viewtopic.php?pid=39903#p39903

- [Notes on Cloner guns](#notes-on-cloner-guns)
- [Blue and black cloners](#blue-and-black-cloners)
- [White cloner (pre 2015)](#white-cloner-pre-2015)
- [White cloner (after 2016)](#white-cloner-after-2016)
- [White cloner (after 2016 D Quality)](#white-cloner-after-2016-d-quality)
- [restore page1 data](#restore-page1-data)
- [Restore page1 data](#restore-page1-data)
- [Sniffing the comms](#sniffing-the-comms)


Expand Down Expand Up @@ -67,7 +68,7 @@ If t55xx write b 2 d 2D782308 1
The T55x7 protocol uses a pwm based protocol for writing to tags. In order to make decoding easier try the new command as seen below instead. It will try to extract the data written.

```
-- after threshold limit 20 is triggred, skip 10000 samples before collecting samples.
-- after threshold limit 20 is triggered, skip 10000 samples before collecting samples.
lf config s 10000 t 20
lf t55xx sniff
Expand Down
4 changes: 2 additions & 2 deletions doc/colors_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ The client should autodetect color support when starting.

You can also use the command `pref show` to see and set your personal setting.

Why use colors in the Proxmark client? When evertyhing is white it is hard to extract the important information fast. You also need new-lines for extra space to be easier to read.
Why use colors in the Proxmark client? When everything is white it is hard to extract the important information fast. You also need new-lines for extra space to be easier to read.
We have gradually been introducing this color scheme into the client since we got decent color support on all systems: OSX, Linux, WSL, Proxspace.


## style/color
^[Top](#top)
The following definition has be crystalized out from these experiments. Its not set in stone yet so take this document as a guideline for how to create unified system scheme.
The following definition has be crystallized out from these experiments. Its not set in stone yet so take this document as a guideline for how to create unified system scheme.

### Definition
^[Top](#top)
Expand Down
6 changes: 3 additions & 3 deletions doc/emv_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

- Get ATR|ATS
- Get AID by PSE (`emv pse`)
- Get AID by appliation list (`emv search`)
- Get AID by application list (`emv search`)
- Select application (`emv select`)
- Format PDOL (look at next part)
- Execute GPO (`emv gpo` this step and format PDOL)
Expand All @@ -27,7 +27,7 @@

- Get ATR|ATS
- Get AID by PSE (`emv pse`)
- Get AID by appliation list (`emv search`)
- Get AID by application list (`emv search`)
- Select application (`emv select`)
- Format PDOL (look at next part)
- Execute GPO (`emv gpo` this step and format PDOL)
Expand Down Expand Up @@ -62,7 +62,7 @@ It works for VISA(r) and Mastercard(r) transactions. It may work with other EMV
^[Top](#top)

MSD - Magnetic Stripe mode
VSDC - contact transacion
VSDC - contact transaction
qVSDC - contactless transaction

### Mastercard(r) transactions
Expand Down
12 changes: 6 additions & 6 deletions doc/fpga_arm_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ LF analog path (MCP6294 opamp. This has a GBW of 10 MHz), all 'slow' signals.


## FPGA
Since the SPARTAN II is a old outdated FPGA, thus is very limited resource there was a need to split LF and HF functionality into two seperate FPGA images. Which are stored in ARM flash memory as bitstreams.
Since the SPARTAN II is a old outdated FPGA, thus is very limited resource there was a need to split LF and HF functionality into two separate FPGA images. Which are stored in ARM flash memory as bitstreams.

We swap between these images by flashing fpga from ARM on the go. It takes about 1sec. Hence its usually a bad idea to program your device to continuously execute LF alt HF commands.

Expand All @@ -43,7 +43,7 @@ The FPGA images is precompiled and located inside the /fpga folder.
- fpga_lf.bit

There is very rarely changes to the images so there is no need to setup a fpga tool chain to compile it yourself.
Since the FPGA is very old, the Xilinix WebPack ISE 10.1 is the last working tool chain. You can download this legacy development on xilinix and register for a free product installation id.
Since the FPGA is very old, the Xilinx WebPack ISE 10.1 is the last working tool chain. You can download this legacy development on Xilinx and register for a free product installation id.
Or use mine `11LTAJ5ZJK3PXTUBMF0C0J6C4` The package to download is about 7Gb and linux based. Though I recently managed to install it on WSL for Windows 10.

In order to save space, these fpga images are LZ4 compressed and included in the fullimage.elf file when compiling the ARM SRC. `make armsrc`
Expand Down Expand Up @@ -131,7 +131,7 @@ it into the memory of the FPGA. This gives some major advantages:

The FPGA has two main tasks. The first task is to demodulate the signal received from the ADC and relay
this as a digital encoded signal to the ARM. Depending on the task this might be the demodulation of a
100% Amplitude Shift Keying (ASK) signal from the reader or the load modulation of a card. The encodin
100% Amplitude Shift Keying (ASK) signal from the reader or the load modulation of a card. The encoding
schemes used to communicate the signal to the ARM are Modified Miller for the reader and Manchester
encoding for the card signal.

Expand All @@ -153,10 +153,10 @@ these samples. When the Proxmark is in sniffing mode this is done for both the M
Miller at the same time. Whenever one of the decoding procedures returns a valid message, this message
is stored in another buffer (BigBuf) and both decoding procedures are set to an un-synced state. The
BigBuf is limited to the available memory on the ARM. The current firmware has 2 KB of memory
reserved for traces (Besides the tracethe buffer also stores some temporary data that is needed in the
reserved for traces (Besides the trace, the buffer also stores some temporary data that is needed in the
processing). When the BigBuf buffer is full the function normally returns. A new function call from the
client is needed to download the BigBuf contents to the computer. The BigBuf is especially useful for
ptocol investigation. Every single message is stored in this buffer. When a card is emulated or when the
protocol investigation. Every single message is stored in this buffer. When a card is emulated or when the
Proxmark is used as a reader the BigBuf can be used to store status messages or protocol exceptions.

```
Expand Down Expand Up @@ -226,7 +226,7 @@ is the master). The ARM connects to the outside world over USB.


## FPGA purpose
Digtal signal processing.
Digital signal processing.
In short, apply low pass / hi pass filtering, peak detect, correlate signal meaning IQ pair collecting.

IQ means measure at In-phase and 90 phase shift later Quadrature-phase, with IQ samples you can plot the signal on a vector plan.
Expand Down
4 changes: 2 additions & 2 deletions doc/loclass_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This document is primarily intended for understanding `hf iclass loclass` and files used with it.

LOCLASS aim is to recoved the used masterkey for that specific reader configued in Elite mode / High Security mode.
LOCLASS aim is to recover the used masterkey for that specific reader configured in Elite mode / High Security mode.

LOCLASS, is a two part attack. First is the online part where you gather needed information from the reader by presenting a carefully selected CSN and save the responses to file. For the first part you run `hf iclass sim 2` and take notice of the saved filename.

Expand All @@ -23,4 +23,4 @@ This test mode uses two files.
- `iclass_dump.bin`
this is a sample file from `hf iclass sim 2`, with complete keytable recovery, using 128 carefully selected CSN and the file contains the MAC results from reader.
- `iclass_key.bin`
this is file shall contain the legacy masterkey, AA1 key. loclass uses it to verify that permution / reversing / generation of key is correct.
this is file shall contain the legacy masterkey, AA1 key. loclass uses it to verify that permutation / reversing / generation of key is correct.
4 changes: 2 additions & 2 deletions doc/magic_cards_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ Android compatible
* some cards use a fix "08" or "18" in anticollision, no matter the block0. Including all 7b.
* BCC:
* some cards play blindly the block0 BCC byte, beware!
* some cards compute a proper BCC in anticollision. Including all 7b comuting their BCC0 and BCC1.
* some cards compute a proper BCC in anticollision. Including all 7b computing their BCC0 and BCC1.
* ATS:
* some cards don't reply to RATS
* some reply with an ATS
Expand Down Expand Up @@ -363,7 +363,7 @@ Initial UID is AA55C396

### Identify

Only possible before personalisation.
Only possible before personalization.

```
hf 14a info
Expand Down
2 changes: 1 addition & 1 deletion doc/md/Development/Coverity-Scan-Config-and-Run.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

## Coverity Scan Config & Run
Download the Coverity Scan Self-buld and install it.
Download the Coverity Scan Self-build and install it.
You will need to configure ARM-NON-EABI- Compiler for it to use:

Configure
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ git clone https://github.com/RfidResearchGroup/proxmark3.git
# Check ModemManager

### ⚠️ Very important ⚠️
make sure ModemManager will not interfer, otherwise it could brick your Proxmark3!
make sure ModemManager will not interfere, otherwise it could brick your Proxmark3!
Read carefully [this page about ModemManager](ModemManager-Must-Be-Discarded.md) and follow its instructions.

# Check connection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ModemManager is pre-installed on many different Linux distributions, very probab
It's intended to prepare and configure the mobile broadband (2G/3G/4G) devices, whether they are built-in or dongles.
Some are serial, so when the Proxmark3 is plugged and a `/dev/ttyACM0` appears, ModemManager attempts to talk to it to see if it's a modem replying to AT commands.

Now imagine what happens when you're flashing your Proxmark3 and ModemManager suddently starts sending bytes to it at the same time...
Now imagine what happens when you're flashing your Proxmark3 and ModemManager suddenly starts sending bytes to it at the same time...
Yes it makes the flashing failing. And if it happens while you're flashing the bootloader, it will require a JTAG device to unbrick the Proxmark3.

ModemManager is a threat for the Proxmark3, but also for many other embedded devices, such as some Arduino platforms.
Expand All @@ -35,7 +35,7 @@ sudo systemctl disable ModemManager

# Solution 3: use filtering udev rules

If you *really* need ModemManager, e.g. for your 4G device, you'll have to use some filtering rules to make sure it doesn't interfer with the Proxmark3.
If you *really* need ModemManager, e.g. for your 4G device, you'll have to use some filtering rules to make sure it doesn't interfere with the Proxmark3.

Once you have cloned the Proxmark3 repository, you can run `make udev` to install udev rules that will tell ModemManager to not look at your Proxmark3.

Expand Down Expand Up @@ -89,7 +89,7 @@ sudo journalctl -f|grep "ModemManager.*\[filter\]"
```
Now plug in the Proxmark 3.

If ModemManager interfers, you'll get logs like this:
If ModemManager interferes, you'll get logs like this:
```
ModemManager[xxxxx]: <debug> [filter] (tty/ttyACM0): port allowed: cdc-acm interface reported AT-capable
```
Expand All @@ -108,7 +108,7 @@ sudo mmcli -G ERR

# I didn't read carefully this page and now my Proxmark3 is not responding

First of all, follow the instructions above to make sure ModemManager will not interfer with the Proxmark3 anymore.
First of all, follow the instructions above to make sure ModemManager will not interfere with the Proxmark3 anymore.

Now there are two possibilities:

Expand Down
Loading

0 comments on commit 18a6d3e

Please sign in to comment.