filesafe 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b861521a8fb52cf218a3222749b3daf51c664f2
-  data.tar.gz: f81c942da0d839c87694778cc3c8a5c2d06ab12b
+  metadata.gz: 3ba9550c3b8b18a9452579d37695430c35e73ab8
+  data.tar.gz: 64f823a312e18134a23c374ebaf8266ac2f7b9b2
 SHA512:
-  metadata.gz: c86db90a87c2de7d0bbc55870bda68605ed701126c108dbf2626dfe41c49fa5e40b877e9f418889e05d117eefd01916cd73fe68a0e320e91fb1f6eb3b8e97f88
-  data.tar.gz: fa49b8818edbc5a99f6a1cf23a91381950d07ad9fa358f2416f52f42b503cb8a13a0d8a5732cb57a661600fd1b7d6602c11d8b8cbf0456ae058a9538410ee0f2
+  metadata.gz: bb19c35e91e82dfb7e7789803e2b3471ff1dc6c1ffcbc97924b5f51793d079a7f674ae257ae500ec63e733683b0e5623d460fa636734edb8d4d3f9af686bbe57
+  data.tar.gz: 3ab94cf7a4ff77e7a30c98bca7e58e6ae0412b0daa6b14555bbb455da3c1340dbeb128659c1b36f660f74a035028e1ece3f2e1a32066f896d4e090ede33278c3

data/VERSION.txt

@@ -1 +1 @@
-3.1.0
+3.1.1

data/lib/filesafe.rb

@@ -17,10 +17,10 @@
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,7 +44,7 @@ module FileSafe
   # Default cipher (AES-256 in CBC mode):
   CIPHER           = 'aes-256-cbc'
 
-  cipher = OpenSSL::Cipher::Cipher.new(CIPHER)
+  cipher = OpenSSL::Cipher.new(CIPHER)
 
   # Cipher block length/size (128 bits/16 bytes for AES-256):
   BLOCK_LEN        = cipher.block_size
@@ -64,13 +64,13 @@ module FileSafe
   # Default HMAC size/length (512 bits/64 bytes for HMAC-SHA-512):
   HMAC_LEN         = OpenSSL::HMAC.new('', HMAC_FUNC).digest.bytesize
 
-  # Default ciphertext file header size (key + IV + salt + HMAC = 1280 bits/160 bytes by default) 
+  # Default ciphertext file header size (key + IV + salt + HMAC = 1280 bits/160 bytes by default)
   HEADER_LEN       = KEY_LEN + IV_LEN + SALT_LEN + HMAC_LEN
 
   # Number of iterations to use in PBKDF2 (16384 by default):
   ITERATIONS       = 16384
 
-  # Number of bytes to read from plaintext/ciphertext files at a time (64KB by default): 
+  # Number of bytes to read from plaintext/ciphertext files at a time (64KB by default):
   FILE_CHUNK_LEN   = 65536
 
   # Read a passphrase from a terminal.
@@ -81,7 +81,7 @@ module FileSafe
       tmp = HighLine.new.ask('Retype passphrase: '){|q| q.echo = '*' ; q.overwrite = true ; q.validate = nil }
       return phrase if tmp == phrase
     rescue Interrupt
-      exit -1
+      exit - 1
     end while true
   end
 
@@ -145,7 +145,7 @@ module FileSafe
 
     ## Encrypt the file key and IV using password-derived keying material:
     keymaterial = pbkdf2(passphrase, salt, KEY_LEN + IV_LEN)
-    cipher = OpenSSL::Cipher::Cipher.new(CIPHER)
+    cipher = OpenSSL::Cipher.new(CIPHER)
     cipher.encrypt
     ## No padding required for this operation since the file key + IV is
     ## an exact multiple of the cipher block length:
@@ -173,7 +173,7 @@ module FileSafe
     hmac << encrypted_file_iv
 
     ## Encrypt file with file key + IV:
-    cipher = OpenSSL::Cipher::Cipher.new(CIPHER)
+    cipher = OpenSSL::Cipher.new(CIPHER)
     cipher.encrypt
     ## Encryption of file contents uses PCKS#5 padding which OpenSSL should
     ## have enabled by default.  Nevertheless, we explicitly enable it here:
@@ -275,7 +275,7 @@ module FileSafe
       p.iterations    = ITERATIONS
       p.key_length    = KEY_LEN + IV_LEN
     end.bin_string
-    cipher = OpenSSL::Cipher::Cipher.new(CIPHER)
+    cipher = OpenSSL::Cipher.new(CIPHER)
     cipher.decrypt
     cipher.padding = 0 ## No padding is required for this operation
     cipher.key     = keymaterial[0,KEY_LEN]
@@ -286,7 +286,7 @@ module FileSafe
     file_iv  = keymaterial[KEY_LEN,IV_LEN]
 
     ## Decrypt file:
-    cipher = OpenSSL::Cipher::Cipher.new(CIPHER)
+    cipher = OpenSSL::Cipher.new(CIPHER)
     cipher.decrypt
     cipher.padding = 1 ## File contents use PCKS#5 padding,OpenSSL's default method
     cipher.key     = file_key
@@ -332,11 +332,11 @@ module FileSafe
       end
     end
   end
-  
+
   # Execute PBKDF2 to generate the specified number of bytes of
   # pseudo-random key material.
   def self.pbkdf2(passphrase, salt, len)
-    hash = PBKDF2.new do |p|
+    PBKDF2.new do |p|
       p.hash_function = HMAC_FUNC
       p.password      = passphrase
       p.salt          = salt
@@ -346,4 +346,3 @@ module FileSafe
   end
 
 end
-

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: filesafe
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Aaron D. Gifford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbkdf2-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
 description: A utility script for encrypting and decrypting files using a randomly
@@ -79,17 +79,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Encrypt/decrypt files with a random 256-bit AES key secured by a passphrase