diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-01 16:50:56 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-01 16:50:56 -0200 |
commit | 8a05edc788449ccc110d034fdf0fc4415831acc8 (patch) | |
tree | 7e0f9ce23bcfa1904d3555a2871d5295a18fa1fa | |
parent | 0392586f090bc4a93ff523660d05c6147b7491a7 (diff) | |
download | keyringer-8a05edc788449ccc110d034fdf0fc4415831acc8.tar.gz keyringer-8a05edc788449ccc110d034fdf0fc4415831acc8.tar.bz2 |
Decrypt now accept key parameter with or without .asc extension
-rw-r--r-- | lib/keyring/crypt.rb | 8 |
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 |