summaryrefslogtreecommitdiff
path: root/debian/patches/no-dsa-host-key-by-default.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/no-dsa-host-key-by-default.patch')
-rw-r--r--debian/patches/no-dsa-host-key-by-default.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/no-dsa-host-key-by-default.patch b/debian/patches/no-dsa-host-key-by-default.patch
index 92f9d7c61..c24ff4e3f 100644
--- a/debian/patches/no-dsa-host-key-by-default.patch
+++ b/debian/patches/no-dsa-host-key-by-default.patch
@@ -1,4 +1,4 @@
1From 5fc5168dde0c840bf743058d235193fc27e61cab Mon Sep 17 00:00:00 2001 1From 922f3a7599d03234b6bb2ffb22a33624e7cf1953 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Mon, 16 Jan 2017 13:53:04 +0000 3Date: Mon, 16 Jan 2017 13:53:04 +0000
4Subject: Remove ssh_host_dsa_key from HostKey default 4Subject: Remove ssh_host_dsa_key from HostKey default
@@ -19,10 +19,10 @@ Patch-Name: no-dsa-host-key-by-default.patch
19 4 files changed, 6 insertions(+), 11 deletions(-) 19 4 files changed, 6 insertions(+), 11 deletions(-)
20 20
21diff --git a/servconf.c b/servconf.c 21diff --git a/servconf.c b/servconf.c
22index a391cf4b..1a7a5f18 100644 22index b0146405..5e996cf8 100644
23--- a/servconf.c 23--- a/servconf.c
24+++ b/servconf.c 24+++ b/servconf.c
25@@ -204,8 +204,6 @@ fill_default_server_options(ServerOptions *options) 25@@ -205,8 +205,6 @@ fill_default_server_options(ServerOptions *options)
26 /* fill default hostkeys for protocols */ 26 /* fill default hostkeys for protocols */
27 options->host_key_files[options->num_host_key_files++] = 27 options->host_key_files[options->num_host_key_files++] =
28 _PATH_HOST_RSA_KEY_FILE; 28 _PATH_HOST_RSA_KEY_FILE;
@@ -32,7 +32,7 @@ index a391cf4b..1a7a5f18 100644
32 options->host_key_files[options->num_host_key_files++] = 32 options->host_key_files[options->num_host_key_files++] =
33 _PATH_HOST_ECDSA_KEY_FILE; 33 _PATH_HOST_ECDSA_KEY_FILE;
34diff --git a/sshd.8 b/sshd.8 34diff --git a/sshd.8 b/sshd.8
35index 6355178f..f038fb82 100644 35index 02c5e1df..8c230657 100644
36--- a/sshd.8 36--- a/sshd.8
37+++ b/sshd.8 37+++ b/sshd.8
38@@ -164,11 +164,10 @@ This option must be given if 38@@ -164,11 +164,10 @@ This option must be given if
@@ -63,10 +63,10 @@ index f68edf36..92822959 100644
63 #HostKey /etc/ssh/ssh_host_ed25519_key 63 #HostKey /etc/ssh/ssh_host_ed25519_key
64 64
65diff --git a/sshd_config.5 b/sshd_config.5 65diff --git a/sshd_config.5 b/sshd_config.5
66index cc5d9fb0..0747cc8b 100644 66index 16be4f62..ef520680 100644
67--- a/sshd_config.5 67--- a/sshd_config.5
68+++ b/sshd_config.5 68+++ b/sshd_config.5
69@@ -741,11 +741,10 @@ is not to load any certificates. 69@@ -749,11 +749,10 @@ is not to load any certificates.
70 Specifies a file containing a private host key 70 Specifies a file containing a private host key
71 used by SSH. 71 used by SSH.
72 The defaults are 72 The defaults are