summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-01-14 22:27:21 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-01-14 22:27:21 -0500
commit7250e1b7f9930651038c72863c990de5ad89b42b (patch)
tree2ad77f65dab989b2bc39e33a7ad6993714879316
parent792f1e3324076f8521de33aa15f1dd7ba9c9a73f (diff)
added simple basic test for second key for monkeysphere-host, pulled this time from OpenSSL
-rw-r--r--packaging/debian/control2
-rwxr-xr-xtests/basic13
2 files changed, 14 insertions, 1 deletions
diff --git a/packaging/debian/control b/packaging/debian/control
index 3d41f00..d70d023 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: extra
Maintainer: Jameson Rollins <jrollins@finestructure.net>
Uploaders: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Build-Depends: debhelper (>= 7.0), cpio, socat, openssh-server, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail
+Build-Depends: debhelper (>= 7.0), cpio, socat, openssh-server, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail, openssl
Standards-Version: 3.8.3
Homepage: http://web.monkeysphere.info/
Vcs-Git: git://git.monkeysphere.info/monkeysphere
diff --git a/tests/basic b/tests/basic
index ceb9963..f808387 100755
--- a/tests/basic
+++ b/tests/basic
@@ -549,6 +549,19 @@ ssh_test
echo
echo "##################################################"
+echo "### Testing TLS setup..."
+
+openssl req -config "$TESTDIR"/openssl.cnf -x509 -newkey rsa:1024 -subj '/DC=net/DC=example/DC=testhost/CN=testhost.example.net/' -days 3 -keyout "$TEMPDIR"/tls_key.pem -nodes >"$TEMPDIR"/tls_cert.pem
+monkeysphere-host import-key "$TEMPDIR"/tls_key.pem https://testhost
+
+# FIXME: how can we test this via an https client?
+# We don't currently provide one.
+
+# FIXME: should we test other monkeysphere-host operations somehow now
+# that we have more than one key in the host keyring?
+
+echo
+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)