From 8a05edc788449ccc110d034fdf0fc4415831acc8 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 1 Feb 2011 16:50:56 -0200 Subject: Decrypt now accept key parameter with or without .asc extension --- lib/keyring/crypt.rb | 8 ++++++-- 1 file 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 -- cgit v1.2.3