summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-01-18 11:42:30 -0500
committerJameson Rollins <jrollins@finestructure.net>2010-01-18 11:42:30 -0500
commit6880d38e7faed336e4cfee7b1da037e90008a1b3 (patch)
tree0084682a9ee28ede19b0ebc8c2750de98248bbf8
parentd6a9bf7fb5c3811db1cec6ee954515c318057f49 (diff)
fix show_key function to handle user ID input (needed for import_key)
-rwxr-xr-xsrc/monkeysphere-host28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 8452e6c..eadd74b 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -189,8 +189,8 @@ multi_key() {
show_key() {
local id="$1"
local GNUPGHOME
- local TMPSSH
local fingerprint
+ local tmpssh
local revokers
# tmp gpghome dir
@@ -202,27 +202,29 @@ show_key() {
# import the host key into the tmp dir
gpg --quiet --import <"$HOST_KEY_FILE"
- # create the ssh key
- TMPSSH="$GNUPGHOME"/ssh_host_key_rsa_pub
- 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 \
+ if gpg --quiet --list-keys \
--with-colons --with-fingerprint "$id" \
- | grep '^fpr:' | cut -d: -f10 )
+ | grep '^fpr:' | cut -d: -f10 > "$GNUPGHOME"/fingerprint ; then
+ fingerprint=$(cat "$GNUPGHOME"/fingerprint)
+ else
+ failure "ID '$id' not found."
+ fi
+
+ # create the ssh key
+ tmpssh="$GNUPGHOME"/ssh_host_key_rsa_pub
+ gpg --export "$fingerprint" 2>/dev/null \
+ | openpgp2ssh 2>/dev/null >"$tmpssh"
# list the host key info
# FIXME: make no-show-keyring work so we don't have to do the grep'ing
# FIXME: can we show uid validity somehow?
- gpg --list-keys --list-options show-unusable-uids "$id" 2>/dev/null \
+ gpg --list-keys --list-options show-unusable-uids "$fingerprint" 2>/dev/null \
| grep -v "^${GNUPGHOME}/pubring.gpg$" \
| egrep -v '^-+$'
# list revokers, if there are any
- revokers=$(gpg --list-keys --with-colons --fixed-list-mode "$id" \
+ revokers=$(gpg --list-keys --with-colons --fixed-list-mode "$fingerprint" \
| awk -F: '/^rvk:/{ print $10 }' )
if [ "$revokers" ] ; then
echo "The following keys are allowed to revoke this host key:"
@@ -237,7 +239,7 @@ show_key() {
# list the ssh fingerprint
echo -n "ssh fingerprint: "
- ssh-keygen -l -f "$TMPSSH" | awk '{ print $1, $2, $4 }'
+ ssh-keygen -l -f "$tmpssh" | awk '{ print $1, $2, $4 }'
# remove the tmp file
trap - EXIT