twofish 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9160fa2fe6f0007b1e73557465ba662b23e3949
-  data.tar.gz: 7baca819819c90a0f0322966d56198fad0bc1cf5
+  metadata.gz: 00b2bbf43d9b32ff9b0e8eed4a21195deba38bd7
+  data.tar.gz: 6b23d440cb0cac34cbba9c37062ab51ce168b4f3
 SHA512:
-  metadata.gz: eec83be529fbc82970ec9d2c3ccbe19e156058d850f596237254c7dbefa18e5c478415c9d9351c6e0f8e0bc3bfa3f00f73bf617020c12e6fcc56f23f1bbb03ab
-  data.tar.gz: bd3f3529f3093bc3020a728775383dca129b5496f459b4d375aca6467959dd0654d6f4d375a4bd816ff0f04f7c6419942e8a4ef95252a8d778d59dc6458ec8c2
+  metadata.gz: f591af29855dce80ccd4f922f146a5ad7bb43cd1b3eba07826f34df0e3ebf605f680eeea7d690538cb5ca9c11e5473355040a103ec1e25d15e1387821309381e
+  data.tar.gz: 81a586774968b3511354de8979944949e55232d470cd033a2190fdf2b622a7524eefcd7e710fb4f0bc69d62fe503eb8b61980b14b048e1d4e0d74b6c240e6fc1

data/README.rdoc

@@ -115,10 +115,6 @@ to move to byte arrays throughout.
 Possible implementation-dependent timing attacks (Bignum promotion,
 #pack(), ...).
 
-If no initialization vector is provided for CBC mode then the system
-random number generator (Kernel#rand) is used to generate one. The system
-random number generator may be weaker than desired.
-
 The IV is not silently prepended to the ciphertext since if
 the resulting ciphertext is transmitted as is this can introduce
 a weakness. IV should ideally be transmitted OOB. There

data/lib/twofish.rb

@@ -8,6 +8,7 @@
 # encryption algorithm based on original work by Guido Flohr.
 class Twofish
 
+  require 'securerandom'
   require 'string' # monkey patch for MRI 1.8.7
   require 'twofish/mode'
   require 'twofish/padding'
@@ -306,7 +307,7 @@ class Twofish
 
     self.mode = opts[:mode] # use setter for validation
     self.padding = opts[:padding] # use setter for validation
-    @iv = opts[:iv] || generate_iv(BLOCK_SIZE) unless @mode == Mode::ECB
+    @iv = opts[:iv] || SecureRandom.random_bytes(BLOCK_SIZE) unless @mode == Mode::ECB
 
     # The key consists of k=len/8 (2, 3 or 4) 64-bit units.
     key = key_string.unpack("C*")
@@ -474,13 +475,13 @@ class Twofish
     padded_plaintext = Padding.pad!(plaintext, BLOCK_SIZE, @padding)
     result = ''.force_encoding('ASCII-8BIT')
     if @mode == Mode::CBC
-      @iv = generate_iv(BLOCK_SIZE) unless @iv
-      ciphertext_block = @iv
+      @iv ||= SecureRandom.random_bytes(BLOCK_SIZE)
+      @_feedback ||= @iv
     end
     (0...padded_plaintext.length).step(BLOCK_SIZE) do |block_ptr|
       plaintext_block = padded_plaintext[block_ptr, BLOCK_SIZE]
-      xor_block!(plaintext_block, ciphertext_block) if Mode::CBC == @mode
-      result << ciphertext_block = encrypt_block(plaintext_block)
+      xor_block!(plaintext_block, @_feedback) if Mode::CBC == @mode
+      result << @_feedback = encrypt_block(plaintext_block)
     end
     result
   end
@@ -494,22 +495,27 @@ class Twofish
     result = ''.force_encoding('ASCII-8BIT')
     if Mode::CBC == @mode
       if @iv
-        feedback = @iv
+        @_feedback ||= @iv
       else
-        feedback = ciphertext[0, BLOCK_SIZE]
+        @_feedback ||= ciphertext[0, BLOCK_SIZE]
         ciphertext = ciphertext[BLOCK_SIZE..-1]
       end
     end
     (0...ciphertext.length).step(BLOCK_SIZE) do |block_ptr|
       ciphertext_block = ciphertext[block_ptr, BLOCK_SIZE]
       plaintext_block = decrypt_block(ciphertext_block)
-      xor_block!(plaintext_block, feedback) if Mode::CBC == @mode
+      xor_block!(plaintext_block, @_feedback) if Mode::CBC == @mode
       result << plaintext_block
-      feedback = ciphertext_block
+      @_feedback = ciphertext_block
     end
     Padding.unpad!(result, BLOCK_SIZE, @padding)
   end
 
+  # Reset the cipher state (for feedback modes).
+  def reset!
+    @_feedback = nil
+  end
+
   # Exclusive-or two blocks together, byte-by-byte, storing the result
   # in the first block.
   def xor_block!(target, source)
@@ -1098,13 +1104,5 @@ private
     [b >> 24, b >> 16 & 0xff, b >> 8 & 0xff, b & 0xff]
   end
 
-  # Generates a random initialization vector of the given length.
-  # Warning: use Ruby standard library Kernel#rand.
-  def generate_iv(block_size)
-    Array.new(block_size).
-      map{ |x| rand(256) }.
-      pack("C#{block_size}") # defaults to ASCII-8BIT encoding
-  end
-
 end
 

data/test/test_twofish.rb

@@ -135,13 +135,8 @@ end
 # Test the Cipher Block Chaining mode.
 class TestCbcEncryption < TestBasics
 
-  #                 123456781234567812345678123456781234567812
- #LONG_PLAINTEXT = 'this message is longer than the block size'
- #LONG_CIPHERTEXT = ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'].pack('H*')
- #KEY = ['5d9d4eeffa9151575524f115815a12e0'].pack('H*')
- #IV = ['e75449212beef9f4a390bd860a640941'].pack('H*')
-  LONG_PLAINTEXT = ("\0"*32).freeze
-  LONG_CIPHERTEXT = ['9f589f5cf6122c32b6bfec2f2ae8c35ad491db16e7b1c39e86cb086b789f5419'].pack('H*').freeze
+  LONG_PLAINTEXT = ("\0"*64).freeze
+  LONG_CIPHERTEXT = ['9f589f5cf6122c32b6bfec2f2ae8c35ad491db16e7b1c39e86cb086b789f541905ef8c61a811582634ba5cb7106aa6416748d17e67848a7ac57a1033d3dcef56'].pack('H*').freeze
 
   def test_encryption_decryption_random_iv
     tf = Twofish.new(NULL_KEY_16_BYTES, :mode => :cbc)
@@ -175,6 +170,26 @@ class TestCbcEncryption < TestBasics
     assert_equal(plaintext, tf2.decrypt(ciphertext))
   end
 
+  def test_reset
+    tf = Twofish.new(NULL_KEY_16_BYTES, :mode => :cbc, :padding => :pkcs7)
+    iv = tf.iv
+    ciphertext = tf.encrypt(LONG_PLAINTEXT)
+    assert_not_equal(LONG_PLAINTEXT, tf.decrypt(ciphertext))
+    tf.reset!
+    assert_equal(iv, tf.iv)
+    assert_equal(LONG_PLAINTEXT, tf.decrypt(ciphertext))
+  end
+
+  def test_incremental
+    key = ['9f589f5cf6122c32b6bfec2f2ae8c35a'].pack('H*').freeze
+    iv = ['a74f3ed9a33ca158f3d09a629f9b26ba'].pack('H*').freeze
+    data = %w{ abcdefghijklmnop qrstuvwxyz123456 }
+    tf = Twofish.new(key, :iv => iv, :mode => :cbc)
+    result = data.inject('') { |ciphertext, block| ciphertext << tf.encrypt(block) }
+    assert_equal(["e14d0f030aa843b14b616928a1c18e8b76c008aa27015dd21bb747a18715172a"].pack('H*'),
+                 result)
+  end
+
 end
 
 class TestInitializationVector < TestBasics

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twofish
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Martin Carpenter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies: []
 description: Twofish symmetric cipher in pure Ruby with ECB and CBC cipher modes derived
   from an original Perl implementation by Guido Flohr