ruby-aes-cext 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/lib/ruby-aes/aes_shared.rb

@@ -0,0 +1,77 @@
+=begin
+    This file is a part of ruby-aes <http://rubyforge.org/projects/ruby-aes>
+    Written by Alex Boussinet <alex.boussinet@gmail.com>
+
+    It contains the code shared by all the implementations
+=end
+
+module AesShared
+    def encrypt_blocks(buffer)
+        raise "Bad block length" unless (buffer.length % 16).zero?
+        ct = ""
+        block = ""
+        buffer.each_byte do |char|
+            block << char
+            if block.length == 16
+                ct << encrypt_block(block)
+                block = ""
+            end
+        end
+        ct
+    end
+
+    def decrypt_blocks(buffer)
+        raise "Bad block length" unless (buffer.length % 16).zero?
+        pt = ""
+        block = ""
+        buffer.each_byte do |char|
+            block << char
+            if block.length == 16
+                pt << decrypt_block(block)
+                block = ""
+            end
+        end
+        pt
+    end
+
+    def encrypt_buffer(buffer)
+        ct = ""
+        block = ""
+        buffer.each_byte do |char|
+            block << char
+            if block.length == 16
+                ct << encrypt_block(block)
+                block = ""
+            end
+        end
+        c = "\000"
+        if (m = 16 - block.length % 16) != 16
+            c = m.chr
+            ct << encrypt_block(block << c * m)
+        end
+        ct << c
+    end
+
+    def decrypt_buffer(buffer)
+        pt = ""
+        block = ""
+        buffer.each_byte do |char|
+            block << char
+            if block.length == 16
+                pt << decrypt_block(block)
+                block = ""
+            end
+        end
+        if block.length != 1
+            raise 'Bad Block Padding'
+        elsif (c = block[-1]).zero?
+            pt
+        else
+            if block * c == pt[-c..-1]
+                pt[0..-c-1]
+            else
+                raise "Bad Block Padding"
+            end
+        end
+    end
+end

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-cext
 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
@@ -36,6 +36,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
@@ -43,17 +50,14 @@ 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/classes/Aes.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
 - test/test_ruby-aes.rb
 - test/test_helper.rb
@@ -63,9 +67,9 @@ files:
 - test/KAT_MCT/table.192
 - test/KAT_MCT/table.256
 - test/KAT_MCT/aes_kat_mct.rb
-- ext/ruby-aes/aes_gencons.rb
-- ext/ruby-aes/extconf.rb
 - ext/ruby-aes/aes_alg.c
+- ext/ruby-aes/extconf.rb
+- ext/ruby-aes/aes_cons.h
 test_files: 
 - test/test_ruby-aes.rb
 - test/test_helper.rb

data/ext/ruby-aes/aes_gencons.rb

@@ -1,118 +0,0 @@
-#!/usr/bin/env ruby
-
-=begin
-    This file is a part of ruby-aes <http://rubyforge.org/projects/ruby-aes>
-    Written by Alex Boussinet <alex.boussinet@gmail.com>
-
-    This script generates the constant arrays needed by ruby-aes
-=end
-
-module AesCons
-
-    ALOG = []
-    LOG = []
-    j = 1
-    256.times do |i|
-        ALOG[i] = ALOG[i+255] = j
-        LOG[j] = i
-        j = (j ^ (j << 1) ^ (j & 0x80 != 0 ? 0x01b : 0)) & 0xff
-    end
-    LOG[1] = 0
-
-    def self.mul(a, b)
-        (a.zero? || b.zero?) ? 0 : ALOG[LOG[a] + LOG[b]]
-    end
-
-    RCON = []
-    j = 1
-    10.times do |i|
-        RCON[i] = j << 24 & 0xff000000
-        j = mul(2, j)
-    end
-
-    S = []
-    Si = []
-    256.times do |i|
-        x = (i != 0) ? ALOG[255 - LOG[i]] : 0
-        x ^= (x << 1) ^ (x << 2) ^ (x << 3) ^ (x << 4)
-        x = 0x63 ^ (x ^ (x >> 8))
-        S[i] = x & 0xff
-        Si[x & 0xff] = i
-    end
-
-    def self.mul4(a, b)
-        return 0 if (a.zero?)
-        a = LOG[a & 0xFF]
-        a0 = (b[0] != 0) ? ALOG[(a + LOG[b[0] & 0xff]) % 255] & 0xff : 0
-        a1 = (b[1] != 0) ? ALOG[(a + LOG[b[1] & 0xff]) % 255] & 0xff : 0
-        a2 = (b[2] != 0) ? ALOG[(a + LOG[b[2] & 0xff]) % 255] & 0xff : 0
-        a3 = (b[3] != 0) ? ALOG[(a + LOG[b[3] & 0xff]) % 255] & 0xff : 0
-        return a0 << 24 | a1 << 16 | a2 << 8 | a3
-    end
-
-    G = [
-        [2, 1, 1, 3],[3, 2, 1, 1],[1, 3, 2, 1],[1, 1, 3, 2],
-        [0, 0, 0, 1],[0, 0, 1, 0],[0, 1, 0, 0],[1, 0, 0, 0]
-    ]
-    Gi = [
-        [14, 9, 13, 11], [11, 14, 9, 13], [13, 11, 14, 9],[9, 13, 11, 14],
-        [0, 0, 0, 1],[0, 0, 1, 0],[0, 1, 0, 0],[1, 0, 0, 0]
-    ]
-    Te0, Te1, Te2, Te3 = [], [], [], []
-    S0, S1, S2, S3 = [], [], [], []
-    Td0, Td1, Td2, Td3 = [], [], [], []
-    Si0, Si1, Si2, Si3 = [], [], [], []
-    256.times do |t|
-        s = S[t]
-        Te0[t] = mul4(s, G[0])
-        Te1[t] = mul4(s, G[1])
-        Te2[t] = mul4(s, G[2])
-        Te3[t] = mul4(s, G[3])
-        S0[t]  = mul4(s, G[4])
-        S1[t]  = mul4(s, G[5])
-        S2[t]  = mul4(s, G[6])
-        S3[t]  = mul4(s, G[7])
-        s = Si[t]
-        Td0[t] = mul4(s, Gi[0])
-        Td1[t] = mul4(s, Gi[1])
-        Td2[t] = mul4(s, Gi[2])
-        Td3[t] = mul4(s, Gi[3])
-        Si0[t] = mul4(s, Gi[4])
-        Si1[t] = mul4(s, Gi[5])
-        Si2[t] = mul4(s, Gi[6])
-        Si3[t] = mul4(s, Gi[7])
-    end
-
-    File.open("aes_cons.h" , "w+") do |f|
-        f.write <<-STOP
-/*
- *  This file is a part of ruby-aes <http://rubyforge.org/projects/ruby-aes>
- *  Written by Alex Boussinet <alex.boussinet@gmail.com>
- *
- *  aes_cons.h - AES Constant Arrays for ruby-aes
- */
-
-#ifndef __AES_CONS__
-#define __AES_CONS__
-
-STOP
-        ["RCON", "Te0", "Te1", "Te2", "Te3", "S0", "S1", "S2", "S3",
-            "Td0", "Td1", "Td2", "Td3", "Si0", "Si1", "Si2", "Si3"].each do |x|
-            f.write "uint    " + x + "[] = {\n"
-            line = " " * 4
-            module_eval(x).each do |y|
-                z = "0x%08x" % y
-                line << ", " if line.length > 4
-                if (line.length + z.length) > 79
-                    f.write line.chop + "\n"
-                    line = " " * 4
-                end
-                line << z
-            end
-            f.write line unless line.length == 4
-            f.write "\n};\n\n"
-            end
-        f.write "#endif\n"
-    end
-
-end # AesCons