crypto-toolbox 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c529ed8b701c009002b4b9403f64034576b5af9
-  data.tar.gz: 7769523cf65f54fecc8e2f3e920a96d2bed93594
+  metadata.gz: 37d4aab806c87b5df97642e506ea938733be2b79
+  data.tar.gz: 0527ceaba2da2046e998194405f3b7d5a48394d7
 SHA512:
-  metadata.gz: 28b5161e37b409bfae0d46955e3aa51b5ab8761157911314752e149d1aa0785a84dfb529b4b8cb0f8fd7c5812772996a8effef468f432ee6f98e3f65f85333c8
-  data.tar.gz: 714d3cfb1302dee2e227246bf83ff082218db3a5c74dc4d697f72ebf917a893f6bb3c107f77a3f0d6a60587f798c311c18b0c008789595869bd9d53414251e39
+  metadata.gz: f5e20456aa954a252cf3c7407ecacbabb1cd09c53fbaa5773fc0468283f18a5a2f80a4ded360e83bffe84b7cd058120194fbb2191c04f915d23eaba0c5bb070d
+  data.tar.gz: 8e41fdd52797f51022df4a97abc30320df50e95f29038ffb96e844ee74fb53d4d7aa681eaf80aa99168f05d142cc4234efbc5856559ded55ad7c7016066dcc2e

data/lib/crypto-toolbox/analyzers/padding_oracle/analyzer.rb

@@ -15,11 +15,16 @@ module Analyzers
         @oracle      = oracle_class.new
       end
 
-      
+      # start with the second to last block to manipulate the final block ( cbc xor behaviour )
+      # from there on we move to the left until we have used the first block (iv) to decrypt
+      # the second blick ( first plain text block )
+      #
+      # we have to manipulate the block before the one we want to change
+      # xxxxxxxxx   xxxxxxxxx     xxxxxxxxxx
+      # changing this byte  ^- will change ^- this byte at decryption
       def analyze(cipher)
         blocks = CryptBuffer.from_hex(cipher).chunks_of(16)
         
-        # start with the second to last block to manipulate the final block ( cbc xor behaviour )
         (blocks.length - 1).downto(1) do |block_index|
           result_part = []
           # manipulate each byte of the 16 byte block
@@ -50,10 +55,8 @@ module Analyzers
       def apply_found_bytes(buf,cur_result,pad_index)
         # first we have to apply all the already found bytes
 
-
         # NOTE: to easily xor all already found byte and the current padding value
         # We build up a byte-array with all the known values and "left-pad" them with zeros
-        
         other = ([0] * ( buf.length - cur_result.length)) + cur_result.map{|x| x ^ pad_index }
         # => [0,0,0,...,cur[n] ^ pad_index,... ]
         buf.xor(other)
@@ -64,22 +67,18 @@ module Analyzers
         #iv, first, second, last
         jot(cur_result.inspect,debug: true)
         
-        # create a copy to mess with without changing to current block
-        forge_buf = blocks[block_index - 1].dup
-        
-        forge_buf = apply_found_bytes(forge_buf,cur_result,pad_index)
+        # apply all the current-result bytes to the block corresponding to <block_index>
+        # and store the result in a buffer we will mess with
+        #
+        forge_buf = apply_found_bytes(blocks[block_index - 1],cur_result,pad_index)
         
         1.upto 256 do |guess|
-          bytes = forge_buf.bytes.dup
-          new_byte  = forge_buf[-1 * pad_index] ^ guess ^ pad_index
+          # the bytes from the subset we will send to the padding oracle
+          subset = blocks[0,block_index+1]
+          subset[block_index -1 ] = forge_buf.xor_at([guess,pad_index], -1 * pad_index)
+ 
+          input =  subset.map(&:bytes).flatten
           
-          bytes[-1 * pad_index] = new_byte
-          
-          oracle_blocks = blocks[0,block_index+1].map(&:bytes)
-          oracle_blocks[block_index -1 ] = bytes
-
-          input =  oracle_blocks.flatten
-
           # skip the first correct guess on the first iteration of the first block
           # otherwise the resulting ciphertext would eq the original input
           #next if input == blocks.map(&:bytes).flatten

data/lib/crypto-toolbox/analyzers/padding_oracle/oracles/tcp_oracle.rb

@@ -26,16 +26,16 @@ module Analyzers
         end
         
         def valid_padding?(input,block_amount)
-          ret = send_msg(input, block_amount)
-          !ret.zero?
+          ! send_msg(input, block_amount).zero?
         end
 
         private
         def send_msg(input,block_amount)
           connect unless connected?
 
-          msg = ([block_amount] + input + [0]).map(&:chr)
-          @socket.write(msg.join(""))
+          msg = ([block_amount] + input + [0]).map(&:chr).join
+          sleep 0.01
+          @socket.write(msg)
           @socket.read(2).to_i
         end
         def connected?
@@ -46,6 +46,3 @@ module Analyzers
     end
   end
 end
-
-
-

data/lib/crypto-toolbox/analyzers/utils/spell_checker.rb

@@ -28,6 +28,14 @@ Some statistics about it:
         words = str.split(" ").select{|w| @dict.check?(w) }
       end
 
+      def human_word?(str)
+        @dict.check?(str)
+      end
+
+      def human_phrase?(string)
+        string.split(" ").all?{|part| human_word?(part)}
+      end
+
       def suggest(str)
         @dict.suggest(str)
       end

data/lib/crypto-toolbox/crypt_buffer.rb

@@ -69,11 +69,6 @@ class CryptBuffer
   def chunks_of(n)
     self.bytes.each_slice(n).map{|chunk| CryptBuffer(chunk) }
   end
-  
-  private
-  def xor_multiple(byte,bytes)
-    ([byte] + bytes).reduce(:^)
-  end
 end
 
 

data/lib/crypto-toolbox/crypt_buffer/concerns/xor.rb

@@ -13,7 +13,8 @@ module CryptBufferConcern
       when true
         # map our current data to xor all inputs with the given bytepos.
         # all other bytes are kept as they were
-        tmp = bytes.map.with_index{|b,i| i == pos ? xor_multiple(b,input.to_ary) : b }
+        abs_pos = normalize_pos(pos)
+        tmp = bytes.map.with_index{|b,i| i == abs_pos ? xor_multiple(b,input.to_ary) : b }
         CryptBuffer(tmp)
       else
         tmp = bytes
@@ -50,6 +51,17 @@ module CryptBufferConcern
       x = hex2bytes(hex)
       xor_bytes(x)
     end
+
+    private
+    def xor_multiple(byte,bytes)
+
+      ([byte] + bytes).reduce(:^)
+    end
+    def normalize_pos(pos)
+      (pos < 0) ? (length() + pos ) : pos
+    end
+
+    
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crypto-toolbox
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Dennis Sivia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aes