filesafe 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba9550c3b8b18a9452579d37695430c35e73ab8
-  data.tar.gz: 64f823a312e18134a23c374ebaf8266ac2f7b9b2
+  metadata.gz: fbd8143f1cce52446d419c1377bdebd9f16b2aa2
+  data.tar.gz: 9b2468eeb47038e33f79d94b0fbf5f32574ff4d6
 SHA512:
-  metadata.gz: bb19c35e91e82dfb7e7789803e2b3471ff1dc6c1ffcbc97924b5f51793d079a7f674ae257ae500ec63e733683b0e5623d460fa636734edb8d4d3f9af686bbe57
-  data.tar.gz: 3ab94cf7a4ff77e7a30c98bca7e58e6ae0412b0daa6b14555bbb455da3c1340dbeb128659c1b36f660f74a035028e1ece3f2e1a32066f896d4e090ede33278c3
+  metadata.gz: 14e7e4b61e5edd986e5ebf293391509a5606738ab49e413e0aee5c1d95b2ccbf4f0b857386f77aeb3032f387b6a0810bf7d50460309bf2aee2bf6060be0ea1f2
+  data.tar.gz: 1d7d1bc7fe399d51b7c341db64c664ad3945c273aae9c5e7ffa9fb4beb6d2f2e3016d34a11d1a7ff7a898f57cbdf315e65ea2994d9d3ff10648edb8ed9767a8c

data/README.txt

@@ -15,8 +15,10 @@ passphrase.  The method used should be reasonably secure for the uses I
 required.  I have NOT adapted the script (yet) for non-POSIX
 environments (Windows) however.
 
-This script was written and tested using Ruby 1.9.x.  No attempts to
-adapt or test it under earlier Ruby versions have been made.
+This script was originally written and tested using Ruby 1.9.x. HOWEVER
+it may no longer be compatible with older versions.  The author uses it
+with Ruby version 2.4.3 on a FreeBSD 11.1 system.    No attempts to
+adapt or test it on any other Ruby versions have been made.
 
 ENCRYPTED FILE FORMAT
 
@@ -109,12 +111,11 @@ This script is licensed under an MIT-style license.  See the LICENSE.txt file.
 REQUIREMENTS
 
 This script requires or relies on:
-  openssl       -- encryption/HMAC/hash algorithms
+  openssl       -- encryption/HMAC/hash/PBKDF2 algorithms
   securerandom  -- cryptographically secure random data
   tempfile      -- for temporary file creation
 
 It uses the following gems:
-  pbkdf2-ruby   -- for the password-based key derivitive function PBKDF2
   highline      -- for reading a password/passphrase from a terminal
 
 

data/Rakefile

@@ -23,7 +23,6 @@ gemspec = Gem::Specification.new do |spec|
     'test/*'
   ]
   spec.executables = [ 'filesafe' ]
-  spec.add_runtime_dependency 'pbkdf2-ruby', '~> 0.2', '>= 0.2.0'
   spec.add_runtime_dependency 'highline', '~>1.6.1', '>= 1.6.1'
 end
 

data/VERSION.txt

@@ -1 +1 @@
-3.1.1
+4.0.0

data/lib/filesafe.rb

@@ -32,9 +32,8 @@
 # FileSafe module has four module methods, two for file encryption/decryption,
 # one for passphrase hashing, and one for reading a passphrase from a terminal.
 module FileSafe
-  require 'openssl'       ## Encryption/HMAC/Hash algorithms
+  require 'openssl'       ## Encryption/HMAC/Hash/PBKDF2 algorithms
   require 'securerandom'  ## Cryptographically secure source of random data
-  require 'pbkdf2'        ## PBKDF2 algorithm for key material generation
   require 'highline'      ## For reading a passphrase from a terminal
   require 'tempfile'      ## Temporary file creation
 
@@ -59,10 +58,10 @@ module FileSafe
   SALT_LEN         = KEY_LEN + IV_LEN
 
   # Default hash function to use for HMAC (SHA-512 by default):
-  HMAC_FUNC        = 'sha512'
+  HMAC_FUNC        = OpenSSL::Digest.new('sha512')
 
   # Default HMAC size/length (512 bits/64 bytes for HMAC-SHA-512):
-  HMAC_LEN         = OpenSSL::HMAC.new('', HMAC_FUNC).digest.bytesize
+  HMAC_LEN         = HMAC_FUNC.digest_length
 
   # 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
@@ -268,13 +267,7 @@ module FileSafe
     ## Extract and decrypt the encrypted file key + IV.
     ## First, regenerate the password-based key material that encrypts the
     ## file key + IV:
-    keymaterial = PBKDF2.new do |p|
-      p.hash_function = HMAC_FUNC
-      p.password      = passphrase
-      p.salt          = salt
-      p.iterations    = ITERATIONS
-      p.key_length    = KEY_LEN + IV_LEN
-    end.bin_string
+    keymaterial = pbkdf2(passphrase, salt, KEY_LEN + IV_LEN)
     cipher = OpenSSL::Cipher.new(CIPHER)
     cipher.decrypt
     cipher.padding = 0 ## No padding is required for this operation
@@ -336,13 +329,13 @@ module FileSafe
   # Execute PBKDF2 to generate the specified number of bytes of
   # pseudo-random key material.
   def self.pbkdf2(passphrase, salt, len)
-    PBKDF2.new do |p|
-      p.hash_function = HMAC_FUNC
-      p.password      = passphrase
-      p.salt          = salt
-      p.iterations    = ITERATIONS
-      p.key_length    = len
-    end.bin_string.force_encoding(Encoding::BINARY)
+    OpenSSL::PKCS5.pbkdf2_hmac(
+      passphrase,
+      salt,
+      ITERATIONS,
+      len,
+      OpenSSL::Digest.new(HMAC_FUNC)
+    )
   end
 
 end

data/test/test_module.rb

@@ -2,7 +2,7 @@
 # encoding: ASCII-8BIT
 
 require 'test/unit'
-require 'digest/sha2'
+require 'openssl'
 require_relative '../lib/filesafe.rb'
 
 class FileSafeModuleTest < Test::Unit::TestCase
@@ -52,7 +52,7 @@ class FileSafeModuleTest < Test::Unit::TestCase
     goal = [goal].pack('H*')
     assert(FileSafe::HMAC_LEN == goal.bytesize, "Module HMAC length has changed since test was created. (Expected #{goal.bytesize} bytes, length is now #{FileSafe::HMAC_LEN} bytes.)")
     assert(FileSafe::ITERATIONS == 16384, "Module ITERATIONS has changed. (Expected 16384 iterations, currently set to #{FileSafe::ITERATIONS} iterations.)")
-    assert(FileSafe::HMAC_FUNC == 'sha512', "Module HMAC_FUNC has changed. (Expected 'sha512' hash function for HMAC, instead of '#{FileSafe::HMAC_FUNC}' instead.)")
+    assert(FileSafe::HMAC_FUNC == OpenSSL::Digest.new('sha512'), "Module HMAC_FUNC has changed. (Expected 'sha512' hash digest function for HMAC, instead of '#{FileSafe::HMAC_FUNC}' instead.)")
     hash = FileSafe.pbkdf2(pass, salt, FileSafe::HMAC_LEN)
     assert(hash == goal, "PBKDF2 output does NOT match expected value.")
   end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: filesafe
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Aaron D. Gifford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-02-23 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
@@ -89,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Encrypt/decrypt files with a random 256-bit AES key secured by a passphrase