symmetric-encryption 3.9.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad0434ee0b203f85088bc62492c16d2365a284c
-  data.tar.gz: c8cd4796787faa48be52155d75e1e312f627b38d
+  metadata.gz: 4569a98f50aa6df040149ea4252b66b1717f1e5c
+  data.tar.gz: afd1ca34b01b8deae7ac11658207b757873927e8
 SHA512:
-  metadata.gz: 59fe734623957ac4abed7b6b94786153a793947528d6b857612f418c6fa151947076b8802b5fe901bc2a1d0bad02aa79aa6790951b0671d054e4274ea09a29cc
-  data.tar.gz: 72270dd87fd4e16616b31e7d173facffc2da383c6f0719c0cc76bb9e353d0b33f1179c419af24f36c4ac108e6279b695202163884c01d0d97fe7f770688223b2
+  metadata.gz: ab76aa43eeb67a5f58fd31b0e3dd715e0474b241c4e371a82cfe0bbb4ece9b65d253c3856df9054472432c75b552bd5609aec65c2262995c2d15c7c689dd40c9
+  data.tar.gz: 583f8cbb6e7741e11a7354550968f8c109c541ddda4ce58a120b10071d276ea3f3fec488f140a1de6198b104a0b2e812aa8ac348a8950258b5f84d77f0c7c5c3

data/lib/symmetric_encryption/cipher.rb

@@ -217,7 +217,7 @@ module SymmetricEncryption
     def initialize(params={})
       params             = params.dup
       @cipher_name       = params.delete(:cipher_name) || params.delete(:cipher) || 'aes-256-cbc'
-      @version           = params.delete(:version)
+      @version           = params.delete(:version) || 0
       @always_add_header = params.delete(:always_add_header) || false
       self.encoding      = (params.delete(:encoding) || :base64).to_sym
       private_rsa_key    = params.delete(:private_rsa_key)
@@ -461,10 +461,9 @@ module SymmetricEncryption
     #     The cipher_name string to to put in the header
     #     Default: nil : Exclude cipher_name name from header
     def self.build_header(version, compressed=false, iv=nil, key=nil, cipher_name=nil)
-      # Ruby V2 named parameters would be perfect here
+      version ||= SymmetricEncryption.cipher.version
 
-      # Version number of supplied encryption key, or use the global cipher version if none was supplied
-      flags  = iv || key ? (SymmetricEncryption.cipher.version || 0) : (version || 0) # Same as 0b0000_0000_0000_0000
+      flags  = version # Same as 0b0000_0000_0000_0000
 
       # If the data is to be compressed before being encrypted, set the
       # compressed bit in the flags word
@@ -478,7 +477,7 @@ module SymmetricEncryption
         header << iv
       end
       if key
-        encrypted = SymmetricEncryption.cipher.binary_encrypt(key, false, false, false)
+        encrypted = SymmetricEncryption.cipher(version).binary_encrypt(key, false, false, false)
         header << [encrypted.length].pack('v').force_encoding(SymmetricEncryption::BINARY_ENCODING)
         header << encrypted
       end

data/lib/symmetric_encryption/version.rb

@@ -1,3 +1,3 @@
 module SymmetricEncryption #:nodoc
-  VERSION = '3.9.0'
+  VERSION = '3.9.1'
 end

data/test/config/symmetric-encryption.yml

@@ -46,6 +46,15 @@ test:
       version:           2
       always_add_header: true
 
+    # For testing a higher version that is not active yet
+    -
+      key:               6BCDEF1234567890ABCDEF1234567890
+      iv:                6BCDEF1234567890
+      cipher_name:       aes-256-cbc
+      version:           6
+      encoding:          :base64strict
+      always_add_header: true
+
     # Prior Symmetric Encryption Key specified in environment variable
     -
       # Encryption Key

data/test/symmetric_encryption_test.rb

@@ -9,7 +9,7 @@ class SymmetricEncryptionTest < Minitest::Test
       before do
         config                             = SymmetricEncryption::Config.read_config(File.join(File.dirname(__FILE__), 'config', 'symmetric-encryption.yml'), 'test')
         @ciphers                           = SymmetricEncryption::Config.extract_ciphers(config)
-        @cipher_v2, @cipher_v1, @cipher_v0 = @ciphers
+        @cipher_v2, @cipher_v6, @cipher_v1, @cipher_v0 = @ciphers
       end
 
       it 'matches config file for first cipher' do
@@ -160,6 +160,13 @@ class SymmetricEncryptionTest < Minitest::Test
         assert_equal @social_security_number, SymmetricEncryption.decrypt(encrypted)
       end
 
+      it 'encrypt and then decrypt using random iv with higher version' do
+        # Encrypt with random iv
+        assert encrypted = SymmetricEncryption.cipher(6).encrypt(@social_security_number, true)
+        assert_equal true, SymmetricEncryption.encrypted?(encrypted)
+        assert_equal @social_security_number, SymmetricEncryption.decrypt(encrypted)
+      end
+
       it 'encrypt and then decrypt using random iv with compression' do
         # Encrypt with random iv and compress
         assert encrypted = SymmetricEncryption.encrypt(@social_security_number, true, true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible