summaryrefslogtreecommitdiff
path: root/src/monkeysphere-host
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-01-15 20:17:15 -0500
committerJameson Rollins <jrollins@finestructure.net>2010-01-15 20:24:40 -0500
commit0f6353059da451d3ed182cfb18e8eafea1348a85 (patch)
tree863f3a51f220eb81b89c0b898924e499be0bfaca /src/monkeysphere-host
parent17315937bc0af145ef7dfb749096faad49f208aa (diff)
Try to fix monkeysphere-host and tests/basic for revoke-key test
Unfortunately there's still a problem that I can't quite figure out. gpg is for some reason failing to import that revocation certificate. Could it be because gpg can't accept ascii armored certificates as input? I'm at a loss.
Diffstat (limited to 'src/monkeysphere-host')
-rwxr-xr-xsrc/monkeysphere-host10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index b45b50e..903e333 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -174,11 +174,6 @@ multi_key() {
if [[ -z "$1" || "$1" == '--all' ]] ; then
keys="${fprs[@]}"
- else
- for key in $keys ; do
- printf '%s\n' "${fprs[@]}" | grep "${key}$" \
- || failure "Key '$key' not found."
- done
fi
for key in $keys ; do
@@ -208,7 +203,10 @@ show_key() {
# create the ssh key
TMPSSH="$GNUPGHOME"/ssh_host_key_rsa_pub
- gpg --export "$id" | openpgp2ssh 2>/dev/null >"$TMPSSH"
+ if ! gpg --export "$id" 2>/dev/null \
+ | openpgp2ssh 2>/dev/null >"$TMPSSH" ; then
+ failure "Key '$id' not found."
+ fi
# get the gpg fingerprint
fingerprint=$(gpg --quiet --list-keys \