[Pkg-privacy-commits] [Git][pkg-privacy-team/monkeysphere][master] enable ed25519 host keys as well when running test-ed25519

[Daniel Kahn Gillmor]

Daniel Kahn Gillmor pushed to branch master at Privacy Maintainers / monkeysphere


Commits:
5f4b6520 by Daniel Kahn Gillmor at 2019-05-13T04:49:07Z
enable ed25519 host keys as well when running test-ed25519

- - - - -


1 changed file:

- tests/basic


Changes:

=====================================
tests/basic
=====================================
@@ -255,7 +255,7 @@ echo "### configuring sshd..."
 cp "$TESTDIR"/etc/ssh/sshd_config "$SSHD_CONFIG"
 # write the sshd_config
 cat <<EOF >> "$SSHD_CONFIG"
-HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
+HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_key
 AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
 EOF
 
@@ -275,8 +275,12 @@ fi
 echo
 echo "##################################################"
 echo "### import host key..."
-ssh-keygen -b 3072 -t rsa -N '' -f "$TEMPDIR"/ssh_host_rsa_key
-monkeysphere-host import-key "$TEMPDIR"/ssh_host_rsa_key ssh://testhost.example
+if [ "$MONKEYSPHERE_TEST_USE_ED25519" = true ]; then
+    ssh-keygen -t ed25519 -N '' -f "$TEMPDIR"/ssh_host_key
+else
+    ssh-keygen -b 3072 -t rsa -N '' -f "$TEMPDIR"/ssh_host_key
+fi
+monkeysphere-host import-key "$TEMPDIR"/ssh_host_key ssh://testhost.example
 
 echo
 echo "##################################################"
@@ -377,7 +381,7 @@ monkeysphere-authentication update-users $(whoami)
 echo
 echo "##################################################"
 echo "### testing monkeysphere keys-for-userid ..."
-diff <( monkeysphere keys-for-userid ssh://testhost.example ) <( cut -f1,2 -d' ' < "$TEMPDIR"/ssh_host_rsa_key.pub )
+diff <( monkeysphere keys-for-userid ssh://testhost.example ) <( cut -f1,2 -d' ' < "$TEMPDIR"/ssh_host_key.pub )
 
 # connect to test sshd, using monkeysphere ssh-proxycommand to verify
 # the identity before connection.  This should work in both directions!



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/monkeysphere/commit/5f4b6520292b312588558506fcb80a8655f59982

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/monkeysphere/commit/5f4b6520292b312588558506fcb80a8655f59982
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20190513/7fa753d7/attachment-0001.html>