ruby-aes-unroll1 1.0 → 1.1

data/lib/ruby-aes.rb

@@ -47,7 +47,7 @@ module Aes
 
     def Aes.check_key(key_string, kl = 128)
         kl = Aes.check_kl(kl)
-        k = key_string.length
+        k = key_string ? key_string.length : 0
         raise "Bad key string or bad key length" if (k != kl/8) && (k != kl/4)
         hex = (key_string =~ /[a-f0-9A-F]{#{k}}/) == 0 && (k == kl/4)
         bin = ! hex
@@ -131,8 +131,11 @@ module Aes
             sout << @@aes.encrypt_buffer(sin)
         when IO
             while buf = sin.read(@@bs)
-                sout << ((buf.length % 16).zero? ? @@aes.encrypt_blocks(buf) :
-                         @@aes.encrypt_buffer(buf))
+              if buf.length == @@bs
+                sout << @@aes.encrypt_blocks(buf)
+              else
+                sout << @@aes.encrypt_buffer(buf)
+              end
             end
         else
             raise "Bad input stream (String, IO)"
@@ -150,9 +153,12 @@ module Aes
         when String
             sout << @@aes.decrypt_buffer(sin)
         when IO
-            while buf = sin.read(@@bs)
-                sout << (sin.eof? ? @@aes.decrypt_buffer(buf) :
-                         @@aes.decrypt_blocks(buf))
+            while buf = sin.read(@@bs)#+1)
+              if buf.length == @@bs
+                sout << @@aes.decrypt_blocks(buf)
+              else
+                sout << @@aes.decrypt_buffer(buf)
+              end
             end
         else
             raise "Bad input stream (String, IO)"

data/test/test_helper.rb

@@ -3,8 +3,10 @@ require File.dirname(__FILE__) + '/../lib/ruby-aes'
 
 require 'fileutils'
 
-KEY_LENGTH = [128,192,256].freeze
-MODES = ['ECB','CBC','OFB','CFB'].freeze
+unless defined? KEY_LENGTH
+  KEY_LENGTH = [128,192,256].freeze
+  MODES = ['ECB','CBC','OFB','CFB'].freeze
+end
 
 def random_fill(n, buffer)
     n.times do

data/test/test_ruby-aes.rb

@@ -13,24 +13,28 @@ class TestRubyAES < Test::Unit::TestCase
       random_fill(16, @iv)
       @pt = ""
       random_fill(64, @pt)
-      @kl = KEY_LENGTH[(rand * KEY_LENGTH).to_i]
+      @kl = KEY_LENGTH[(rand * KEY_LENGTH.length).to_i]
       @mode = MODES[(rand * MODES.length).to_i]
   end
 
   def test_modes_and_key_lengths
+      pt = @pt[0...16]
       MODES.each do |mode|
           KEY_LENGTH.each do |kl|
-              ct = Aes.encrypt_block(kl, mode, @keys[kl], @iv, @pt)
+              ct = Aes.encrypt_block(kl, mode, @keys[kl], @iv, pt)
               npt = Aes.decrypt_block(kl, mode, @keys[kl], @iv, ct)
-              assert_equal(@pt, npt, "Error in encryption/decryption (#{kl}-#{mode})")
+              assert_equal(pt, npt, "Error in encryption/decryption (#{kl}-#{mode})")
           end
       end
   end
 
-  def test_encrypt_stream
+  def test_encrypt_decrypt_stream
       file = "_ruby-aes_test_encrypt_stream_"
       sin = File.open(file, "w+b")
       random_fill(4242, sin)
+      sin.close
+
+      sin = File.open(file, "rb")
       sout = File.open("#{file}.aes", "w+b")
       Aes.encrypt_stream(@kl, @mode, @keys[@kl], @iv, sin, sout)
       sin.close
@@ -42,18 +46,27 @@ class TestRubyAES < Test::Unit::TestCase
       sin.close
       sout.close
 
-      assert_equal IO.read(file), IO.read("#{file}.plain"),
-          "Error in encrypt_stream"
+      pt, npt = IO.read(file), IO.read("#{file}.plain")
+
+      assert_equal pt, npt, "Error in encrypt_decrypt_stream"
+  ensure
       FileUtils.rm_f [ file, "#{file}.aes", "#{file}.plain" ]
   end
 
-  def test_encrypt_buffer
+  def test_encrypt_decrypt_buffer
+      MODES.each do |mode|
+          KEY_LENGTH.each do |kl|
+            ct = Aes.encrypt_buffer(kl, mode, @keys[kl], @iv, @pt)
+            npt = Aes.decrypt_buffer(kl, mode, @keys[kl], @iv, ct)
+            assert_equal(@pt, npt, "Error in encrypt_decrypt_buffer")
+          end
+      end
       pt = ""
       42.times do
           pt << random_fill(1, pt)
           ct = Aes.encrypt_buffer(@kl, @mode, @keys[@kl], @iv, pt)
           npt = Aes.decrypt_buffer(@kl, @mode, @keys[@kl], @iv, ct)
-          assert_equal(pt, npt, "Error in encrypt buffer (padding)")
+          assert_equal(pt, npt, "Error in encrypt_decrypt_buffer")
       end
   end
 
@@ -79,19 +92,19 @@ class TestRubyAES < Test::Unit::TestCase
 
   def test_check_key
       assert_raise(RuntimeError) do
-          Aes.check_key(@key, 64)
+          Aes.check_key(@keys[128], 64)
       end # bad key length
       assert_raise(RuntimeError) do
           Aes.check_key('123', 128)
       end # bad key string
       assert_raise(RuntimeError) do
-          Aes.check_key(@key, 256)
+          Aes.check_key(nil, 256)
       end # bad key string
       assert_raise(RuntimeError) do
-          Aes.check_key(@key.unpack('H*'), 128)
+          Aes.check_key(@keys[128].unpack('H*'), 128)
       end # bad key string
       assert_nothing_raised do
-          Aes.check_key(@key, @kl)
+          Aes.check_key(@keys[@kl], @kl)
       end
   end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
+rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-aes-unroll1
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2007-08-01 00:00:00 +02:00
+  version: "1.1"
+date: 2008-01-05 00:00:00 +01:00
 summary: ruby-aes is an implementation of the Rijndael algorithm (AES)
 require_paths: 
 - lib
@@ -35,6 +35,13 @@ files:
 - Rakefile
 - doc/rdoc
 - doc/rdoc/files
+- doc/rdoc/files/lib
+- doc/rdoc/files/lib/ruby-aes_rb.html
+- doc/rdoc/files/lib/ruby-aes
+- doc/rdoc/files/lib/ruby-aes/aes_shared_rb.html
+- doc/rdoc/files/CHANGELOG.html
+- doc/rdoc/files/README.html
+- doc/rdoc/files/COPYING.html
 - doc/rdoc/index.html
 - doc/rdoc/rdoc-style.css
 - doc/rdoc/fr_method_index.html
@@ -42,25 +49,15 @@ files:
 - doc/rdoc/fr_file_index.html
 - doc/rdoc/created.rid
 - doc/rdoc/classes
-- doc/rdoc/files/lib
-- doc/rdoc/files/CHANGELOG.html
-- doc/rdoc/files/README.html
-- doc/rdoc/files/COPYING.html
-- doc/rdoc/files/lib/ruby-aes_rb.html
-- doc/rdoc/files/lib/ruby-aes
-- doc/rdoc/files/lib/ruby-aes/aes_cons_rb.html
-- doc/rdoc/files/lib/ruby-aes/aes_alg_rb.html
-- doc/rdoc/classes/AesAlg.html
 - doc/rdoc/classes/Aes.html
-- doc/rdoc/classes/AesCons.html
+- doc/rdoc/classes/AesShared.html
 - examples/encrypt_block.rb
 - examples/example_helper.rb
 - examples/encrypt_stream.rb
 - examples/encrypt_buffer.rb
 - lib/ruby-aes
+- lib/ruby-aes/aes_shared.rb
 - lib/ruby-aes.rb
-- lib/ruby-aes/aes_alg.rb
-- lib/ruby-aes/aes_cons.rb
 - test/test_ruby-aes.rb
 - test/test_helper.rb
 - test/KAT_MCT
@@ -69,6 +66,8 @@ files:
 - test/KAT_MCT/table.192
 - test/KAT_MCT/table.256
 - test/KAT_MCT/aes_kat_mct.rb
+- lib/ruby-aes/aes_alg.rb
+- lib/ruby-aes/aes_cons.rb
 test_files: 
 - test/test_ruby-aes.rb
 - test/test_helper.rb