Skip to content

Commit

Permalink
quick grammer fixes, before making big changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Govind Sharma authored and trufae committed Jun 28, 2024
1 parent 34ef52b commit f187e9f
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/basic_commands/seeking.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

To move around the file we are inspecting we will need to change the offset at which we are using the `s` command.

The argument is a math expression that can contain flag names, parenthesis, addition, substraction, multiplication of immediates of contents of memory using brackets.
The argument is a math expression that can contain flag names, parenthesis, addition, subtraction, multiplication of immediates of contents of memory using brackets.

Some example commands:

Expand Down
4 changes: 2 additions & 2 deletions src/basic_commands/write.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ an operator. The command is applied to the current block. Supported operators in
|Supported operations:
| wow == write looped value (alias for 'wb')
| woa += addition
| wos -= substraction
| wos -= subtraction
| wom *= multiply
| wod /= divide
| wox ^= xor
| woo |= or
| woA &= and
| woR random bytes (alias for 'wr $b'
| woR random bytes (alias for 'wr $b')
| wor >>= shift right
| wol <<= shift left
| wo2 2= 2 byte endian swap
Expand Down
2 changes: 1 addition & 1 deletion src/crackmes/avatao/01-reverse4/bytecode.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ you could just reverse engineer the quick'n'dirty one I've used during the CTF:

Keep in mind though, that it was written on-the-fly, parallel to the reversing
phase - for example there are parts that was written without the knowledge of
all possible instructions. This means that the code is ugly and unefficient.
all possible instructions. This means that the code is ugly and inefficient.
2 changes: 1 addition & 1 deletion src/crackmes/avatao/01-reverse4/first_steps.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ d 0x400db4 mov edi, str.You_won__The_flag_is:__s_n
d 0x400dd2 mov edi, str.Your_getting_closer_
```

> ***r2 tip***: We can list crossreferences to addresses using the *axt [addr]*
> ***r2 tip***: We can list cross-references to addresses using the *axt [addr]*
> command (similarly, we can use *axf* to list references from the address).
> The *@@* is an iterator, it just runs the command once for every arguments
> listed.
Expand Down
2 changes: 1 addition & 1 deletion src/crackmes/avatao/01-reverse4/main.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Lets read main node-by-node! The first block looks like this:
![main bb-0c63](img/main/bb-0c63.png)

We can see that the program reads a word (2 bytes) into the local variable named
*local_10_6*, and than compares it to 0xbb8. Thats 3000 in decimal:
*local_10_6*, and than compares it to 0xbb8. That's 3000 in decimal:

```
[0x00400c63]> ? 0xbb8
Expand Down
2 changes: 1 addition & 1 deletion src/crackmes/avatao/01-reverse4/vmloop.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ of *vmloop*.

As I've mentioned previously, the function itself is pretty short, and easy to
read, especially with our annotations. But a promise is a promise, so here is
how we can create the missing bacic blocks for the instructions:
how we can create the missing basic blocks for the instructions:

```
[0x00400ec0]> afb+ 0x00400a45 0x00400a80 0x00400ab6-0x00400a80 0x400c15
Expand Down
2 changes: 1 addition & 1 deletion src/crackmes/ioli/ioli_0x02.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ nth paddr vaddr len size section type string
3 0x0000057f 0x0804857f 18 19 .rodata ascii Invalid Password!\n
```

similar to 0x01, no explicity password string here. so it's time to analyze it with r2.
similar to 0x01, no explicit password string here. so it's time to analyze it with r2.
```
[0x08048330]> aa
[x] Analyze all flags starting with sym. and entry0 (aa)
Expand Down
2 changes: 1 addition & 1 deletion src/disassembling/adding_metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Simply to add the comment to a particular line/address you can use `Ca` command:
0x00000002 0000 add [rax], al
```

The `C?` family of commands lets you mark a range as one of several kinds of types. Three basic types are: code (disassembly is done using asm.arch), data (an array of data elements) or string. Use the `Cs` comand to define a string, use the `Cd` command for defining an array of data elements, and use the `Cf` command to define more complex data structures like structs.
The `C?` family of commands lets you mark a range as one of several kinds of types. Three basic types are: code (disassembly is done using asm.arch), data (an array of data elements) or string. Use the `Cs` command to define a string, use the `Cd` command for defining an array of data elements, and use the `Cf` command to define more complex data structures like structs.

Annotating data types is most easily done in visual mode, using the "d" key, short for "data type change". First, use the cursor to select a range of bytes (press `c` key to toggle cursor mode and use HJKL keys to expand selection), then press 'd' to get a menu of possible actions/types. For example, to mark the range as a string, use the 's' option from the menu. You can achieve the same result from the shell using the `Cs` command:

Expand Down
4 changes: 2 additions & 2 deletions src/first_steps/history.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## History

In 2006, Sergi Àlvarez (aka pancake) while working as a forensic analyst he decided to write a small tool to recover some deleted files from an HFS+ disk by accident. As long as using the privative software from work it was a good toy project, following the concept of a block-based hexadecimal editor interface with a very simple repl to enter commands to search for byte patterns and dump the results to disk. And have the folllowing characteristics:
In 2006, Sergi Àlvarez (aka pancake) while working as a forensic analyst he decided to write a small tool to recover some deleted files from an HFS+ disk by accident. As long as using the privative software from work it was a good toy project, following the concept of a block-based hexadecimal editor interface with a very simple repl to enter commands to search for byte patterns and dump the results to disk. And have the following characteristics:

* be extremely portable (unix friendly, command line, c, small)
* open disk devices, this is using 64bit offsets
Expand All @@ -13,7 +13,7 @@ Since then, the project has evolved to provide a complete framework for analyzin

The need for scripting showed the fragility of the initial design: a monolithic tool made the API hard to use, and so a deep refactoring was needed. In 2009 radare2 (r2) was born as a fork of radare1. The refactor added flexibility and dynamic features. This enabled much better integration, paving the way to use r2 [from different programming languages](https://github.com/radareorg/radare2-bindings). Later on, the [r2pipe API](https://github.com/radareorg/radare2-r2pipe) allowed access to radare2 via pipes from any language, and the [r2papi](https://github.com/radareorg/radare2-r2papi) provided an idiomatic and high level interface to use r2 through r2pipe from a large list of programming languages.

What started as a one-man project, with some eventual contributions, gradually evolved into a big community-based project around 2014. The number of users was growing fast, changing roles and contribution rules to ease the maintainance as much as possible.
What started as a one-man project, with some eventual contributions, gradually evolved into a big community-based project around 2014. The number of users was growing fast, changing roles and contribution rules to ease the maintenance as much as possible.

It's important to instruct users to report their issues, as well as help developers willing to contribute to understand the codebase. The whole development is managed in [radare2's GitHub](https://github.com/radareorg/radare2) and discussed in the Telegram and Discord channels.

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ L # list core plugins
iL # list bin plugins
dL # list debug plugins
mL # list fs plugins
ph # print support hash algoriths
ph # print support hash algorithms
```

You can use the `?` as value to get the possible values in the associated eval vars.
Expand Down
2 changes: 1 addition & 1 deletion src/refcard/radare2_rc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
\cm{\dollar{}l}{opcode length}
\cm{\dollar{}e}{1 if end of block, else 0}
\cm{\dollar{}ev}{get value of eval config variable}
\cm{\dollar{}?}{last comparision value}
\cm{\dollar{}?}{last comparison value}

% Footer
\vfill \hrule\smallskip
Expand Down
2 changes: 1 addition & 1 deletion src/search_bytes/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Options are controlled by the `search.` variables.
```

Perhaps the most important search variable is `search.in` - it controls where
your search is occuring. If you aren't finding hits you expect, check this
your search is occurring. If you aren't finding hits you expect, check this
variable first. Note the difference between `map` and `maps` - `map` will only
search the map that you are currently in, while `maps` will search all memory
maps, with options to narrow the search by permissions.
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rasm2/assemble.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@ Assembling also is accessible in radare2 visual mode through pressing `A` key to

The cool thing of writing assembly using the visual assembler interface that the changes are done in memory until you press enter.

So you can check the size of the code and which instructions is overlapping before commiting the changes.
So you can check the size of the code and which instructions is overlapping before committing the changes.

6 changes: 3 additions & 3 deletions src/tools/rax2/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Inside r2, the functionality of rax2 is available under the ? command. For examp
[0x00000000]> ? 3+4
```

As you can see, the numeric expressions can contain mathematical expressions like addition, substraction, .. as well as group operations with parenthesis.
As you can see, the numeric expressions can contain mathematical expressions like addition, subtraction, .. as well as group operations with parenthesis.

The syntax in which the numbers are represented define the base, for example:

Expand Down Expand Up @@ -98,15 +98,15 @@ $ rax2 -S < bin.foo
...
```

Endianess conversion:
Endianness conversion:
```sh
$ rax2 -e 33
0x21000000
$ rax2 -e 0x21000000
33
```

Base64 deconding
Base64 decoding
```sh
$ rax2 -D ZQBlAA== | rax2 -S
65006500
Expand Down
2 changes: 1 addition & 1 deletion src/visual_mode/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Visual mode help:
?? show the user-friendly hud
% in cursor mode finds matching pair, or toggle autoblocksz
@ redraw screen every 1s (multi-user view)
^ seek to the begining of the function
^ seek to the beginning of the function
! enter into the visual panels mode
_ enter the flag/comment/functions/.. hud (same as VF_)
= set cmd.vprompt (top row)
Expand Down
2 changes: 1 addition & 1 deletion src/visual_mode/visual_disassembly.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Pressing lowercase `c` toggles the cursor mode. When this mode is active, the cu

![Cursor at 0x00404896](cursor.png)

The cursor is used to select a range of bytes or simply to point to a byte. You can use the cursor to create a named flag at specifc location. To do so, seek to the required position, then press `f` and enter a name for a flag.
The cursor is used to select a range of bytes or simply to point to a byte. You can use the cursor to create a named flag at specific location. To do so, seek to the required position, then press `f` and enter a name for a flag.
If the file was opened in write mode using the `-w` flag or the `o+` command, you can also use the cursor to overwrite a selected range with new values. To do so, select a range of bytes (with HJKL and SHIFT key pressed), then press `i` and enter the hexpair values for the new data. The data will be repeated as needed to fill the range selected. For example:
```
<select 10 bytes in visual mode using SHIFT+HJKL>
Expand Down

0 comments on commit f187e9f

Please sign in to comment.