summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Pujol <alexandre@pujol.io>2017-04-05 13:52:47 (GMT)
committer Alexandre Pujol <alexandre@pujol.io>2017-04-05 13:52:47 (GMT)
commit1050d43c596238630d22d545e6c8de26bdad0ef5 (patch)
treef2098b73bc651951823557e4391233799cf15c30
parentc303513be400db4efd65d8f19ca101a1e470796f (diff)
Support for gpg encrypted tomb key loaded from stdin. See #255refs/pull/256/head
-rwxr-xr-xtomb7
1 files changed, 1 insertions, 6 deletions
diff --git a/tomb b/tomb
index ac2a3c0..7db769d 100755
--- a/tomb
+++ b/tomb
@@ -943,12 +943,7 @@ _load_key() {
[[ -z $keyfile ]] && {
_failure "This operation requires a key file to be specified using the -k option." }
- if option_is_set -g; then
- _verbose "load_key key encrypted with a GnuPG Key"
- _message "Key encrypted with a GnuPG Key"
- TOMBKEYFILE=$keyfile
- TOMBKEY="${mapfile[$TOMBKEYFILE]}"
- elif [[ $keyfile == "-" ]]; then
+ if [[ $keyfile == "-" ]]; then
_verbose "load_key reading from stdin."
_message "Waiting for the key to be piped from stdin... "
TOMBKEYFILE=stdin