Skip to content

Commit c4279a8

Browse files
pbarry-r7pbarry-r7
committed
Minor formatting/spelling/verbiage changes.
1 parent 2fde287 commit c4279a8

File tree

9 files changed

+65
-63
lines changed

9 files changed

+65
-63
lines changed

‎documentation/modules/post/hardware/rftransceiver/rfpwnon.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Brute force utility by LegacySecurityGroup and the original can be found
1+
Port of a brute force utility by LegacySecurityGroup, the original can be found
22
[here](https://github.com/exploitagency/github-rfpwnon/blob/master/rfpwnon.py).
33
It's a generic AM/OOK brute forcer with PWM translations. It has been
44
demonstrated to work against static key garage door openers.
@@ -7,11 +7,11 @@ demonstrated to work against static key garage door openers.
77

88
**FREQ**
99

10-
Frequency to brute force.
10+
Frequency to brute force.
1111

1212
**BAUD**
1313

14-
Baud rate: Default: 2000
14+
Baud rate. Default: 2000
1515

1616
**BINLENGTH**
1717

@@ -23,31 +23,31 @@ demonstrated to work against static key garage door openers.
2323

2424
**PPAD**
2525

26-
Binary data to append to packet. Example: "0101" Default: None
26+
Binary data to append to packet. (Example: "0101") Default: None
2727

2828
**TPAD**
2929

30-
Binary data to add to end of packet. Example: "0101" Default: None
30+
Binary data to add to end of packet. (Example: "0101") Default: None
3131

3232
**RAW**
3333

34-
Do not do PWM encoding on packet, Default: False
34+
Do not do PWM encoding on packet. Default: False
3535

3636
**TRI**
3737

38-
Use trinary signals. Default False
38+
Use trinary signals. Default: False
3939

4040
**EXTRAVERBOSE**
4141

42-
Adds some extra status messages
42+
Adds some extra status messages.
4343

4444
**INDEX**
4545

46-
USB Index number. Default 0
46+
USB Index number. Default: 0
4747

4848
**DELAY**
4949

50-
How many milliseconds to delay before transmission. Too fast tends to lock up the device. Default 0.5 seconds (500)
50+
How many milliseconds to delay before transmission. Too fast tends to lock up the device. Default: 500 (0.5 seconds)
5151

5252
## Scenarios
5353

‎documentation/modules/post/hardware/rftransceiver/transmitter.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Simple module to transmit a given frequency for a specified amount of seconds. This
2-
code was ported from [AndrewMohowk](https://github.com/AndrewMohawk).
2+
code was ported from [AndrewMohawk](https://github.com/AndrewMohawk).
33

44
NOTE: Users of this module should be aware of their local laws,
55
regulations, and licensing requirements for transmitting on any
@@ -14,19 +14,19 @@ given radio frequency.
1414

1515
**BAUD**
1616

17-
Baud rate: Default: 4800
17+
Baud rate. Default: 4800
1818

1919
**POWER**
2020

2121
Power level to specify. Default: 100
2222

2323
**SECONDS**
2424

25-
How many seconds to trnamit the signal. Default: 4
25+
How many seconds to transmit the signal. Default: 4
2626

2727
**INDEX**
2828

29-
USB Index number. Default 0
29+
USB Index number. Default: 0
3030

3131
## Scenarios
3232

@@ -35,6 +35,6 @@ given radio frequency.
3535
```
3636
hwbridge > run post/hardware/rftransceiver/transmitter FREQ=433880000
3737
38-
[*] Transmitting on 433880000 for 15 seconds...
38+
[*] Transmitting on 433880000 for 4 seconds...
3939
[*] Finished transmitting
4040
```

‎lib/msf/base/sessions/hwbridge.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ def load_zigbee
167167
console.disable_output = original
168168
end
169169

170-
# Loads the rftranceiver extension
170+
#
171+
# Loads the rftransceiver extension
171172
#
172173
def load_rftransceiver
173174
original = console.disable_output

‎lib/rex/post/hwbridge/client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def get_custom_methods
7272

7373
#
7474
# Sends a reset signal to the device to perform a software bounce or a full
75-
# factory reset. Depends on how the device decided to handle it
75+
# factory reset. Depends on how the device decided to handle it.
7676
#
7777
def reset
7878
send_request("/control/factory_reset")

‎lib/rex/post/hwbridge/extensions/rftransceiver/rftransceiver.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Extensions
99
module RFTransceiver
1010

1111
###
12-
# RF Tranceiver extension - set of commands to be executed on Trancievers like the TI cc11XX
12+
# RF Transceiver extension - set of commands to be executed on transceivers like the TI cc11XX
1313
###
1414

1515
class RFTransceiver < Extension

‎lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ def commands
5757
"bglist" => "Lists running background scripts",
5858
"status" => "Fetch bridge status information",
5959
"specialty" => "Hardware devices specialty",
60-
"reset" => "Resets the device. Some devices this is a full factory reset",
61-
"reboot" => "Reboots the device. Usually only supported by stand-alone devices",
60+
"reset" => "Resets the device (NOTE: on some devices this is a FULL FACTORY RESET)",
61+
"reboot" => "Reboots the device (usually only supported by stand-alone devices)",
6262
"load_custom_methods" => "Loads custom HW commands if any"
6363
}
6464

‎lib/rex/post/hwbridge/ui/console/command_dispatcher/rftransceiver.rb

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module Post
77
module HWBridge
88
module Ui
99
###
10-
# Automotive extension - set of commands to be executed on CAN bus
10+
# RF Transceiver extension - set of commands to be executed on transceivers like the TI cc11XX
1111
###
1212
class Console::CommandDispatcher::RFtransceiver
1313
include Console::CommandDispatcher
@@ -18,24 +18,24 @@ class Console::CommandDispatcher::RFtransceiver
1818
#
1919
def commands
2020
all = {
21-
'supported_idx' => 'suppored USB indexes',
22-
'idx' => 'sets an active idx',
23-
'freq' => 'sets the frequency',
24-
'modulation' => 'sets the modulation',
25-
'flen' => 'sets the fixed length packet size',
26-
'vlen' => 'sets the variable lenght packet size',
27-
'xmit' => 'transmits some data',
28-
'recv' => 'receive a packet of data',
29-
'enable_crc' => 'enables crc',
30-
'enable_manchester' => 'enales manchester encoding',
31-
'channel' => 'sets channel',
32-
'channel_bw' => 'sets the channel bandwidth',
33-
'baud' => 'sets the baud rate',
34-
'deviation' => 'sets the deviation',
35-
'sync_word' => 'sets the sync word',
36-
'preamble' => 'sets the preamble number',
37-
'power' => 'sets the power level',
38-
'maxpower' => 'sets max power'
21+
'supported_idx' => 'suppored USB indexes',
22+
'idx' => 'sets an active idx',
23+
'freq' => 'sets the frequency',
24+
'modulation' => 'sets the modulation',
25+
'flen' => 'sets the fixed length packet size',
26+
'vlen' => 'sets the variable length packet size',
27+
'xmit' => 'transmits some data',
28+
'recv' => 'receive a packet of data',
29+
'enable_crc' => 'enables crc',
30+
'enable_manchester' => 'enables manchester encoding',
31+
'channel' => 'sets channel',
32+
'channel_bw' => 'sets the channel bandwidth',
33+
'baud' => 'sets the baud rate',
34+
'deviation' => 'sets the deviation',
35+
'sync_word' => 'sets the sync word',
36+
'preamble' => 'sets the preamble number',
37+
'power' => 'sets the power level',
38+
'maxpower' => 'sets max power'
3939
}
4040

4141
all
@@ -66,7 +66,7 @@ def cmd_idx(*args)
6666
self.idx = 0
6767
idx_opts = Rex::Parser::Arguments.new(
6868
'-h' => [ false, 'Help Banner' ],
69-
'-i' => [ true, 'USB index, default 0']
69+
'-i' => [ true, 'USB index, default 0' ]
7070
)
7171
idx_opts.parse(args) do |opt, _idx, val|
7272
case opt
@@ -108,8 +108,8 @@ def cmd_freq(*args)
108108
arg = {}
109109
opts = Rex::Parser::Arguments.new(
110110
'-h' => [ false, 'Help Banner' ],
111-
'-f' => [ true, 'frequency to set, example: 433000000'],
112-
'-m' => [ true, 'Mhz, default is 24']
111+
'-f' => [ true, 'frequency to set, example: 433000000' ],
112+
'-m' => [ true, 'Mhz' ]
113113
)
114114
opts.parse(args) do |opt, _idx, val|
115115
case opt
@@ -147,7 +147,7 @@ def cmd_modulation(*args)
147147
mod = nil
148148
opts = Rex::Parser::Arguments.new(
149149
'-h' => [ false, 'Help Banner' ],
150-
'-M' => [ true, 'Modulation name, See help for options']
150+
'-M' => [ true, 'Modulation name, See help for options' ]
151151
)
152152
opts.parse(args) do |opt, _idx, val|
153153
case opt
@@ -175,7 +175,7 @@ def cmd_flen(*args)
175175
flen = -1
176176
opts = Rex::Parser::Arguments.new(
177177
'-h' => [ false, 'Help Banner' ],
178-
'-l' => [ true, 'Fixed Length']
178+
'-l' => [ true, 'Fixed Length' ]
179179
)
180180
opts.parse(args) do |opt, _idx, val|
181181
case opt
@@ -203,7 +203,7 @@ def cmd_vlen(*args)
203203
vlen = -1
204204
opts = Rex::Parser::Arguments.new(
205205
'-h' => [ false, 'Help Banner' ],
206-
'-l' => [ true, 'Variable Length']
206+
'-l' => [ true, 'Variable Length' ]
207207
)
208208
opts.parse(args) do |opt, _idx, val|
209209
case opt
@@ -234,9 +234,9 @@ def cmd_xmit(*args)
234234
arg = {}
235235
opts = Rex::Parser::Arguments.new(
236236
'-h' => [ false, 'Help Banner' ],
237-
'-d' => [ true, 'Variable Length'],
238-
'-r' => [ true, 'Repeat'],
239-
'-o' => [ true, 'Data offset']
237+
'-d' => [ true, 'Variable Length' ],
238+
'-r' => [ true, 'Repeat' ],
239+
'-o' => [ true, 'Data offset' ]
240240
)
241241
opts.parse(args) do |opt, _idx, val|
242242
case opt
@@ -272,8 +272,8 @@ def cmd_recv(*args)
272272
blocksize = -1
273273
opts = Rex::Parser::Arguments.new(
274274
'-h' => [ false, 'Help Banner' ],
275-
'-t' => [ true, 'timeout'],
276-
'-b' => [ true, 'blocksize']
275+
'-t' => [ true, 'timeout' ],
276+
'-b' => [ true, 'blocksize' ]
277277
)
278278
opts.parse(args) do |opt, _idx, val|
279279
case opt
@@ -345,7 +345,7 @@ def cmd_channel(*args)
345345
channel = -1
346346
opts = Rex::Parser::Arguments.new(
347347
'-h' => [ false, 'Help Banner' ],
348-
'-c' => [ true, 'Channel number']
348+
'-c' => [ true, 'Channel number' ]
349349
)
350350
opts.parse(args) do |opt, _idx, val|
351351
case opt
@@ -375,8 +375,8 @@ def cmd_channel_bw(*args)
375375
arg = {}
376376
opts = Rex::Parser::Arguments.new(
377377
'-h' => [ false, 'Help Banner' ],
378-
'-b' => [ true, 'Bandwidth'],
379-
'-m' => [ true, 'Mhz']
378+
'-b' => [ true, 'Bandwidth' ],
379+
'-m' => [ true, 'Mhz' ]
380380
)
381381
opts.parse(args) do |opt, _idx, val|
382382
case opt
@@ -409,8 +409,8 @@ def cmd_baud(*args)
409409
arg = {}
410410
opts = Rex::Parser::Arguments.new(
411411
'-h' => [ false, 'Help Banner' ],
412-
'-b' => [ true, 'Baud rate'],
413-
'-m' => [ true, 'Mhz']
412+
'-b' => [ true, 'Baud rate' ],
413+
'-m' => [ true, 'Mhz' ]
414414
)
415415
opts.parse(args) do |opt, _idx, val|
416416
case opt
@@ -443,8 +443,8 @@ def cmd_deviation(*args)
443443
arg = {}
444444
opts = Rex::Parser::Arguments.new(
445445
'-h' => [ false, 'Help Banner' ],
446-
'-d' => [ true, 'Deviat'],
447-
'-m' => [ true, 'Mhz']
446+
'-d' => [ true, 'Deviat' ],
447+
'-m' => [ true, 'Mhz' ]
448448
)
449449
opts.parse(args) do |opt, _idx, val|
450450
case opt
@@ -475,7 +475,7 @@ def cmd_sync_word(*args)
475475
word = -1
476476
opts = Rex::Parser::Arguments.new(
477477
'-h' => [ false, 'Help Banner' ],
478-
'-w' => [ true, 'Sync word (Integer)']
478+
'-w' => [ true, 'Sync word (Integer)' ]
479479
)
480480
opts.parse(args) do |opt, _idx, val|
481481
case opt
@@ -508,7 +508,7 @@ def cmd_preamble(*args)
508508
preamble = -1
509509
opts = Rex::Parser::Arguments.new(
510510
'-h' => [ false, 'Help Banner' ],
511-
'-n' => [ true, 'Number of preamble']
511+
'-n' => [ true, 'Number of preamble' ]
512512
)
513513
opts.parse(args) do |opt, _idx, val|
514514
case opt
@@ -550,7 +550,7 @@ def cmd_power(*args)
550550
power = -1
551551
opts = Rex::Parser::Arguments.new(
552552
'-h' => [ false, 'Help Banner' ],
553-
'-p' => [ true, 'Power level']
553+
'-p' => [ true, 'Power level' ]
554554
)
555555
opts.parse(args) do |opt, _idx, val|
556556
case opt

‎modules/post/hardware/rftransceiver/rfpwnon.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ def initialize(info={})
66
super( update_info( info,
77
'Name' => 'Brute Force AM/OOK (ie: Garage Doors)',
88
'Description' => %q{ Post Module for HWBridge RFTranscievers. Brute forces AM OOK or raw
9-
raw binary signals. This is a port of LegacySecurityGroup.com rfpwnon
10-
https://github.com/exploitagency/github-rfpwnon/blob/master/rfpwnon.py },
9+
binary signals. This is a port of the LegacySecurityGroup.com rfpwnon tool.
10+
(https://github.com/exploitagency/github-rfpwnon/blob/master/rfpwnon.py)
11+
},
1112
'License' => MSF_LICENSE,
1213
'Author' => ['Craig Smith'],
1314
'Platform' => ['hardware'],

‎modules/post/hardware/rftransceiver/transmitter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def initialize(info={})
1414
given radio frequency.
1515
1616
},
17-
'References' =>
17+
'References' =>
1818
[
1919
['URL', 'https://github.com/AndrewMohawk/RfCatHelpers']
2020
],

0 commit comments

Comments
 (0)