2 files changed, 12 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 91e4bf3f6..ce309ff7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.1p2-2) UNRELEASED; urgency=medium
+
+  * Remove protocol 1 host key generation from openssh-server.postinst
+    (closes: #811265).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 17 Jan 2016 14:03:36 +0000
+
 openssh (1:7.1p2-1) unstable; urgency=high
 
   * New upstream release (http://www.openssh.com/txt/release-7.1p2):
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 2c6c53d88..45121534d 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -79,18 +79,11 @@ host_keys_required() {
                 echo "$hostkeys"
         else
                 # No HostKey directives at all, so the server picks some
-                # defaults depending on the setting of Protocol.
-                protocol="$(get_config_option Protocol)"
-                [ "$protocol" ] || protocol=1,2
-                if echo "$protocol" | grep 1 >/dev/null; then
-                        echo /etc/ssh/ssh_host_key
-                fi
-                if echo "$protocol" | grep 2 >/dev/null; then
-                        echo /etc/ssh/ssh_host_rsa_key
-                        echo /etc/ssh/ssh_host_dsa_key
-                        echo /etc/ssh/ssh_host_ecdsa_key
-                        echo /etc/ssh/ssh_host_ed25519_key
-                fi
+                # defaults.
+                echo /etc/ssh/ssh_host_rsa_key
+                echo /etc/ssh/ssh_host_dsa_key
+                echo /etc/ssh/ssh_host_ecdsa_key
+                echo /etc/ssh/ssh_host_ed25519_key
         fi
 }
 
@@ -119,9 +112,6 @@ create_key() {
 create_keys() {
         hostkeys="$(host_keys_required)"
 
-        create_key "Creating SSH1 key; this may take some time ..." \
-                "$hostkeys" /etc/ssh/ssh_host_key -t rsa1
-
         create_key "Creating SSH2 RSA key; this may take some time ..." \
                 "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa
         create_key "Creating SSH2 DSA key; this may take some time ..." \