crypto-toolbox 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f804212b6478e63ae1c80d653086b759193cc34
-  data.tar.gz: bf5c217909f1d87299448ef04487b7af66b14c6e
+  metadata.gz: fe24da56b4f073b5f98d3272c04a23c2aadaaf7a
+  data.tar.gz: 49231fab5588a34344c78a9a55df286699f374e8
 SHA512:
-  metadata.gz: 1bb8c435152b2cb257c63b5d7510da9b806dae086aac299033c35ca47aeacee2aaa9932173390e1285e70e146ea23604fc688fba83e8e25527d1e583ad4b6e08
-  data.tar.gz: b81ede33a54fa6e3d407b5f37a136af03379d3eba525755e67f479a54e1dfdb90b7a4f4a833fcc4a0eadfc65861d8821c99f3ec5150e2abb91b18dc94682108b
+  metadata.gz: 1c10b6b880631787c73340e66cadd4a1abae268e73914b80d09e9463c8b3bf3201e5d9e94d7c4bc64110aa90d60ae7d72a6ba4f9c0f9ee8c01756003f791bd6b
+  data.tar.gz: 06c2b6a4e7c8d14118b4e2981014d4d70f0efde4f0ea73c3d0be2101633ee513c3e03de812e2211eee98cbd2a3a8da15ff4cb436bb836b321623a0ce590ab044

data/lib/crypto-toolbox/ciphers/caesar.rb

@@ -55,7 +55,7 @@ Letter Array include?(A):    76997.0 i/s - 42.73x slower
     end
 
     def convert_shift(shift)
-      ("A".."Z").to_a.each_with_index.inject({}){|memo,(val,index)| memo[val] = index; memo }[shift]
+      ("A".."Z").to_a.each.with_index.with_object({}){|(val,index),hsh| hsh[val] = index }[shift]
     end
   end
   

data/lib/crypto-toolbox/crypt_buffer.rb

@@ -1,32 +1,37 @@
 require 'aes'
 require 'openssl'
 require 'forwardable'
+
+require 'crypto-toolbox/crypt_buffer/concerns/arithmetic.rb'
 require 'crypto-toolbox/crypt_buffer/concerns/byte_expander.rb'
-require 'crypto-toolbox/crypt_buffer/concerns/byte_manipulation.rb'
 require 'crypto-toolbox/crypt_buffer/concerns/comparable.rb'
 require 'crypto-toolbox/crypt_buffer/concerns/convertable.rb'
-require 'crypto-toolbox/crypt_buffer/concerns/xor.rb'
+require 'crypto-toolbox/crypt_buffer/concerns/padding.rb'
 require 'crypto-toolbox/crypt_buffer/concerns/pretty_print.rb'
-
+require 'crypto-toolbox/crypt_buffer/concerns/xor.rb'
 
 class CryptBuffer
   class OutOfRangeError < RuntimeError; end
-
-
+  
+  include CryptBufferConcern::Arithmetic
+  include CryptBufferConcern::ByteExpander
   include CryptBufferConcern::Convertable
   include CryptBufferConcern::Comparable
-  include CryptBufferConcern::Xor
-  include CryptBufferConcern::ByteManipulation
+  include CryptBufferConcern::Padding
   include CryptBufferConcern::PrettyPrint
-  include CryptBufferConcern::ByteExpander
+  include CryptBufferConcern::Xor
+
   
+  include Enumerable
   extend Forwardable
-  def_delegators :@bytes, :[], :empty?,:include?, :length
-
+  def_delegators :@bytes, :[], :empty?,:include?, :each, :length
 
+  
   attr_accessor :bytes
   alias_method :b, :bytes
 
+
+
   
   def initialize(input)
     @bytes = bytes_from_any(input)
@@ -43,12 +48,6 @@ class CryptBuffer
     CryptBuffer.new(hexstr)
   end
 
-  include Enumerable
-  def each(&block)
-    @bytes.each(&block)
-  end
-
-
   # Returns an array of the nth least sigificant by bit of each byte
   def nth_bits(n)
     raise OutOfRangeError if n < 0
@@ -61,6 +60,8 @@ class CryptBuffer
     self.bytes.each_slice(n).map{|chunk| CryptBuffer(chunk) }
   end
 
+
+
   
   private
   def sanitize_modulus(mod)
@@ -70,55 +71,60 @@ class CryptBuffer
   def xor_multiple(byte,bytes)
     ([byte] + bytes).reduce(:^)
   end
+  
   def bytes_from_any(input)
     case input
-      when Array
-        input
-      when String
-        if input.match(/^0x[0-9a-fA-F]+$/).nil?
-          str2bytes(input)
-        else
-          hex2bytes(normalize_hex(input))
-        end
-      when CryptBuffer
-        input.b
-      when Fixnum
-        # integers as strings dont have a 0x prefix
-        if input.to_s(16).match(/^[0-9a-fA-F]+$/)
-          # assume 0x prefixed integer
-          hex2bytes(normalize_hex(input.to_s(16)))
-        else
-          # regular number
-          [input].pack('C*').bytes
-        end
-      else
-        raise "Unsupported input: #{input.inspect} of class #{input.class}"
+    when Array
+      input
+    when String
+      str2bytes(input)
+    when CryptBuffer
+      input.b
+    when Fixnum
+      int2bytes(input)
+    else
+      raise "Unsupported input: #{input.inspect} of class #{input.class}"
     end
   end
 
-  def self.pad_hex_char(str)
-    (str.length == 1) ? "0#{str}" : "#{str}"
-  end
   def normalize_hex(str)
     tmp = self.class.pad_hex_char(str)
     tmp.gsub(/(^0x|\s)/,"").upcase
   end
-
+  
+  def self.pad_hex_char(str)
+    (str.length == 1) ? "0#{str}" : "#{str}"
+  end
+  
   def strip_hex_prefix(hex)
     raise "remove 0x from hexinput"
   end
-
+  
+  def int2bytes(input)
+    # integers as strings dont have a 0x prefix
+    if input.to_s(16).match(/^[0-9a-fA-F]+$/)
+      # assume 0x prefixed integer
+      hex2bytes(normalize_hex(input.to_s(16)))
+    else
+      # regular number
+      [input].pack('C*').bytes
+    end
+  end
+  
   def hex2bytes(hexstr)
     hexstr.scan(/../).map{|h| h.to_i(16) }
   end
 
   def str2bytes(str)
-    str.bytes.to_a
+    if str.match(/^0x[0-9a-fA-F]+$/).nil?
+      str.bytes.to_a
+    else
+      hex2bytes(normalize_hex(str))
+    end
   end
-
-
 end
 
+
 def CryptBuffer(input)
   CryptBuffer.new(input)
 end

data/lib/crypto-toolbox/crypt_buffer/concerns/{byte_manipulation.rb → arithmetic.rb}

@@ -1,5 +1,5 @@
 module CryptBufferConcern
-  module ByteManipulation
+  module Arithmetic
     
     def modulus(mod)
       real_mod = sanitize_modulus(mod)

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

@@ -0,0 +1,61 @@
+module CryptBufferConcern
+  module Padding
+    # This module extends functionality the CryptBuffer to
+    # handle PKCS7 padding.
+    # It has the ability to detect, replace, add and strip a
+    # padding from a CryptBuffer to return a new one without
+    # mutating the existing buffer.
+    #
+    # The purpose is making crypto analysis of cbc and other
+    # cipher modes that use pkcs7 padding easier.
+
+    # Return any existing padding
+    def padding
+      last   = bytes.last
+      subset = subset_padding
+
+      if subset.all?{|e| e == last }
+        self.class.new(subset)
+      else
+        self.class.new([])
+      end
+    end
+
+    # Strip the existing padding if present
+    def strip_padding
+      subset = bytes
+      
+      if padding?
+        pad = padding
+        len = pad.length
+        subset = bytes[0,bytes.length - len]
+      end
+      self.class.new(subset)
+    end
+
+    
+    def padding?
+      !padding.empty?
+    end
+
+    # pad an existing buffer with the given amount of bytes
+    # If a padding already exists, replace: decides whether or not
+    # to replace it
+    def pad(n,replace: true)
+      if padding? && replace
+          strip_padding.pad(n)
+      else
+        pad = [n] * n
+        return CryptBuffer(bytes + pad )
+      end
+    end
+    
+    private
+    def subset_padding
+      last = bytes.last
+      return [] if last.nil?
+      # e.g. 5: take from -5,  5 elems
+      bytes[-1 * last, last]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crypto-toolbox
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dennis Sivia
@@ -52,10 +52,11 @@ files:
 - lib/crypto-toolbox/ciphers/caesar.rb
 - lib/crypto-toolbox/ciphers/rot13.rb
 - lib/crypto-toolbox/crypt_buffer.rb
+- lib/crypto-toolbox/crypt_buffer/concerns/arithmetic.rb
 - lib/crypto-toolbox/crypt_buffer/concerns/byte_expander.rb
-- lib/crypto-toolbox/crypt_buffer/concerns/byte_manipulation.rb
 - lib/crypto-toolbox/crypt_buffer/concerns/comparable.rb
 - lib/crypto-toolbox/crypt_buffer/concerns/convertable.rb
+- lib/crypto-toolbox/crypt_buffer/concerns/padding.rb
 - lib/crypto-toolbox/crypt_buffer/concerns/pretty_print.rb
 - lib/crypto-toolbox/crypt_buffer/concerns/xor.rb
 - lib/crypto-toolbox/key_filter.rb