filesafe 2.0.1 → 3.0.0

data/README.txt

@@ -132,11 +132,3 @@ Please report bugs by going to the author's web site and clicking on the
 
 * http://www.aarongifford.com/leaveanote.html
 
-I am debating as to whether I should replace the HMAC in the file header
-with a PBKDF2 function, perhaps PBKDF2(passphrase, iterations, HMAC)
-so as to make dictionary attacks against passwords much more difficult.
-It would result in a slight file format change, so I'd have to bump up
-the version, and perhaps provide a fallback to the old method if a
-passphrase doesn't seem to match a ciphertext file's stored PBKDF2
-result.
-

data/VERSION.txt

@@ -1 +1 @@
-2.0.1
+3.0.0

data/bin/filesafe

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: ASCII-8BIT
 #
 # FileSafe - http://www.aarongifford.com/computers/filesafe/
 #

data/lib/filesafe.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: ASCII-8BIT
 #
 # FileSafe - http://www.aarongifford.com/computers/filesafe/
 #
@@ -66,8 +67,8 @@ module FileSafe
   # 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 (4096 by default):
-  ITERATIONS       = 4096
+  # 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): 
   FILE_CHUNK_LEN   = 65536
@@ -230,6 +231,7 @@ module FileSafe
     fsize = File.size(file)
     raise "File is not in valid encrypted format: #{file.inspect}" unless fsize > HEADER_LEN && (fsize - HEADER_LEN) % BLOCK_LEN == 0
     salt = encrypted_file_key = encrypted_file_iv = nil
+    interactive = passphrase.nil?
     loop do
       passphrase = getphrase if passphrase.nil?
       fp = File.open(file, File::RDONLY)
@@ -247,6 +249,7 @@ module FileSafe
       end
       fp.close
       break if pbkdf2(passphrase + test_hmac.digest, salt, HMAC_LEN) == file_check
+      raise "Incorrect passphrase, or file is not encrypted." unless interactive
       puts "*** ERROR: Incorrect passphrase, or file is not encrypted. Try again or abort."
       passphrase = nil
     end
@@ -328,7 +331,7 @@ module FileSafe
       p.salt          = salt
       p.iterations    = ITERATIONS
       p.key_length    = len
-    end.bin_string
+    end.bin_string.force_encoding(Encoding::BINARY)
   end
 
 end

data/test/test_cli.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: ASCII-8BIT
 
 require 'test/unit'
 require 'digest/sha2'

data/test/test_decrypt.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: ASCII-8BIT
 
 require 'test/unit'
 require_relative '../lib/filesafe.rb'

data/test/test_module.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: ASCII-8BIT
 
 require 'test/unit'
 require 'digest/sha2'
@@ -43,13 +44,17 @@ class FileSafeModuleTest < Test::Unit::TestCase
     pass = "When in the course of human events..."
     salt = "01caf8e2e844a37810280f231f3059aca54e631528c1c57eb643df2c" +
            "8c6c74bc4a6136784ecff873dcd09a80059f6e80"
-    goal = "6c726ee33ad9e171612d646403b3e01bba0451574cde9b0af90d957e" +
-           "1b33c0830db1ac63b986f755faa8b1e9a944dbf4c7086da2eae122c3" +
-           "9f42a359ef12536c"
+    goal = "74a1aa134ea370cbff2776f9271e500e7774a567c47c565cf4c489f1" +
+           "c029d0fb406d195f7678001d454ef803e6b55394fd52257261a5bb81" +
+           "413db6b65af819a5"
+
     salt = [salt].pack('H*')
     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.)")
     hash = FileSafe.pbkdf2(pass, salt, FileSafe::HMAC_LEN)
-    assert(hash == goal)
+    assert(hash == goal, "PBKDF2 output does NOT match expected value.")
   end
 end
 

metadata

@@ -1,101 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: filesafe
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
+version: !ruby/object:Gem::Version
+  version: 3.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Aaron D. Gifford
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-04 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pbkdf2
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17188861760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17188861760
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &17188861060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id002
-description: A utility script for encrypting and decrypting files using a randomly generated 256-bit AES key and initialization vector secured using the PBKDF2 password/passphrase key derivation algorithm to secure the file key and IV.
+  prerelease: false
+  version_requirements: *17188861060
+description: A utility script for encrypting and decrypting files using a randomly
+  generated 256-bit AES key and initialization vector secured using the PBKDF2 password/passphrase
+  key derivation algorithm to secure the file key and IV.
 email: 
-executables: 
+executables:
 - filesafe
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.txt
-files: 
+files:
 - README.txt
 - VERSION.txt
 - Rakefile
 - bin/filesafe
 - lib/filesafe.rb
-- test/bar
 - test/test_module.rb
 - test/test_decrypt.rb
 - test/test_cli.rb
-has_rdoc: true
 homepage: http://www.aarongifford.com/computers/filesafe/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
-summary: Encrypt/decrypt files with a random 256-bit AES key secured by a passphrase derived master key using PBKDF2
+summary: Encrypt/decrypt files with a random 256-bit AES key secured by a passphrase
+  derived master key using PBKDF2
 test_files: []
-

data/test/bar

@@ -1 +0,0 @@
-foo