diff options
Diffstat (limited to 'debian/patches/debian-banner.patch')
-rw-r--r-- | debian/patches/debian-banner.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch index d28573ed4..acf995e27 100644 --- a/debian/patches/debian-banner.patch +++ b/debian/patches/debian-banner.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0a938d856d024bfff79fac63e65df382ffa444a4 Mon Sep 17 00:00:00 2001 | 1 | From 4eb06adf69f21f387e4f2d29dad01b2ca1303094 Mon Sep 17 00:00:00 2001 |
2 | From: Kees Cook <kees@debian.org> | 2 | From: Kees Cook <kees@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:06 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:06 +0000 |
4 | Subject: Add DebianBanner server configuration option | 4 | Subject: Add DebianBanner server configuration option |
@@ -22,10 +22,10 @@ Patch-Name: debian-banner.patch | |||
22 | 7 files changed, 23 insertions(+), 5 deletions(-) | 22 | 7 files changed, 23 insertions(+), 5 deletions(-) |
23 | 23 | ||
24 | diff --git a/kex.c b/kex.c | 24 | diff --git a/kex.c b/kex.c |
25 | index be354206d..bbb7a2340 100644 | 25 | index 65ed6af02..f450bc2c7 100644 |
26 | --- a/kex.c | 26 | --- a/kex.c |
27 | +++ b/kex.c | 27 | +++ b/kex.c |
28 | @@ -1168,7 +1168,7 @@ send_error(struct ssh *ssh, char *msg) | 28 | @@ -1221,7 +1221,7 @@ send_error(struct ssh *ssh, char *msg) |
29 | */ | 29 | */ |
30 | int | 30 | int |
31 | kex_exchange_identification(struct ssh *ssh, int timeout_ms, | 31 | kex_exchange_identification(struct ssh *ssh, int timeout_ms, |
@@ -34,7 +34,7 @@ index be354206d..bbb7a2340 100644 | |||
34 | { | 34 | { |
35 | int remote_major, remote_minor, mismatch; | 35 | int remote_major, remote_minor, mismatch; |
36 | size_t len, i, n; | 36 | size_t len, i, n; |
37 | @@ -1186,7 +1186,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, | 37 | @@ -1239,7 +1239,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, |
38 | if (version_addendum != NULL && *version_addendum == '\0') | 38 | if (version_addendum != NULL && *version_addendum == '\0') |
39 | version_addendum = NULL; | 39 | version_addendum = NULL; |
40 | if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", | 40 | if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", |
@@ -45,10 +45,10 @@ index be354206d..bbb7a2340 100644 | |||
45 | version_addendum == NULL ? "" : version_addendum)) != 0) { | 45 | version_addendum == NULL ? "" : version_addendum)) != 0) { |
46 | error("%s: sshbuf_putf: %s", __func__, ssh_err(r)); | 46 | error("%s: sshbuf_putf: %s", __func__, ssh_err(r)); |
47 | diff --git a/kex.h b/kex.h | 47 | diff --git a/kex.h b/kex.h |
48 | index 2d5f1d4ed..39f67bbc1 100644 | 48 | index fe7141414..938dca03b 100644 |
49 | --- a/kex.h | 49 | --- a/kex.h |
50 | +++ b/kex.h | 50 | +++ b/kex.h |
51 | @@ -195,7 +195,7 @@ char *kex_names_cat(const char *, const char *); | 51 | @@ -194,7 +194,7 @@ char *kex_names_cat(const char *, const char *); |
52 | int kex_assemble_names(char **, const char *, const char *); | 52 | int kex_assemble_names(char **, const char *, const char *); |
53 | int kex_gss_names_valid(const char *); | 53 | int kex_gss_names_valid(const char *); |
54 | 54 | ||
@@ -58,7 +58,7 @@ index 2d5f1d4ed..39f67bbc1 100644 | |||
58 | struct kex *kex_new(void); | 58 | struct kex *kex_new(void); |
59 | int kex_ready(struct ssh *, char *[PROPOSAL_MAX]); | 59 | int kex_ready(struct ssh *, char *[PROPOSAL_MAX]); |
60 | diff --git a/servconf.c b/servconf.c | 60 | diff --git a/servconf.c b/servconf.c |
61 | index c01e0690e..8d2bced52 100644 | 61 | index 73b93c636..5576098a5 100644 |
62 | --- a/servconf.c | 62 | --- a/servconf.c |
63 | +++ b/servconf.c | 63 | +++ b/servconf.c |
64 | @@ -184,6 +184,7 @@ initialize_server_options(ServerOptions *options) | 64 | @@ -184,6 +184,7 @@ initialize_server_options(ServerOptions *options) |
@@ -94,7 +94,7 @@ index c01e0690e..8d2bced52 100644 | |||
94 | { NULL, sBadOption, 0 } | 94 | { NULL, sBadOption, 0 } |
95 | }; | 95 | }; |
96 | 96 | ||
97 | @@ -2211,6 +2216,10 @@ process_server_config_line(ServerOptions *options, char *line, | 97 | @@ -2217,6 +2222,10 @@ process_server_config_line(ServerOptions *options, char *line, |
98 | *charptr = xstrdup(arg); | 98 | *charptr = xstrdup(arg); |
99 | break; | 99 | break; |
100 | 100 | ||
@@ -106,7 +106,7 @@ index c01e0690e..8d2bced52 100644 | |||
106 | case sIgnore: | 106 | case sIgnore: |
107 | case sUnsupported: | 107 | case sUnsupported: |
108 | diff --git a/servconf.h b/servconf.h | 108 | diff --git a/servconf.h b/servconf.h |
109 | index a476d5220..986093ffa 100644 | 109 | index 29329ba1f..d5ad19065 100644 |
110 | --- a/servconf.h | 110 | --- a/servconf.h |
111 | +++ b/servconf.h | 111 | +++ b/servconf.h |
112 | @@ -214,6 +214,8 @@ typedef struct { | 112 | @@ -214,6 +214,8 @@ typedef struct { |
@@ -119,10 +119,10 @@ index a476d5220..986093ffa 100644 | |||
119 | 119 | ||
120 | /* Information about the incoming connection as used by Match */ | 120 | /* Information about the incoming connection as used by Match */ |
121 | diff --git a/sshconnect.c b/sshconnect.c | 121 | diff --git a/sshconnect.c b/sshconnect.c |
122 | index 0b6f6af4b..1183ffe0e 100644 | 122 | index 41e75a275..27daef74f 100644 |
123 | --- a/sshconnect.c | 123 | --- a/sshconnect.c |
124 | +++ b/sshconnect.c | 124 | +++ b/sshconnect.c |
125 | @@ -1287,7 +1287,7 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const char *orighost, | 125 | @@ -1291,7 +1291,7 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const char *orighost, |
126 | lowercase(host); | 126 | lowercase(host); |
127 | 127 | ||
128 | /* Exchange protocol version identification strings with the server. */ | 128 | /* Exchange protocol version identification strings with the server. */ |
@@ -132,10 +132,10 @@ index 0b6f6af4b..1183ffe0e 100644 | |||
132 | 132 | ||
133 | /* Put the connection into non-blocking mode. */ | 133 | /* Put the connection into non-blocking mode. */ |
134 | diff --git a/sshd.c b/sshd.c | 134 | diff --git a/sshd.c b/sshd.c |
135 | index e3e96426e..1e7ece588 100644 | 135 | index ea8beacb4..4e8ff0662 100644 |
136 | --- a/sshd.c | 136 | --- a/sshd.c |
137 | +++ b/sshd.c | 137 | +++ b/sshd.c |
138 | @@ -2160,7 +2160,8 @@ main(int ac, char **av) | 138 | @@ -2165,7 +2165,8 @@ main(int ac, char **av) |
139 | if (!debug_flag) | 139 | if (!debug_flag) |
140 | alarm(options.login_grace_time); | 140 | alarm(options.login_grace_time); |
141 | 141 | ||
@@ -146,10 +146,10 @@ index e3e96426e..1e7ece588 100644 | |||
146 | 146 | ||
147 | ssh_packet_set_nonblocking(ssh); | 147 | ssh_packet_set_nonblocking(ssh); |
148 | diff --git a/sshd_config.5 b/sshd_config.5 | 148 | diff --git a/sshd_config.5 b/sshd_config.5 |
149 | index 2ef671d1b..addea54a0 100644 | 149 | index eec224158..46537f177 100644 |
150 | --- a/sshd_config.5 | 150 | --- a/sshd_config.5 |
151 | +++ b/sshd_config.5 | 151 | +++ b/sshd_config.5 |
152 | @@ -543,6 +543,11 @@ or | 152 | @@ -545,6 +545,11 @@ or |
153 | .Cm no . | 153 | .Cm no . |
154 | The default is | 154 | The default is |
155 | .Cm yes . | 155 | .Cm yes . |