seekrit 0.2.2 → 0.2.4

data/bin/seekrit

@@ -13,17 +13,14 @@ def interactor(&blk)
     FileUtils.touch DATAFILE
   end
   File.open(DATAFILE, "r+") do |file|
-    3.times do
-      begin
-        password = ask('Enter password: '){ |q| q.echo = false }
-        store = Seekrit::Store.new(password, file)
-        yield Seekrit::Interactor.new(store)
-        return
-      rescue Seekrit::DecryptionError => err
-      end
+    begin
+      password = lambda{ ask('Enter password: '){ |q| q.echo = false } }
+      store = Seekrit::Store.new(password, file)
+      yield Seekrit::Interactor.new(store)
+    rescue Seekrit::DecryptionError => err
+      puts err.message
+      exit 1
     end
-    puts err.message
-    exit 1
   end
 end
 

data/lib/seekrit/store.rb

@@ -23,7 +23,7 @@ module Seekrit
     end
 
     def [](name)
-      decrypt(secrets[name])
+      secrets[name] && decrypt(secrets[name])
     end
 
     def []=(name, value)
@@ -63,7 +63,7 @@ module Seekrit
   private
 
     def crypt_key
-      Digest::SHA256.digest(@password)
+      Digest::SHA256.digest(@password.respond_to?(:call) ? @password.call : @password)
     end
 
     def escape(value)
@@ -108,11 +108,25 @@ module Seekrit
     end
 
     def decrypt(data)
+      err = nil
+      3.times do
+        begin
+          k = @correct_key || crypt_key
+          decrypted = decrypt_once(data, k)
+          @correct_key ||= k
+          return decrypted
+        rescue DecryptionError => err
+        end
+      end
+      raise err
+    end
+
+    def decrypt_once(data, key)
       cipher = OpenSSL::Cipher::Cipher.new(@cipher)
       iv = data[0, cipher.iv_len]
       ciphertext = data[cipher.iv_len..-1]
       cipher.decrypt
-      cipher.key = crypt_key
+      cipher.key = key
       cipher.iv = iv
       plaintext = cipher.update(ciphertext)
       plaintext << cipher.final

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: seekrit
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Paul Battley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +00:00
+date: 2011-02-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency