rex-text 0.2.21 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1636b1450848233f216d0ebebefb2da5d642ff97
-  data.tar.gz: 99503e08430646adc6d2ba25b3ec66dfbf9701f8
+  metadata.gz: 190d1c71b613ee194a0aac2cf30a1f9e64aa3840
+  data.tar.gz: 5be68027d74cf0f41e7cd988274f0f95ef2d6568
 SHA512:
-  metadata.gz: b1cc678bd8df6bbc0aa3066504dface1ea3b44c9a50189c6df3a596b13f4a68ebc35f69b15fc90e3df009ef82bd59410c0751dd86fab49e35bc29241e5b317d6
-  data.tar.gz: 521b2dc5498cc0183c85b80abea0f070542b438a5d2cf15d04420817ffdd8d120cad65dfb07488555e835ada36972951702bc4063a05299dedae4ebdb7c69a64
+  metadata.gz: 0cfce79358cf4dcfae393fa5af505e5c5b319553e5c163fcdfd6ca038049078cc2a2d1280bde198af9ed8efc883643acb248b1af77ae8853671885d948de8230
+  data.tar.gz: 3359f81978ca710c11ae51f774cc370598d8289cbe640c536e9279f07cba5c8293a10c527cbedecb7dd2131543ca56d86e8a9940fffc2cc0e94631a16baecd48

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.21"
+    VERSION = "0.2.22"
   end
 end

data/lib/rex/text/xor.rb

@@ -1,28 +1,38 @@
 # -*- coding: binary -*-
 
-module Rex
-  module Text
+module Rex::Text
+  # XOR a string against a variable-length key
+  #
+  # @param key [String] XOR key
+  # @param value [String] String to XOR
+  # @return [String] XOR'd string
+  def self.xor(key, value)
+    unless key && value
+      raise ArgumentError, 'XOR key and value must be supplied'
+    end
 
-    # Returns a XOR'd string.
-    #
-    # @param key [String] XOR key.
-    # @param value [String] The string to XOR.
-    # @return [String] An XOR'd string.
-    def self.xor(key, value)
-      xor_key = key.kind_of?(Integer) || key.nil? ? key.to_i : key.to_i(16)
-      unless xor_key.between?(0, 255)
-        raise ArgumentError, 'XOR key should be between 0x00 to 0x0f'
-      end
+    xor_key =
+      case key
+      when String
+        if key.empty?
+          raise ArgumentError, 'XOR key must not be empty'
+        end
 
-      buf = ''
+        key
+      when Integer
+        unless key.between?(0x00, 0xff)
+          raise ArgumentError, 'XOR key must be between 0x00 and 0xff'
+        end
 
-      value.each_byte do |byte|
-        xor_byte = byte ^ xor_key
-        buf << [xor_byte].pack('c')
+        # Convert integer to string
+        [key].pack('C')
       end
 
-      buf
-    end
+    # Get byte arrays for key and value
+    xor_key   = xor_key.bytes
+    xor_value = value.bytes
 
+    # XOR value against cycled key
+    xor_value.zip(xor_key.cycle).map { |v, k| v ^ k }.pack('C*')
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors:
 - David 'thelightcosine' Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler