summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-01-17 23:01:35 -0500
committerJameson Rollins <jrollins@finestructure.net>2010-01-17 23:01:35 -0500
commita377e69b60eff2fa9e72bb931acb57833560d594 (patch)
tree44b5bf1582e48264ce7d4f1ac3491727719852d9
parent2848cd332cf76ccac88a4ef06e73e834b4ef28ff (diff)
parentc4b0a1e409cab69558aaa0fd47f7076ed6481e3e (diff)
Merge remote branch 'dkg/master'
-rwxr-xr-xtests/basic5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/basic b/tests/basic
index 1d51a69..ad9fb12 100755
--- a/tests/basic
+++ b/tests/basic
@@ -567,10 +567,7 @@ echo "##################################################"
echo "### revoking ssh host key..."
# generate the revocation certificate and feed it directly to the test
# user's keyring (we're not publishing to the keyservers)
-keyID=$(monkeysphere-host s 'ssh://testhost' | grep 'OpenPGP fingerprint:' | awk '{ print $3 }')
-monkeysphere-host revoke-key "$keyID" >"$TEMPDIR"/revcert
-cat "$TEMPDIR"/revcert
-<"$TEMPDIR"/revcert gpg --import
+monkeysphere-host revoke-key "$SSHHOSTKEYID" | gpg --import
echo
echo "##################################################"
echo "### ssh connection test for failure..."