Replace RSA authentication with public-key authentication in welcome messages.

diff --git a/debian/changelog b/debian/changelog
index eb4e0ab..0781405 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 userdir-ldap (0.3.90) UNRELEASED; urgency=medium
 
+  [ Paul Wise ]
   * Switch from /org to /srv
 
+  [ Peter Palfrader ]
+  * Replace RSA authentication with public-key authentication in welcome
+    messages.
+
  -- Paul Wise <pabs@debian.org>  Sat, 17 Jun 2017 14:38:00 +0800
 
 userdir-ldap (0.3.89) unstable; urgency=medium

diff --git a/templates/welcome-message-Debian b/templates/welcome-message-Debian
index f49a5fd..eef2cff 100644 (file)
--- a/templates/welcome-message-Debian
+++ b/templates/welcome-message-Debian
@@ -48,10 +48,10 @@ and ask your fellow DDs if you need any help.
 You need to use ssh to log into the machines; telnet and rlogin are
 disabled for security reasons.  On debian.org servers the only ssh
 authentication method available is publickey.  The LDAP directory is
-able to share RSA ssh keys among machines, please see
+able to share public ssh keys among machines, please see
 <URL:https://db.debian.org/doc-mail.html>.  Please be aware of the
-security implications of using RSA authentication and ssh agents.  The
-SSH fingerprints for all Debian machines can be looked up at
+security implications of using public-key authentication and ssh agents.
+The SSH fingerprints for all Debian machines can be looked up at
 <URL:https://db.debian.org/machines.cgi> or a known_hosts file can be
 downloaded from <URL:https://db.debian.org/debian_known_hosts>.
 

diff --git a/templates/welcome-message-guest b/templates/welcome-message-guest
index e161619..544fcfe 100644 (file)
--- a/templates/welcome-message-guest
+++ b/templates/welcome-message-guest
@@ -29,11 +29,11 @@ and ask your mentors if you need any help.
 
 You should use ssh to log into the machines. See the host details on
 db.debian.org for the ssh hostkey fingerprints for the servers you
-access.  Our LDAP directory is able to share ssh RSA keys among
+access.  Our LDAP directory is able to share public ssh keys keys among
 machines, please see <URL:https://db.debian.org/doc-mail.html> for
 general documentation and for how to add ssh keys to the LDAP. Please be
-aware of the security implications of using RSA authentication and ssh
-agents.
+aware of the security implications of using using public-key authentication
+and ssh agents.
 
 Your password to access db.debian.org can be found encrypted with your
 PGP key and appended to this message.  It cannot be used to log into