summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/monkeysphere-host4
-rwxr-xr-xtests/basic4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 2e69d41..bd956e0 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -175,8 +175,8 @@ show_key() {
echo -n "ssh fingerprint: "
ssh-keygen -l -f /dev/stdin \
- <<<$( gpg_host --export FEE16FA3 2>/dev/null \
- | openpgp2ssh 8445B5203A8443B4B04F637DD4DE66B2FEE16FA3 2>/dev/null) \
+ <<<$( gpg_host --export "$HOST_FINGERPRINT" 2>/dev/null \
+ | openpgp2ssh "$HOST_FINGERPRINT" 2>/dev/null) \
| awk '{ print $1, $2, $4 }'
# FIXME: other relevant key parameters?
diff --git a/tests/basic b/tests/basic
index 9844454..4c19a85 100755
--- a/tests/basic
+++ b/tests/basic
@@ -166,9 +166,9 @@ EOF
# import host key
echo "##################################################"
-echo "### testing host key importing..."
+echo "### import host key..."
ssh-keygen -b 1024 -t rsa -N '' -f "$TEMPDIR"/ssh_host_rsa_key
-monkeysphere-host expert import-key testhost < "$TEMPDIR"/ssh_host_rsa_key
+monkeysphere-host import-key testhost < "$TEMPDIR"/ssh_host_rsa_key
# change host key expiration
echo "##################################################"