rex-text 0.2.61 → 0.2.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 116788ee4b0c5a6c7564e7300089bb7c80e90434b3e3cb081a4644d9a1308543
-  data.tar.gz: 6dd36af9873d02b69f60cc27097838d0c34dea3627bdac25b3793a193468ae46
+  metadata.gz: 38b05e7a7c130d9db696f9d524e28f9cd2625dd0bea7679af45d42bd1a80e9c5
+  data.tar.gz: 6c5eb25945c58e4bc70c9b27e670afda87f12a989c201c8bd17e92b0638aa44e
 SHA512:
-  metadata.gz: 1397d7812e81ed8ae765f5b2fb99a8299bb40fa1c54ca72f99cb814b1b44dab0b7ce2872396310b95267709a99e2a251b7084502c981919a5cbb4438baab80aa
-  data.tar.gz: 50bc007eea070ebd889159e4fa92bbd78bde8614a040bc1656fcec0bddb4930cb56fc59df3d1ed599652d0da20b28cf6897022c8457322514d951acb96623a53
+  metadata.gz: d7b7005302c8640bbee97b198c3059605521af4ea7b5f7bf7ac055aaf28f16c4be47c8289a0c77c4b45c73f65eeae769e142433396060158827419c437e03b56
+  data.tar.gz: 65998e0159a9fea9ac51c0e9e290cb98138254250d4fb8953f80a88926e7b83480bbe0eeb8223d3efb9f3aa064a0df5e193b50768d6267e347540cb21973648a

data/lib/rex/text/block_api.rb

@@ -11,22 +11,25 @@ module Rex
     #
     # @param mod [String] The name of the module containing the target function.
     # @param fun [String] The name of the function.
+    # @param iv [Integer] The 32-bit initialization vector (IV) to use for the hash operation
     #
     # @return [String] The hash of the mod/fun pair in string format
-    def self.block_api_hash(mod, func)
-      unicode_mod = (mod.upcase + "\x00").unpack('C*').pack('v*')
-      mod_hash = self.ror13_hash(unicode_mod)
-      fun_hash = self.ror13_hash(func + "\x00")
-      "0x#{(mod_hash + fun_hash & 0xFFFFFFFF).to_s(16)}"
+    def self.block_api_hash(mod, func, iv: 0)
+      unicode_mod = (mod.upcase).unpack('C*').pack('v*')
+      mod_hash = self.ror13_hash(unicode_mod, iv: iv)
+      fun_hash = self.ror13_hash(func + "\x00", iv: mod_hash)
+      "0x#{(fun_hash & 0xFFFFFFFF).to_s(16)}"
     end
 
     #
     # Calculate the ROR13 hash of a given string
+    # @param string [String] The string to hash
+    # @param iv [Integer] The 32-bit initialization vector (IV) to use for the hash operation
     #
     # @return [Integer]
-    def self.ror13_hash(name)
-      hash = 0
-      name.unpack("C*").each {|c| hash = ror(hash, 13); hash += c }
+    def self.ror13_hash(string, iv: 0)
+      hash = (iv & 0xFFFFFFFF)
+      string.unpack("C*").each {|c| hash = ror(hash, 13); hash += c }
       hash
     end
   end

data/lib/rex/text/hex.rb

@@ -166,6 +166,25 @@ module Rex
       str.gsub!(regex) { |x| x[2,2].to_i(16).chr }
     end
 
+    #
+    # Converts a string to a comma-separated hex byte sequence suitable for
+    # use in assembly `db` directives.
+    #
+    # @example
+    #   Rex::Text.to_hex_cstring("hi")                  # => "0x68, 0x69, 0x00"
+    #   Rex::Text.to_hex_cstring("")                    # => "0x00"
+    #   Rex::Text.to_hex_cstring("hi", nullbyte: false) # => "0x68, 0x69"
+    #   Rex::Text.to_hex_cstring("", nullbyte: false)   # => ""
+    #
+    # @param str [String] The string to convert
+    # @param nullbyte [Boolean] Whether to append a null terminator (default: true)
+    # @return [String] Comma-separated hex bytes
+    def self.to_hex_cstring(str, nullbyte: true)
+      bytes = str.to_s.bytes
+      bytes.push(0) if nullbyte
+      bytes.map { |byte| '0x%02x' % byte }.join(', ')
+    end
+
     private
 
     #

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.61"
+    VERSION = "0.2.63"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.61
+  version: 0.2.63
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2026-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake