diff options
Diffstat (limited to 'debian/patches/package-versioning.patch')
-rw-r--r-- | debian/patches/package-versioning.patch | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch index 566761b3a..0d851e68c 100644 --- a/debian/patches/package-versioning.patch +++ b/debian/patches/package-versioning.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 24262015f741a40c9374b15d24c23b8e98b7b7ae Mon Sep 17 00:00:00 2001 | 1 | From 326b09bce8058629980cc92f289fd7912269eb98 Mon Sep 17 00:00:00 2001 |
2 | From: Matthew Vernon <matthew@debian.org> | 2 | From: Matthew Vernon <matthew@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:05 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:05 +0000 |
4 | Subject: Include the Debian version in our identification | 4 | Subject: Include the Debian version in our identification |
@@ -9,34 +9,30 @@ generally just try attacks rather than bothering to scan for | |||
9 | vulnerable-looking version strings. (However, see debian-banner.patch.) | 9 | vulnerable-looking version strings. (However, see debian-banner.patch.) |
10 | 10 | ||
11 | Forwarded: not-needed | 11 | Forwarded: not-needed |
12 | Last-Update: 2013-09-14 | 12 | Last-Update: 2017-10-04 |
13 | 13 | ||
14 | Patch-Name: package-versioning.patch | 14 | Patch-Name: package-versioning.patch |
15 | --- | 15 | --- |
16 | sshconnect.c | 4 ++-- | 16 | sshconnect.c | 2 +- |
17 | sshd.c | 2 +- | 17 | sshd.c | 2 +- |
18 | version.h | 7 ++++++- | 18 | version.h | 7 ++++++- |
19 | 3 files changed, 9 insertions(+), 4 deletions(-) | 19 | 3 files changed, 8 insertions(+), 3 deletions(-) |
20 | 20 | ||
21 | diff --git a/sshconnect.c b/sshconnect.c | 21 | diff --git a/sshconnect.c b/sshconnect.c |
22 | index 881b0886..d9ed5910 100644 | 22 | index 7ce2716c..3280b310 100644 |
23 | --- a/sshconnect.c | 23 | --- a/sshconnect.c |
24 | +++ b/sshconnect.c | 24 | +++ b/sshconnect.c |
25 | @@ -526,10 +526,10 @@ send_client_banner(int connection_out, int minor1) | 25 | @@ -517,7 +517,7 @@ send_client_banner(int connection_out, int minor1) |
26 | { | ||
26 | /* Send our own protocol version identification. */ | 27 | /* Send our own protocol version identification. */ |
27 | if (compat20) { | 28 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", |
28 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", | 29 | - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); |
29 | - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); | 30 | + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); |
30 | + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); | ||
31 | } else { | ||
32 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", | ||
33 | - PROTOCOL_MAJOR_1, minor1, SSH_VERSION); | ||
34 | + PROTOCOL_MAJOR_1, minor1, SSH_RELEASE); | ||
35 | } | ||
36 | if (atomicio(vwrite, connection_out, client_version_string, | 31 | if (atomicio(vwrite, connection_out, client_version_string, |
37 | strlen(client_version_string)) != strlen(client_version_string)) | 32 | strlen(client_version_string)) != strlen(client_version_string)) |
33 | fatal("write: %.100s", strerror(errno)); | ||
38 | diff --git a/sshd.c b/sshd.c | 34 | diff --git a/sshd.c b/sshd.c |
39 | index 9221632e..602f4740 100644 | 35 | index af1ec337..eccf81bb 100644 |
40 | --- a/sshd.c | 36 | --- a/sshd.c |
41 | +++ b/sshd.c | 37 | +++ b/sshd.c |
42 | @@ -378,7 +378,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) | 38 | @@ -378,7 +378,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) |
@@ -49,11 +45,11 @@ index 9221632e..602f4740 100644 | |||
49 | options.version_addendum); | 45 | options.version_addendum); |
50 | 46 | ||
51 | diff --git a/version.h b/version.h | 47 | diff --git a/version.h b/version.h |
52 | index c86e2097..f4d8b13a 100644 | 48 | index e093f623..b7c5ad2a 100644 |
53 | --- a/version.h | 49 | --- a/version.h |
54 | +++ b/version.h | 50 | +++ b/version.h |
55 | @@ -3,4 +3,9 @@ | 51 | @@ -3,4 +3,9 @@ |
56 | #define SSH_VERSION "OpenSSH_7.5" | 52 | #define SSH_VERSION "OpenSSH_7.6" |
57 | 53 | ||
58 | #define SSH_PORTABLE "p1" | 54 | #define SSH_PORTABLE "p1" |
59 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE | 55 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |