twofish 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e25f6d79c9cb7b9c02f0ea6d36596d1a2bdc2487
+  data.tar.gz: a7378fc5f9e8edce9a78a65a8cdd13ffecd18385
+SHA512:
+  metadata.gz: 93088141b06171d957c18a1c0ba445c6c97c31dfeff9560c38d6def58ec7289a913b559cbdeffdccf92984704278d4391f1f8cd2fbeacb3de2253e7d4f4ffcdd
+  data.tar.gz: 42e5318a058a37cacc94f999e58570cc237d77ea7a4869a8290a25e4a6056cc684e431a2089987a4a30c40e4465bd38ef70ce7c1cd19efa4ab5550867545b146

data/README.rdoc

@@ -112,11 +112,14 @@ Ruby >=1.9 introduces string encodings. The current workaround uses
 #ord and #chr but this is not very satisfactory: it would be preferable
 to move to byte arrays throughout.
 
-The only padding mechanisms implemented are "none" (don't pad) and "zero
-byte" (append zero bytes to make up a full block). Zero byte padding has
-a well-known failure mode: if the plaintext terminates in null bytes
+The only padding mechanisms implemented are "none", zero byte, and
+ISO 10126-2. PKCS#5/7 padding is not implemented.  Zero byte padding
+has a well-known failure mode: if the plaintext terminates in null bytes
 then these may be erroneously removed when un-padding is performed.
 
+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.

data/Rakefile

@@ -31,6 +31,7 @@ RDoc::Task.new do |rdoc|
   rdoc.title = 'twofish.rb'
   rdoc.options << '--line-numbers'
   rdoc.options << '--charset' << 'utf-8'
+  rdoc.options << '--main' << 'README.rdoc'
   rdoc.options << '--all'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include(Dir[ 'lib/**/*' ])

data/lib/twofish.rb

@@ -301,7 +301,7 @@ class Twofish
   # hash as follows:
   #   :mode => :ecb (default) or :cbc
   #   :iv => optional 16 byte initialization vector (randomly generated if not supplied)
-  #   :padding => :none (default) or :zero_byte
+  #   :padding => :none (default), :zero_byte or :iso10126_2
   def initialize(key_string, opts={})
 
     self.mode = opts[:mode] # use setter for validation
@@ -455,8 +455,8 @@ class Twofish
   end
 
   # Set the padding scheme for the (CBC mode) cipher
-  # (Padding::NONE == :none or Padding::ZERO_BYTE ==
-  # :zero_byte).
+  # (Padding::NONE == :none, Padding::ZERO_BYTE ==
+  # :zero_byte, Padding::ISO10126_2 == :iso10126_2).
   def padding=(scheme)
     @padding = Padding.validate(scheme)
   end

data/lib/twofish/padding.rb

@@ -17,8 +17,11 @@ class Twofish
     # Use zero byte padding.
     ZERO_BYTE = :zero_byte
 
+    # Use ISO 10126-2 padding.
+    ISO10126_2 = :iso10126_2
+
     # Array of all known paddings.
-    ALL = [ NONE, ZERO_BYTE ]
+    ALL = [ NONE, ZERO_BYTE, ISO10126_2 ]
 
     # Default padding (none).
     DEFAULT = NONE
@@ -50,6 +53,13 @@ class Twofish
         plaintext
       when ZERO_BYTE
         remainder.zero? ? plaintext : plaintext << "\0" * (block_size - remainder)
+      when ISO10126_2
+          number_of_pad_bytes = block_size - remainder
+          # Create random bytes
+          bytes = Array.new(number_of_pad_bytes - 1) {rand(256)}
+          # The last byte specify the total pad byte size
+          bytes << number_of_pad_bytes
+          plaintext << bytes.pack("C*")
       end
     end
 
@@ -66,9 +76,11 @@ class Twofish
         plaintext.dup
       when ZERO_BYTE
         plaintext.sub(/\000+\Z/, '')
+      when ISO10126_2
+        number_of_pad_bytes = plaintext.bytes.to_a[plaintext.length-1]
+        plaintext[0, (plaintext.length - number_of_pad_bytes)]
       end
     end
-
   end
 
 end

data/test/test_twofish.rb

@@ -277,6 +277,17 @@ class TestPadding < TestBasics
     assert_equal(:zero_byte, tf.padding)
   end
 
+  def test_cipher_iso10126_2_padding
+    tf = Twofish.new(NULL_KEY_16_BYTES)
+    tf.padding = :iso10126_2
+    assert_equal(:iso10126_2, tf.padding)
+  end
+
+  def test_cipher_iso10126_2_padding_constructor
+    tf = Twofish.new(NULL_KEY_16_BYTES, :padding => :iso10126_2)
+    assert_equal(:iso10126_2, tf.padding)
+  end
+
   def test_cipher_unknown_padding
     tf = Twofish.new(NULL_KEY_16_BYTES)
     assert_raise ArgumentError do
@@ -316,4 +327,25 @@ class TestPadding < TestBasics
     to_pad = TO_PAD * BLOCK_SIZE
     assert_equal(to_pad, Twofish::Padding::pad(to_pad, BLOCK_SIZE, :zero_byte))
   end
+
+  def test_pad_iso10126_2
+    padded_text = Twofish::Padding::pad(TO_PAD, BLOCK_SIZE, :iso10126_2)
+    assert_match(/\A#{TO_PAD}/, padded_text)
+    assert_equal(TO_PAD.length + 10, padded_text.length)
+  end
+
+  def test_unpad_iso10126_2
+    bytes = Array.new(10 - 1) {rand(256)}
+    bytes << 10
+    assert_equal(TO_PAD, Twofish::Padding::unpad(TO_PAD+bytes.pack("C*"), BLOCK_SIZE, :iso10126_2))
+  end
+
+  def test_pad_unpad_block_size_iso10126_2
+    to_pad = TO_PAD * BLOCK_SIZE
+    padded_text = Twofish::Padding::pad(to_pad, BLOCK_SIZE, :iso10126_2)
+    assert_equal(to_pad.length + BLOCK_SIZE, padded_text.length)
+    assert_match(/\A#{to_pad}/, padded_text)
+    assert_equal(to_pad, Twofish::Padding::unpad(padded_text, BLOCK_SIZE, :iso10126_2))
+  end
+
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twofish
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Martin Carpenter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2013-10-28 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
@@ -33,27 +32,26 @@ files:
 homepage: http://mcarpenter.org/projects/twofish
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Twofish symmetric cipher in pure Ruby
 test_files:
 - test/test_twofish.rb