rex-text 0.2.50 → 0.2.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e1e4f195a13ca2269745675f94c71bd02c1de0b4e3f39c4b92fb67495b0cf7
-  data.tar.gz: c1c23a29f68de3b6079ea88e0744bbaf5c9ca438b5f1e8154b72eadf330ccac7
+  metadata.gz: e9814b1ad404f9ec4aec0102caf30af10fa00639bcbc6d67d3c3947ffd848229
+  data.tar.gz: 44ee07b97ef06aac2bc3e17ba27e6cbb2e61e7b93628e4b942196c693ac39fd2
 SHA512:
-  metadata.gz: e3b09f9314ca321522b7a599231274e4685255f85457eb9b7466047941db5e22c8907d2d607c3b7d40e26b1d381423841291e269423545da2ea2345b734f0b82
-  data.tar.gz: ab1b340d0812134021d7776016e3cfb51358c2ecbe85b57e5f2943b07ec61608cae635ae6525390e16d6b7003d96638d859fc452572d7047700c0b3c1378afce
+  metadata.gz: a734eebc8ab62ca00c662b815e3ba9d2ef189f35a4b02513fe2adb0ef4d01f9142b3f4c97d08fc60274e5ee1ea3c8817e6cc9ca191deacd0030f79323b1c0357
+  data.tar.gz: e17248ae8403a4f4c39c8a56e3f7b3173a111d2b121d5fe350da672cb4e5d91264ee2ed7f2831bde9c8fcdc50bf9a2fdad070a810ac9a6dcec8f5837d00722cd

data/.github/workflows/verify.yml

@@ -37,6 +37,7 @@ jobs:
           - '3.0'
           - '3.1'
           - '3.2'
+          - '3.3.0-preview1'
         os:
           - ubuntu-20.04
           - ubuntu-latest

data/lib/rex/text/binary_manipulation.rb

@@ -28,15 +28,15 @@ module Rex
     # Creates a comma separated list of dwords
     #
     def self.to_dword(str, wrap = DefaultWrap)
-      code = str
+      code = str.dup.force_encoding('ASCII-8BIT')
       alignnr = str.length % 4
       if (alignnr > 0)
         code << "\x00" * (4 - alignnr)
       end
       codevalues = Array.new
-      code.split("").each_slice(4) do |chars4|
+      code.chars.each_slice(4) do |chars4|
         chars4 = chars4.join("")
-        dwordvalue = chars4.unpack('*V')
+        dwordvalue = chars4.unpack('V')
         codevalues.push(dwordvalue[0])
       end
       buff = ""

data/lib/rex/text/hex.rb

@@ -22,7 +22,7 @@ module Rex
       # the regex the first time it is used and never check again.  Since we
       # want to know how many to capture on every instance, we do it this
       # way.
-      return str.unpack('H*')[0].gsub(Regexp.new(".{#{count * 2}}", nil, 'n')) { |s| prefix + s }
+      return str.unpack('H*')[0].gsub(Regexp.new(".{#{count * 2}}", Regexp::NOENCODING)) { |s| prefix + s }
     end
 
     #
@@ -40,7 +40,7 @@ module Rex
     #   their escaped hex representation
     def self.to_hex_ascii(str, prefix = "\\x", count = 1, suffix=nil)
       raise ::RuntimeError, "unable to chunk into #{count} byte chunks" if ((str.length % count) > 0)
-      return str.unpack('H*')[0].gsub(Regexp.new(".{#{count * 2}}", nil, 'n')) { |s|
+      return str.unpack('H*')[0].gsub(Regexp.new(".{#{count * 2}}", Regexp::NOENCODING)) { |s|
         (0x20..0x7e) === s.to_i(16) ? s.to_i(16).chr : prefix + s + suffix.to_s
       }
     end

data/lib/rex/text/lang.rb

@@ -45,6 +45,29 @@ module Rex
       return "/*\n" + wordwrap(str, 0, wrap, '', '') + "*/\n"
     end
 
+    #
+    # Converts to a masm style array of bytes
+    #
+    def self.to_masm(str, wrap = DefaultWrap, name = "")
+      raise ArgumentError.new('str can not be empty') if str.empty?
+      a = to_hex(str)
+      a.gsub!(/\\x/, '')
+      a.gsub!(/(.{2})/, '\1h,')
+      a.gsub!(/(.{32})/, '\1\n')
+      a.gsub!('\n', "\n")
+      a.gsub!(/^(.*),$/, 'DB \1')
+      a.gsub!(/([a-f].h)/, '0\1')
+      a.sub!(/^/, 'shellcode ')
+      return a
+    end
+
+    #
+    # Creates a masm style comment
+    #
+    def self.to_masm_comment(str,  wrap = DefaultWrap)
+      return wordwrap(str, 0, wrap, '', '; ')
+    end
+
     #
     # Converts to a nim style array of bytes
     #

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.50"
+    VERSION = "0.2.52"
   end
 end

data.tar.gz.sig

@@ -1,2 +1,4 @@
->�6�u�dE����4��\Q[�~�j�P����;��D
-I��!����X��`�:�X6Q|�|��C{x��5Ė�c��+>��D
+}	��R�.*/
+�O�+���
lt/�\:S������c��ҩl�\�ԫ�
j�r��}p�#��-�w��J��s�\�ט��8�y	��nHR!
+CEZ;�NuC�����m�Ą0�fͿ����R��=W�οa2r
|��\�v׃l�s
+�Q�&�=��^y��sS�ȴ�b�o��e��4�~�ۢuxe6�W�����nw

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.50
+  version: 0.2.52
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Provides Text Manipulation Methods for Exploitation