summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-17 00:36:07 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-17 00:36:07 -0500
commit54e5dd2bd3d63238142c748c64fdf66135a47136 (patch)
treea959208bf3fe1a668c17206138162cb44d6c5114 /tests
parent650969a09be64ceda9a9773b1ba1803584ca9ada (diff)
fix a couple of left over references to expert
Diffstat (limited to 'tests')
-rwxr-xr-xtests/basic12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/basic b/tests/basic
index 4c19a85..d78a594 100755
--- a/tests/basic
+++ b/tests/basic
@@ -170,17 +170,17 @@ echo "### import host key..."
ssh-keygen -b 1024 -t rsa -N '' -f "$TEMPDIR"/ssh_host_rsa_key
monkeysphere-host import-key testhost < "$TEMPDIR"/ssh_host_rsa_key
+echo "##################################################"
+echo "### getting host key fingerprint..."
+HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ )
+echo "$HOSTKEYID"
+
# change host key expiration
echo "##################################################"
echo "### setting host key expiration..."
monkeysphere-host set-expire 1
# FIXME: how do we check that the expiration has really been set?
-echo "##################################################"
-echo "### getting host key fingerprint..."
-HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ )
-echo "$HOSTKEYID"
-
# certify host key with the "Admin's Key".
# (this would normally be done via keyservers)
echo "##################################################"
@@ -236,7 +236,7 @@ gpgadmin --armor --export "$HOSTKEYID" | gpg --import
# teach the "server" about the testuser's key
echo "##################################################"
echo "### export testuser key to server..."
-gpg --export testuser | monkeysphere-authentication expert gpg-cmd --import
+gpg --export testuser | monkeysphere-authentication gpg-cmd --import
# update authorized_keys for user
echo "##################################################"