aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-01 16:50:56 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-01 16:50:56 -0200
commit8a05edc788449ccc110d034fdf0fc4415831acc8 (patch)
tree7e0f9ce23bcfa1904d3555a2871d5295a18fa1fa
parent0392586f090bc4a93ff523660d05c6147b7491a7 (diff)
downloadkeyringer-8a05edc788449ccc110d034fdf0fc4415831acc8.tar.gz
keyringer-8a05edc788449ccc110d034fdf0fc4415831acc8.tar.bz2
Decrypt now accept key parameter with or without .asc extension
-rw-r--r--lib/keyring/crypt.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/keyring/crypt.rb b/lib/keyring/crypt.rb
index 15430b4..2fae909 100644
--- a/lib/keyring/crypt.rb
+++ b/lib/keyring/crypt.rb
@@ -31,9 +31,13 @@ module Keyring
crypt.decrypt(content)
end
+ # Determine the file name for a given key
+ def keyFile(name)
+ @keyStore + '/' + File.dirname(name) + '/' + File.basename(name, '.asc') + '.asc'
+ end
+
def decryptKey(name)
- filename = @keyStore + '/' + name + '.asc'
- decrypt(filename)
+ decrypt(keyFile(name))
end
end
end