aes 0.4.0 → 0.5.0

data/Gemfile

@@ -6,8 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "shoulda"
+  gem "bundler" 
+  gem "jeweler" 
+  gem "simplecov"
 end

data/README.rdoc

@@ -33,6 +33,21 @@ Usage:
  AES.decrypt(plain, key, {:format => :plain})
   => "A super secret message" 
 
+ # By default data is padded to the nearest 16 bytes block.  To turn
+ # this off, you may use the :padding => false (or nil) option.
+ #
+ # In this mode however, the caller is required to pad the data.  In
+ # the following example the message is exactly 16 bytes long, so no
+ # error aries.
+ msg = AES.encrypt("A secret message", key, {:padding => false})
+  => "SnD+WIfEfjZRrl+WAM/9pw==$89sGGZsu973j8Gl6aXC8Uw=="
+
+ # Be sure to pass the same padding option when decrypting the
+ # message, as it will fail if you try to decrypt unpadded data and
+ # didn't specify :padding => false.
+ AES.decrypt(msg, key, {:padding => false})
+  => "A secret message"
+
 == Contributing to aes
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -34,16 +34,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/aes.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{aes}
-  s.version = "0.4.0"
+  s.name = "aes"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carl Hicks"]
-  s.date = %q{2011-01-03}
-  s.description = %q{An AES encrypt/decrypt gem built ontop of OpenSSL.  Not as quick as FastAES, but it doesn't require building
-    native extensions and supports Base64 encoded input and output.}
-  s.email = %q{carl.hicks@gmail.com}
+  s.date = "2012-05-01"
+  s.description = "An AES encrypt/decrypt gem built ontop of OpenSSL.  Not as quick as FastAES, but it doesn't require building\n    native extensions and supports Base64 encoded input and output."
+  s.email = "carl.hicks@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -30,36 +29,31 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_aes.rb"
   ]
-  s.homepage = %q{http://github.com/chicks/aes}
+  s.homepage = "http://github.com/chicks/aes"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{AES#encrypt(key, data), AES#decrypt(key, data). Capiche?}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_aes.rb"
-  ]
+  s.rubygems_version = "1.8.12"
+  s.summary = "AES#encrypt(key, data), AES#decrypt(key, data). Capiche?"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/lib/aes/aes.rb

@@ -122,11 +122,13 @@ module AES
       # Merge init options with defaults
       def merge_options(opts)
         @options = {
-          :format => :base_64,
-          :cipher => "AES-256-CBC",
-          :iv     => nil,
+          :format  => :base_64,
+          :cipher  => "AES-256-CBC",
+          :iv      => nil,
+          :padding => true, # use cipher padding by default
         }.merge! opts
         _handle_iv
+        _handle_padding
       end
       
       def _handle_iv
@@ -139,12 +141,18 @@ module AES
         end
       end
       
+      def _handle_padding
+        # convert value to what OpenSSL module format expects
+        @options[:padding] = @options[:padding] ? 1 : 0
+      end
+      
       # Create a new cipher using the cipher type specified
       def _setup(action)
         @cipher ||= OpenSSL::Cipher::Cipher.new(@options[:cipher]) 
         # Toggles encryption mode
         @cipher.send(action)
+        @cipher.padding = @options[:padding]
         @cipher.key = @key.unpack('a2'*32).map{|x| x.hex}.pack('c'*32)
       end
   end
-end
+end

data/test/test_aes.rb

@@ -19,6 +19,17 @@ class TestAES < Test::Unit::TestCase
     enc2 = AES.encrypt(msg, key, {:iv => iv})
     assert_equal enc1, enc2
   end
+    
+  should "handle padding option" do
+    key = "01234567890123456789012345678901"
+    msg = "This is a message that nobody should ever see"
+    # unpadded message length should be a multiple of cipher block
+    # length (16 bytes)
+    msg += " "*(16 - (msg.length % 16))
+
+    enc = AES.encrypt(msg, key, {:padding => false})
+    assert_equal msg, AES.decrypt(enc, key, {:padding => false})
+  end
   
   should "generate a new key when AES#key" do
     assert_equal 32, AES.key.length

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: aes
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - Carl Hicks
@@ -15,69 +10,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -08:00
-default_executable: 
+date: 2012-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: shoulda
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :development
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :development
   prerelease: false
-  name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id004
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: |-
   An AES encrypt/decrypt gem built ontop of OpenSSL.  Not as quick as FastAES, but it doesn't require building
       native extensions and supports Base64 encoded input and output.
@@ -101,7 +79,6 @@ files:
 - lib/aes/aes.rb
 - test/helper.rb
 - test/test_aes.rb
-has_rdoc: true
 homepage: http://github.com/chicks/aes
 licenses: 
 - MIT
@@ -115,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4067267818170155209
       segments: 
       - 0
       version: "0"
@@ -124,17 +101,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: AES#encrypt(key, data), AES#decrypt(key, data). Capiche?
-test_files: 
-- test/helper.rb
-- test/test_aes.rb
+test_files: []
+