Skip to content

Commit 32b9752

Browse files
authored
Merge pull request #681 from ninp0/master
Gemfile - bump version of meshtastic that eliminates conflict w/ wisp…
2 parents 5e86d11 + 65f69d7 commit 32b9752

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gem 'barby', '0.7.0'
2020
gem 'base32', '0.3.4'
2121
gem 'brakeman', '7.0.0'
2222
gem 'bson', '5.0.2'
23-
gem 'bundler', '>=2.6.2'
23+
gem 'bundler', '>=2.6.3'
2424
gem 'bundler-audit', '0.9.2'
2525
gem 'bunny', '2.23.0'
2626
gem 'colorize', '1.1.0'
@@ -47,7 +47,7 @@ gem 'jwt', '2.10.1'
4747
gem 'libusb', '0.7.2'
4848
gem 'luhn', '1.0.2'
4949
gem 'mail', '2.8.1'
50-
gem 'meshtastic', '0.0.81'
50+
gem 'meshtastic', '0.0.83'
5151
gem 'metasm', '1.0.5'
5252
gem 'mongo', '2.21.0'
5353
gem 'msfrpc-client', '1.1.2'
@@ -72,7 +72,7 @@ gem 'pry-doc', '1.5.0'
7272
gem 'rake', '13.2.1'
7373
gem 'rb-readline', '0.5.5'
7474
gem 'rbvmomi2', '3.8.0'
75-
gem 'rdoc', '6.10.0'
75+
gem 'rdoc', '6.11.0'
7676
gem 'rest-client', '2.1.0'
7777
gem 'rex', '2.0.13'
7878
gem 'rmagick', '6.0.1'

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $ cd /opt/pwn
3737
$ ./install.sh
3838
$ ./install.sh ruby-gem
3939
$ pwn
40-
pwn[v0.5.234]:001 >>> PWN.help
40+
pwn[v0.5.235]:001 >>> PWN.help
4141
```
4242

4343
[![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.4.1@pwn
5252
$ gem uninstall --all --executables pwn
5353
$ gem install --verbose pwn
5454
$ pwn
55-
pwn[v0.5.234]:001 >>> PWN.help
55+
pwn[v0.5.235]:001 >>> PWN.help
5656
```
5757

5858
If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.4.1@pwn
6262
$ rvmsudo gem uninstall --all --executables pwn
6363
$ rvmsudo gem install --verbose pwn
6464
$ pwn
65-
pwn[v0.5.234]:001 >>> PWN.help
65+
pwn[v0.5.235]:001 >>> PWN.help
6666
```
6767

6868
PWN periodically upgrades to the latest version of Ruby which is reflected in `/opt/pwn/.ruby-version`. The easiest way to upgrade to the latest version of Ruby from a previous PWN installation is to run the following script:

lib/pwn/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module PWN
4-
VERSION = '0.5.234'
4+
VERSION = '0.5.235'
55
end

third_party/pwn_rdoc.jsonl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@
391391
{"messages":[{"role":"user","content":"PWN::Banner::Matrix.authors Usage"},{"role":"assistant","content":"`PWN::Banner::Matrix.authors`: Author(s)\n\n0day Inc. <[email protected]>\n"}]}
392392
{"messages":[{"role":"user","content":"PWN::Banner::Matrix.get Usage"},{"role":"assistant","content":"`PWN::Banner::Matrix.get`: Supported Method Parameters\n\nPWN::Banner::Matrix.get\n"}]}
393393
{"messages":[{"role":"user","content":"PWN::Banner::Matrix.help Usage"},{"role":"assistant","content":"`PWN::Banner::Matrix.help`: "}]}
394+
{"messages":[{"role":"user","content":"PWN::Banner::Matrix.you? Usage"},{"role":"assistant","content":"`PWN::Banner::Matrix.you?`: Supported Method Parameters\n\nPWN::Banner::Matrix.has_you\n"}]}
394395
{"messages":[{"role":"user","content":"PWN::Banner::Ninja.authors Usage"},{"role":"assistant","content":"`PWN::Banner::Ninja.authors`: Author(s)\n\n0day Inc. <[email protected]>\n"}]}
395396
{"messages":[{"role":"user","content":"PWN::Banner::Ninja.get Usage"},{"role":"assistant","content":"`PWN::Banner::Ninja.get`: Supported Method Parameters\n\nPWN::Banner::Ninja.get\n"}]}
396397
{"messages":[{"role":"user","content":"PWN::Banner::Ninja.help Usage"},{"role":"assistant","content":"`PWN::Banner::Ninja.help`: "}]}
@@ -585,6 +586,12 @@
585586
{"messages":[{"role":"user","content":"PWN::Plugins::FileFu.help Usage"},{"role":"assistant","content":"`PWN::Plugins::FileFu.help`: "}]}
586587
{"messages":[{"role":"user","content":"PWN::Plugins::FileFu.recurse_dir Usage"},{"role":"assistant","content":"`PWN::Plugins::FileFu.recurse_dir`: Supported Method Parameters\n\nPWN::Plugins::FileFu.recurse_dir(\n\ndir_path: 'optional path to dir defaults to .'\n\n)\n"}]}
587588
{"messages":[{"role":"user","content":"PWN::Plugins::FileFu.untar_gz_file Usage"},{"role":"assistant","content":"`PWN::Plugins::FileFu.untar_gz_file`: Supported Method Parameters\n\nPWN::Plugins::FileFu.untar_gz_file(\n\ntar_gz_file: 'required - path to .tar.gz file',\ndestination: 'required - destination folder to save extracted contents'\n\n)\n"}]}
589+
{"messages":[{"role":"user","content":"PWN::Plugins::FlipperZero.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::FlipperZero.authors`: Author(s)\n\n0day Inc. <[email protected]>\n"}]}
590+
{"messages":[{"role":"user","content":"PWN::Plugins::FlipperZero.connect Usage"},{"role":"assistant","content":"`PWN::Plugins::FlipperZero.connect`: Supported Method Parameters\n\nflipper_zero_obj = PWN::Plugins::FlipperZero.connect(\n\nblock_dev: 'optional serial block device path (defaults to /dev/ttyACM0)',\nbaud: 'optional (defaults to 9600)',\ndata_bits: 'optional (defaults to 8)',\nstop_bits: 'optional (defaults to 1)',\nparity: 'optional - :even||:odd|:none (defaults to :none)'\n\n)\n"}]}
591+
{"messages":[{"role":"user","content":"PWN::Plugins::FlipperZero.connect_via_screen Usage"},{"role":"assistant","content":"`PWN::Plugins::FlipperZero.connect_via_screen`: Supported Method Parameters\n\nPWN::Plugins::FlipperZero.connect_via_screen(\n\nblock_dev: 'optional - serial block device path (defaults to /dev/ttyACM0)'\n\n)\n"}]}
592+
{"messages":[{"role":"user","content":"PWN::Plugins::FlipperZero.disconnect Usage"},{"role":"assistant","content":"`PWN::Plugins::FlipperZero.disconnect`: Supported Method Parameters\n\nPWN::Plugins::FlipperZero.disconnect(\n\nflipper_zero_obj: 'required - flipper_zero_obj returned from #connect method'\n\n)\n"}]}
593+
{"messages":[{"role":"user","content":"PWN::Plugins::FlipperZero.help Usage"},{"role":"assistant","content":"`PWN::Plugins::FlipperZero.help`: "}]}
594+
{"messages":[{"role":"user","content":"PWN::Plugins::FlipperZero.request Usage"},{"role":"assistant","content":"`PWN::Plugins::FlipperZero.request`: Supported Method Parameters\n\nresponse = PWN::Plugins::FlipperZero.request(\n\nflipper_zero_obj: 'required - flipper_zero_obj returned from #connect method',\npayload: 'optional - payload to send to the device (defaults to help)'\n\n)\n"}]}
588595
{"messages":[{"role":"user","content":"PWN::Plugins::Fuzz.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::Fuzz.authors`: Author(s)\n\n0day Inc. <[email protected]>\n"}]}
589596
{"messages":[{"role":"user","content":"PWN::Plugins::Fuzz.help Usage"},{"role":"assistant","content":"`PWN::Plugins::Fuzz.help`: "}]}
590597
{"messages":[{"role":"user","content":"PWN::Plugins::Fuzz.socket Usage"},{"role":"assistant","content":"`PWN::Plugins::Fuzz.socket`: Supported Method Parameters\n\nsocket_fuzz_results_arr = PWN::Plugins::Fuzz.socket(\n\ntarget: 'required - target host or ip',\nport: 'required - target port',\nprotocol: 'optional - :tcp || :udp (defaults to tcp)',\ntls: 'optional - boolean connect to target socket using TLS (defaults to false)',\nfuzz_delimeter: 'optional - fuzz delimeter used in request to specify where payloads should reside (defaults to \\u2665)',\nrequest: 'required - String object of socket request w/ \\u001A as fuzz delimeter (e.g. \"GET /\\u001A\\u001A HTTP/1.1\\r\\nHost: \\u001A127..0.0.1\\u001A\\r\\n\\r\\n\")',\npayload: 'required - payload string',\nencoding: 'optional - :base64 || :hex || :html_entity || :url (Defaults to nil)',\nencoding_depth: 'optional - number of times to encode payload (defaults to 1)',\nchar_encoding: 'optional - character encoding returned by PWN::Plugins::Char.list_encoders (defaults to UTF-8)',\nresponse_timeout: 'optional - float (defaults to 0.9)',\nrequest_rate_limit: 'optional - float (defaults to 0.3)'\n\n)\n"}]}
@@ -849,7 +856,7 @@
849856
{"messages":[{"role":"user","content":"PWN::Plugins::ScannableCodes.generate Usage"},{"role":"assistant","content":"`PWN::Plugins::ScannableCodes.generate`: Supported Method Parameters\n\nresponse = PWN::Plugins::ScannableCodes.generate(\n\ndata: 'required - data to encode',\ntype: 'optional - :barcode || :qrcode (defaults to :qrcode)',\npath: 'optional - path to save image (defaults to \"./#{data}.png\")'\n\n)\n"}]}
850857
{"messages":[{"role":"user","content":"PWN::Plugins::ScannableCodes.help Usage"},{"role":"assistant","content":"`PWN::Plugins::ScannableCodes.help`: "}]}
851858
{"messages":[{"role":"user","content":"PWN::Plugins::Serial.authors Usage"},{"role":"assistant","content":"`PWN::Plugins::Serial.authors`: Author(s)\n\n0day Inc. <[email protected]>\n"}]}
852-
{"messages":[{"role":"user","content":"PWN::Plugins::Serial.connect Usage"},{"role":"assistant","content":"`PWN::Plugins::Serial.connect`: Supported Method Parameters\n\nserial_obj = PWN::Plugins::Serial.connect(\n\nblock_dev: 'optional - serial block device path (defaults to /dev/ttyUSB0)',\nbaud: 'optional - (defaults to 9600)',\ndata_bits: 'optional - (defaults to 8)',\nstop_bits: 'optional - (defaults to 1)',\nparity: 'optional - :even|:mark|:odd|:space|:none (defaults to :none)',\nflow_control: 'optional - :none||:hard||:soft (defaults to :none)'\n\n)\n"}]}
859+
{"messages":[{"role":"user","content":"PWN::Plugins::Serial.connect Usage"},{"role":"assistant","content":"`PWN::Plugins::Serial.connect`: Supported Method Parameters\n\nserial_obj = PWN::Plugins::Serial.connect(\n\nblock_dev: 'optional - serial block device path (defaults to /dev/ttyUSB0)',\nbaud: 'optional - (defaults to 9600)',\ndata_bits: 'optional - (defaults to 8)',\nstop_bits: 'optional - (defaults to 1)',\nparity: 'optional - :even|:mark|:odd|:space|:none (defaults to :none)'\n\n)\n"}]}
853860
{"messages":[{"role":"user","content":"PWN::Plugins::Serial.disconnect Usage"},{"role":"assistant","content":"`PWN::Plugins::Serial.disconnect`: Supported Method Parameters\n\nPWN::Plugins::Serial.disconnect(\n\nserial_obj: 'required - serial_obj returned from #connect method'\n\n)\n"}]}
854861
{"messages":[{"role":"user","content":"PWN::Plugins::Serial.dump_session_data Usage"},{"role":"assistant","content":"`PWN::Plugins::Serial.dump_session_data`: Supported Method Parameters\n\nsession_data = PWN::Plugins::Serial.dump_session_data\n"}]}
855862
{"messages":[{"role":"user","content":"PWN::Plugins::Serial.flush_session_data Usage"},{"role":"assistant","content":"`PWN::Plugins::Serial.flush_session_data`: Supported Method Parameters\n\nsession_data = PWN::Plugins::Serial.flush_session_data\n"}]}

0 commit comments

Comments
 (0)