crypto-toolbox 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5728516f47174d06b0901a72afa8a499ee5f0662
-  data.tar.gz: 9d83b1da078d82ba3345fb4b8aca1f860aaf1eb5
+  metadata.gz: df8683094fec6537792c932072ef5cbf704e9229
+  data.tar.gz: 675704384e2a84542f6dfba77a44dbdc09a52491
 SHA512:
-  metadata.gz: 21c9a10d814988c289b578850e1b769c817e086cd47a369578a01bdd8f5058ea6e1ef0573d311ab4ee6b3ee54f038ddc043475af83ae8f8a5112c02e126351af
-  data.tar.gz: 81601d2d3376c364ef5437b6d5af7c33bd4b3e47658eda3fa68a220439f4a6580fe0e20b3a6030909b9a52c89ad2e8026cb383dd7d2a7f6ebbd1eea84ee521c1
+  metadata.gz: 1a1a771fdfeecf30f4db5db4c814d609c98ce779fe823d37e59f1c48cb026d846affa615042128ad53ff8393eb48fc78d3fb17d703a8f8eeb290c60f89a53497
+  data.tar.gz: 3a5c2d78c13dac462077713ea4142a1a7bf280ea24e1b2ffc986ba1de190e0e6fd849b031069858d9316836ad990504db17999a74186ebc5a49178bb132622d2

data/lib/crypto-toolbox/crypt_buffer.rb

@@ -2,7 +2,9 @@ require 'aes'
 require 'openssl'
 require 'forwardable'
 
+
 require 'crypto-toolbox/crypt_buffer/concerns/arithmetic.rb'
+require 'crypto-toolbox/crypt_buffer/concerns/array.rb'
 require 'crypto-toolbox/crypt_buffer/concerns/byte_expander.rb'
 require 'crypto-toolbox/crypt_buffer/concerns/comparable.rb'
 require 'crypto-toolbox/crypt_buffer/concerns/convertable.rb'
@@ -13,8 +15,21 @@ require 'crypto-toolbox/crypt_buffer/concerns/xor.rb'
 
 class CryptBuffer
   class OutOfRangeError < RuntimeError; end
+  attr_accessor :bytes
+  alias_method :b, :bytes
+
   
+  include Enumerable
+  extend Forwardable
+  def_delegators :@bytes,:empty?,:include?, :length, :each, :^, :|, :&
+
+  # NOTE
+  # we need to include all the extensions after the regular delegate
+  # otherwise we are not able to overwrite methods like first/last
+  # which would result in the inability of casting the result to a
+  # new cryptbuffer instance, thus leaving the return value an array
   include CryptBufferConcern::Arithmetic
+  include CryptBufferConcern::Array
   include CryptBufferConcern::ByteExpander
   include CryptBufferConcern::Convertable
   include CryptBufferConcern::Comparable
@@ -23,14 +38,6 @@ class CryptBuffer
   include CryptBufferConcern::Random
   include CryptBufferConcern::Xor
 
-  
-  include Enumerable
-  extend Forwardable
-  def_delegators :@bytes, :[], :empty?,:include?, :each, :length
-
-  
-  attr_accessor :bytes
-  alias_method :b, :bytes
 
   
   def initialize(byte_array)

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

@@ -0,0 +1,26 @@
+module CryptBufferConcern
+  module Array
+    def +(other)
+      # make sure the input is a cryptbuffer
+      # Thus we support cryptbuffers and byte arrays
+      CryptBuffer(bytes + CryptBuffer(other).bytes)
+    end
+
+    def shift(n = 1)
+      CryptBuffer(bytes.shift(n))
+    end
+
+    def first(n = 1 )
+      CryptBuffer(bytes.first(n))
+    end
+    
+    def last(n = 1)
+      CryptBuffer(bytes.last(n))
+    end
+
+    def [](anything)
+      CryptBuffer(bytes[anything])
+    end
+
+  end
+end

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

@@ -29,3 +29,18 @@ module CryptBufferConcern
     end
   end
 end
+
+module CryptBufferConcern
+  module TypeExtension
+    def to_crypt_buffer
+      CryptBuffer(self)
+    end
+  end
+end
+
+String.send(:include, CryptBufferConcern::TypeExtension)
+Fixnum.send(:include, CryptBufferConcern::TypeExtension)
+ Array.send(:include, CryptBufferConcern::TypeExtension)
+
+
+

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

@@ -20,7 +20,7 @@ module CryptBufferConcern
       def generate_bytes(n,seed)
         prg = ::Random.new(seed)
 
-        Array.new(n.to_i) { prg.rand 256 }
+        ::Array.new(n.to_i) { prg.rand 256 }
       end
     end
 

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

@@ -2,12 +2,12 @@ module CryptBufferConcern
   module Xor
     def xor_at(input,pos)
       return self if input.nil? || (pos.abs > length)
-      
-      case input
-      when Array
+
+      case input.respond_to?(:to_ary)
+      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) : b }
+        tmp = bytes.map.with_index{|b,i| i == pos ? xor_multiple(b,input.to_ary) : b }
         CryptBuffer(tmp)
       else
         tmp = bytes

data/lib/crypto-toolbox/crypt_buffer_input_converter.rb

@@ -27,6 +27,8 @@ class CryptBufferInputConverter
       input.b
     when Fixnum
       int2bytes(input)
+    when NilClass
+      []
     else
       raise "Unsupported input: #{input.inspect} of class #{input.class}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crypto-toolbox
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Dennis Sivia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aes
@@ -65,6 +65,7 @@ files:
 - 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/array.rb
 - lib/crypto-toolbox/crypt_buffer/concerns/byte_expander.rb
 - lib/crypto-toolbox/crypt_buffer/concerns/comparable.rb
 - lib/crypto-toolbox/crypt_buffer/concerns/convertable.rb