symmetric-encryption 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231447a49387dc528e881059bf00023b1103cd42
-  data.tar.gz: 6d3e9212d2925e2e93aa62d1e7ec998ca79992c2
+  metadata.gz: ac5f1b64a033b9aa7bd5b9dc2966318dab30609c
+  data.tar.gz: a5a010ede4476c92caab94fc5f7f697b8bd38395
 SHA512:
-  metadata.gz: 3b824fdb557f6df9b9354e3706a6da0e3c04a9754f0b231c0ef1233e1423057bf0fb94ba1ceb4643bea3dec95b0cf595e85fc19f023b94585d8764a7c81b617a
-  data.tar.gz: e602a1f3d44bec6575d43f69d975a6764d73faba374cb2b744c5e1aaa2744fda7bec2d028a9a525128f5e2fb0b3390b4256b2916d3b98faa6aad63a5565bd962
+  metadata.gz: 2d003387010b20ee1f61d59165982d54a26cc70d1bb95859215a156b3be65b5c1c2ccb59b43add0b85424b2a1f21a99a76e62405cf9375e2542880e56b9e8d58
+  data.tar.gz: 8b18f43416c1e8c6c5d30cba207727bc2ae29e17eb48cc264f53fbe1a37dee37e5b4fbe9cccd73f9a5ae6ec5482045f58c8415f0a37d247a81b63f6d4f5eaa37

data/Gemfile

@@ -3,15 +3,15 @@ source :rubygems
 group :test do
   gem "shoulda"
 
-  gem "activerecord"
-  platforms :ruby do
-    gem 'sqlite3'
-  end
+  # Limited to Rails 3.2.x only because of Mongoid dependency below
+  # If Mongoid Appender is not used, Rails 4 should work fine
+  gem "activerecord", "~> 3.2.0"
+  gem 'sqlite3', :platform => :ruby
 
   platforms :jruby do
     gem 'jdbc-sqlite3'
     gem 'activerecord-jdbcsqlite3-adapter'
   end
 
-  gem "mongoid"
+  gem "mongoid", "~> 3.1.0"
 end

data/Gemfile.lock

@@ -13,28 +13,22 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
     builder (3.0.4)
     i18n (0.6.1)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    mongoid (3.1.3)
+    mongoid (3.1.4)
       activemodel (~> 3.2)
-      moped (~> 1.4.2)
+      moped (~> 1.4)
       origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    moped (1.4.5)
-    multi_json (1.7.2)
-    origin (1.0.11)
-    shoulda (3.4.0)
+    moped (1.5.0)
+    multi_json (1.7.7)
+    origin (1.1.0)
+    shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.1)
-    shoulda-matchers (1.5.6)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.4)
+    shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.3)
     sqlite3 (1.3.7)
     tzinfo (0.3.37)
 
@@ -42,9 +36,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
+  activerecord (~> 3.2.0)
   activerecord-jdbcsqlite3-adapter
   jdbc-sqlite3
-  mongoid
+  mongoid (~> 3.1.0)
   shoulda
   sqlite3

data/lib/symmetric_encryption/symmetric_encryption.rb

@@ -245,6 +245,7 @@ module SymmetricEncryption
       cfg[:key]          = symmetric_key
       cfg[:iv]           = config['iv'] || config['symmetric_iv']
       cfg[:cipher_name]  = default_cipher
+      cfg[:version]      = config['version']
 
     elsif ciphers = config['ciphers']
       raise "Missing mandatory config parameter 'private_rsa_key'" unless cfg[:private_rsa_key] = config['private_rsa_key']
@@ -296,7 +297,7 @@ module SymmetricEncryption
     # Load Encrypted Symmetric keys
     key_filename =  cipher_conf[:key_filename]
     encrypted_key = begin
-      File.read(key_filename)
+      File.read(key_filename, :open_args => ['rb'])
     rescue Errno::ENOENT
       puts "\nSymmetric Encryption key file: '#{key_filename}' not found or readable."
       puts "To generate the keys for the first time run: rails generate symmetric_encryption:new_keys\n\n"
@@ -305,7 +306,7 @@ module SymmetricEncryption
 
     iv_filename =  cipher_conf[:iv_filename]
     encrypted_iv = begin
-      File.read(iv_filename) if iv_filename
+      File.read(iv_filename, :open_args => ['rb']) if iv_filename
     rescue Errno::ENOENT
       puts "\nSymmetric Encryption initialization vector file: '#{iv_filename}' not found or readable."
       puts "To generate the keys for the first time run: rails generate symmetric_encryption:new_keys\n\n"

data/lib/symmetric_encryption/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SymmetricEncryption #:nodoc
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/test/config/symmetric-encryption.yml

@@ -36,16 +36,16 @@ test:
 
   ciphers:
     # Current / Newest Symmetric Encryption Key
-    - key_filename: /Users/rmorrison/Sandbox/symmetric-encryption/test/config/test_new.key
-      iv_filename:  /Users/rmorrison/Sandbox/symmetric-encryption/test/config/test_new.iv
+    - key_filename: test/config/test_new.key
+      iv_filename:  test/config/test_new.iv
       cipher_name:  aes-128-cbc
       # Base64 encode encrypted data without newlines
       encoding:     base64strict
       version:      1
 
     # Previous Symmetric Encryption Key
-    - key_filename: /Users/rmorrison/Sandbox/symmetric-encryption/test/config/test_secondary_1.key
-      iv_filename:  /Users/rmorrison/Sandbox/symmetric-encryption/test/config/test_secondary_1.iv
+    - key_filename: test/config/test_secondary_1.key
+      iv_filename:  test/config/test_secondary_1.iv
       cipher_name:  aes-128-cbc
       # Base64 encode encrypted data without newlines
       encoding:     base64

data/test/reader_test.rb

@@ -113,7 +113,7 @@ class ReaderTest < Test::Unit::TestCase
             when :data
               # Create encrypted file
               @eof = false
-              @filename = '._test'
+              @filename = '_test'
               @header = (options[:header] != false)
               SymmetricEncryption::Writer.open(@filename, options) do |file|
                 @data.inject(0) {|sum,str| sum + file.write(str)}
@@ -121,7 +121,7 @@ class ReaderTest < Test::Unit::TestCase
             when :empty
               @data_str = ''
               @eof = true
-              @filename = '._test_empty'
+              @filename = '_test_empty'
               @header = (options[:header] != false)
               SymmetricEncryption::Writer.open(@filename, options) do |file|
                 # Leave data portion empty
@@ -244,7 +244,7 @@ class ReaderTest < Test::Unit::TestCase
 
     context "reading from files with previous keys" do
       setup do
-        @filename = '._test'
+        @filename = '_test'
         # Create encrypted file with old encryption key
         SymmetricEncryption::Writer.open(@filename, :version => 0) do |file|
           @data.inject(0) {|sum,str| sum + file.write(str)}
@@ -282,7 +282,7 @@ class ReaderTest < Test::Unit::TestCase
 
     context "reading from files with previous keys without a header" do
       setup do
-        @filename = '._test'
+        @filename = '_test'
         # Create encrypted file with old encryption key
         SymmetricEncryption::Writer.open(@filename, :version => 0, :header => false, :random_key => false) do |file|
           @data.inject(0) {|sum,str| sum + file.write(str)}
@@ -290,7 +290,11 @@ class ReaderTest < Test::Unit::TestCase
       end
 
       teardown do
-        File.delete(@filename) if File.exist?(@filename)
+        begin
+          File.delete(@filename) if File.exist?(@filename)
+        rescue Errno::EACCES
+          # Required for Windows
+        end
       end
 
       should "decrypt from file in a single read" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies: []
 description: SymmetricEncryption supports encrypting ActiveRecord data, Mongoid data,
   passwords in configuration files, encrypting and decrypting of large files through