ronin-support 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f47bb5e6e9e8b720f2b2e66cfd1eb49bcb4562e5ed0025a3ed491ee7e39f106
-  data.tar.gz: a68c5f263d3d7caf40f789354e51a977ada25c52cb7a93f58c4c10208c40da67
+  metadata.gz: d6f75dd96200bd01190ad5ae040cc28dfc658c3f6bcf6c7f299bcdb01d1ee974
+  data.tar.gz: 2a9b6e98f9959efacbbc81fccecbaa68b1620a8f52e38efdc941dcdba74ba38d
 SHA512:
-  metadata.gz: 302af7c9324ba08daff8107236734c211b10f969723f55cac2843ec52a5e367357c1b3c06d4138215553960a994ae4c3338e3a4302105979fedb1dac51b2cc20
-  data.tar.gz: 542b8b0d1caab51fce5fedf516b3b849c2a673492995916db6a43b3522090cd8bb1acc1b3200741832153e874522fcd60eae76f74e2aa90bb76d57dafb6daa1e
+  metadata.gz: 604e499c76bfd98e82dd2711a203edb85263742df23f128179d52b283c1f6e468334a34b456119b76c1a0d84b2d06969100d4b75e880a5b4ab963e6ccf244742
+  data.tar.gz: 843289f09e088afc611ee793f645cdb978bb51613d69176591599c26fdc4e8bfcc8b255e76fc01a7b8c40b1024aa94b69976754de3d9ef84b9ae5eecc62d4223

data/.github/workflows/ruby.yml

@@ -16,7 +16,7 @@ jobs:
           # - truffleruby
     name: Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -31,7 +31,7 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/ChangeLog.md

@@ -1,3 +1,13 @@
+### 1.0.4 / 2023-12-15
+
+* Fixed a bug in {Array#pack} where complex types (ex: `[[:uint32, 4], 10]`)
+  were not being packed correctly.
+* Fixed a bug in {String#unpack} where complex types (ex: `[[:uint32, 4], 10]`)
+  were not being unpacked correctly.
+* Fixed a bug in {Ronin::Support::Binary::CTypes::ObjectType#initialize} when
+  the object's type has an infinite size, such as an unbounded Array type.
+* Allow using non-RSA keys in all SSL/TLS methods.
+
 ### 1.0.3 / 2023-09-19
 
 * {Ronin::Support::Crypto::Cert::Name#entries} now returns UTF-8 encoded

data/lib/ronin/support/binary/core_ext/array.rb

@@ -41,6 +41,11 @@ class Array
   #                 :mips, :mips_le, :mips64, :mips64_le, nil] :arch
   #   The desired architecture to pack the data for.
   #
+  # @option kwargs [:linux, :macos, :windows,
+  #                 :android, :apple_ios, :bsd,
+  #                 :freebsd, :openbsd, :netbsd] :os
+  #   The Operating System (OS) to use.
+  #
   # @return [String]
   #   The packed Array.
   #
@@ -67,8 +72,8 @@ class Array
     if (arguments.length == 1 && arguments.first.kind_of?(String))
       pack_original(arguments.first)
     else
-      format = Ronin::Support::Binary::Template.new(arguments,**kwargs)
-      pack_original(format.pack_string)
+      template = Ronin::Support::Binary::Template.new(arguments,**kwargs)
+      template.pack(*self)
     end
   end
 

data/lib/ronin/support/binary/core_ext/string.rb

@@ -43,6 +43,11 @@ class String
   #                 :mips, :mips_le, :mips64, :mips64_le, nil] :arch
   #   The desired architecture that the data was packed for.
   #
+  # @option kwargs [:linux, :macos, :windows,
+  #                 :android, :apple_ios, :bsd,
+  #                 :freebsd, :openbsd, :netbsd] :os
+  #   The Operating System (OS) to use.
+  #
   # @return [Array]
   #   The values unpacked from the String.
   #
@@ -69,8 +74,8 @@ class String
     if (arguments.length == 1 && arguments.first.kind_of?(String))
       unpack_original(arguments.first)
     else
-      format = Ronin::Support::Binary::Template.new(arguments,**kwargs)
-      unpack_original(format.pack_string)
+      template = Ronin::Support::Binary::Template.new(arguments,**kwargs)
+      template.unpack(self)
     end
   end
 

data/lib/ronin/support/binary/ctypes/object_type.rb

@@ -45,7 +45,13 @@ module Ronin
           def initialize(size)
             @size = size
 
-            super(pack_string: "a#{@size}")
+            super(
+              pack_string: if size.finite?
+                             "a#{@size}"
+                           else
+                             'a*'
+                           end
+            )
           end
 
         end

data/lib/ronin/support/binary/ctypes/os/linux.rb

@@ -44,7 +44,7 @@ module Ronin
               typedef :long, :__blkcnt_t
               typedef :long, :__blksize_t
               typedef :long, :blksize_t
-              typedef types::POINTER, :__caddr_t
+              typedef :pointer, :__caddr_t
               typedef :int, :__clockid_t
               typedef :int, :clockid_t
               typedef :long, :__clock_t
@@ -170,7 +170,7 @@ module Ronin
                 typedef :uint, :nlink_t
                 typedef :long_long, :__off64_t
                 typedef :long_long, :off_t
-                typedef types::POINTER, :__qaddr_t
+                typedef :pointer, :__qaddr_t
                 typedef :long_long, :__quad_t
                 typedef :long_long, :quad_t
                 typedef :ulong_long, :__rlim64_t

data/lib/ronin/support/binary/template.rb

@@ -132,11 +132,16 @@ module Ronin
         #                 :arm64, :arm64_le, :arm64_be] :arch
         #   The desired architecture for the values within the template.
         #
+        # @option kwargs [:linux, :macos, :windows,
+        #                 :android, :apple_ios, :bsd,
+        #                 :freebsd, :openbsd, :netbsd] :os
+        #   The Operating System (OS) to use.
+        #
         # @raise [ArgumentError]
         #   A given type is not known.
         #
         # @example
-        #   template = Template.new([:uint32, [:char, 100]])
+        #   template = Template.new([:uint32, [:char, 10]])
         #   template.pack(0x123456, ['A', 'B', 'C'])
         #   # => "CBA\x00XYZ\x00\x00\x00\x00\x00\x00\x00"
         #   template.unpack("CBA\x00XYZ\x00\x00\x00\x00\x00\x00\x00")
@@ -164,9 +169,39 @@ module Ronin
           end
         end
 
+        #
+        # Alias for `Template.new`.
+        #
+        # @param [::Array<Symbol, (Symbol, Integer)>] fields
+        #   The C-types which the packer will use.
+        #
+        # @param [Hash{Symbol => Object}] kwargs
+        #   Additional keyword arguments.
+        #
+        # @option kwargs [:little, :big, :net, nil] :endian
+        #   The desired endianness of the values within the template.
+        #
+        # @option kwargs [:x86, :x86_64,
+        #                 :ppc, :ppc64,
+        #                 :mips, :mips_le, :mips_be,
+        #                 :mips64, :mips64_le, :mips64_be,
+        #                 :arm, :arm_le, :arm_be,
+        #                 :arm64, :arm64_le, :arm64_be] :arch
+        #   The desired architecture for the values within the template.
+        #
+        # @option kwargs [:linux, :macos, :windows,
+        #                 :android, :apple_ios, :bsd,
+        #                 :freebsd, :openbsd, :netbsd] :os
+        #   The Operating System (OS) to use.
+        #
+        # @return [Template]
+        #   The new template object.
+        #
+        # @raise [ArgumentError]
+        #   A given type is not known.
         #
         # @example
-        #   template = Template.new[:uint32, [:char, 10]]
+        #   template = Template[:uint32, [:char, 10]]
         #   template.pack(0x123456, ['A', 'B', 'C'])
         #   # => "CBA\x00XYZ\x00\x00\x00\x00\x00\x00\x00"
         #   template.unpack("CBA\x00XYZ\x00\x00\x00\x00\x00\x00\x00")

data/lib/ronin/support/encoding/html/core_ext/integer.rb

@@ -78,7 +78,7 @@ class Integer
   #   The `format:` or `case:` keyword argument is invalid.
   #
   # @example
-  #   0x41.html_enocde
+  #   0x41.html_encode
   #   # => "A"
   #
   # @example Zero-padding:

data/lib/ronin/support/network/http/mixin.rb

@@ -182,7 +182,7 @@ module Ronin
           #   The HTTP method to use for the request.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -215,7 +215,7 @@ module Ronin
           #   The HTTP method to use for the request.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -240,7 +240,7 @@ module Ronin
           #   The HTTP method to use for the request.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -263,7 +263,7 @@ module Ronin
           #   The HTTP method to use for the request.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -285,7 +285,7 @@ module Ronin
           # Sends an HTTP request and returns the `Server` header.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro connect_kwargs
           # @!macro request_kwargs
@@ -307,7 +307,7 @@ module Ronin
           # Sends an HTTP request and returns the `X-Powered-By` header.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -332,7 +332,7 @@ module Ronin
           #   The HTTP method to use for the request.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -354,7 +354,7 @@ module Ronin
           # Performs a `COPY` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -372,15 +372,15 @@ module Ronin
           #
           # @api public
           #
-          def http_copy(url, ssl: nil, **kwargs)
-            Network::HTTP.copy(url, ssl: ssl, **kwargs)
+          def http_copy(url, ssl: nil, **kwargs,&block)
+            Network::HTTP.copy(url, ssl: ssl, **kwargs,&block)
           end
 
           #
           # Performs a `DELETE` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -406,7 +406,7 @@ module Ronin
           # Performs a `GET` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -433,7 +433,7 @@ module Ronin
           # headers.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -456,7 +456,7 @@ module Ronin
           # header(s).
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -477,7 +477,7 @@ module Ronin
           # body.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -497,7 +497,7 @@ module Ronin
           # Performs a `HEAD` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -523,7 +523,7 @@ module Ronin
           # Performs a `LOCK` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -549,7 +549,7 @@ module Ronin
           # Performs a `MKCOL` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -575,7 +575,7 @@ module Ronin
           # Performs a `MOVE` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -601,7 +601,7 @@ module Ronin
           # Performs a `OPTIONS` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -628,17 +628,11 @@ module Ronin
           # `Allow` response header.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
           #
-          # @yield [response]
-          #   If a block is given it will be passed the received HTTP response.
-          #
-          # @yieldparam [Net::HTTPRresponse] response
-          #   The received HTTP response object.
-          #
           # @return [Array<Symbol>]
           #   The allowed HTTP request methods for the given URL.
           #
@@ -646,15 +640,15 @@ module Ronin
           #
           # @api public
           #
-          def http_allowed_methods(url, ssl: nil, **kwargs,&block)
-            Network::HTTP.allowed_methods(url, ssl: ssl, **kwargs,&block)
+          def http_allowed_methods(url, ssl: nil, **kwargs)
+            Network::HTTP.allowed_methods(url, ssl: ssl, **kwargs)
           end
 
           #
           # Performs a `PATCH` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -682,7 +676,7 @@ module Ronin
           # Performs a `POST` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -709,7 +703,7 @@ module Ronin
           # headers.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -732,7 +726,7 @@ module Ronin
           # response body.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -752,7 +746,7 @@ module Ronin
           # Performs a `PROPFIND` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -780,7 +774,7 @@ module Ronin
           # Performs a `PROPPATCH` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -808,7 +802,7 @@ module Ronin
           # Performs a `PUT` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -836,7 +830,7 @@ module Ronin
           # Performs a `TRACE` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs
@@ -862,7 +856,7 @@ module Ronin
           # Performs a `UNLOCK` request for the given URI.
           #
           # @param [URI::HTTP, Addressable::URI, String] url
-          #   Optional URL to create the HTTP request for.
+          #   The URL to create the HTTP request for.
           #
           # @!macro request_kwargs
           # @!macro connect_kwargs

data/lib/ronin/support/network/ssl.rb

@@ -16,7 +16,8 @@
 # along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/support/network/ssl/openssl'
+require 'ronin/support/crypto/openssl'
+require 'ronin/support/crypto/key'
 require 'ronin/support/network/ssl/local_key'
 require 'ronin/support/network/ssl/local_cert'
 require 'ronin/support/network/ssl/proxy'
@@ -148,7 +149,7 @@ module Ronin
           context.verify_mode = VERIFY[verify]
 
           if (key_file || key) && (cert_file || cert)
-            context.key  = if key_file then Crypto::Key::RSA.load_file(key_file)
+            context.key  = if key_file then Crypto::Key.load_file(key_file)
                            else             key
                            end
 

data/lib/ronin/support/text/entropy.rb

@@ -51,7 +51,7 @@ module Ronin
           length  = string.length.to_f
           entropy = 0.0
 
-          char_counts.each do |char,count|
+          char_counts.each_value do |count|
             freq     = count / length
             entropy -= freq * Math.log(freq,base)
           end

data/lib/ronin/support/version.rb

@@ -19,6 +19,6 @@
 module Ronin
   module Support
     # ronin-support version
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

data/lib/ronin/support.rb

@@ -28,6 +28,20 @@ require 'ronin/support/text'
 require 'ronin/support/version'
 
 module Ronin
+  #
+  # Top-level namespace for `ronin-support`.
+  #
+  # ## Example
+  #
+  #     require 'ronin/support'
+  #     include Ronin::Support
+  #
+  #     "hello world".base64_encode
+  #     # => "aGVsbG8gd29ybGQ=\n"
+  #
+  #     http_get 'https://example.com/'
+  #     # => #<Net::HTTPOK 200 OK readbody=true>
+  #
   module Support
     include Mixin
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ronin-support
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Postmodern
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chars