diff options
author | Colin Watson <cjwatson@debian.org> | 2019-06-05 06:41:44 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2019-06-09 22:09:07 +0100 |
commit | 865a97e05b6aab1619e1c8eeb33ccb8f9a9e48d3 (patch) | |
tree | 7bb2128eb663180bacfabca88f26d26bf0733824 /debian/patches/package-versioning.patch | |
parent | ba627ba172d6649919baedff5ba2789610da382a (diff) | |
parent | 7d50f9e5be88179325983a1f58c9d51bb58f025a (diff) |
New upstream release (8.0p1)
Diffstat (limited to 'debian/patches/package-versioning.patch')
-rw-r--r-- | debian/patches/package-versioning.patch | 54 |
1 files changed, 20 insertions, 34 deletions
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch index 809c78846..0d2be82dc 100644 --- a/debian/patches/package-versioning.patch +++ b/debian/patches/package-versioning.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b258a00bedcf29200b394c671c6deb1e53157f32 Mon Sep 17 00:00:00 2001 | 1 | From 85e700a732e9a308eeee67f5a284e19fd6befbb8 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,47 +9,33 @@ 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: 2017-10-04 | 12 | Last-Update: 2019-06-05 |
13 | 13 | ||
14 | Patch-Name: package-versioning.patch | 14 | Patch-Name: package-versioning.patch |
15 | --- | 15 | --- |
16 | sshconnect.c | 2 +- | 16 | kex.c | 2 +- |
17 | sshd.c | 2 +- | 17 | version.h | 7 ++++++- |
18 | version.h | 7 ++++++- | 18 | 2 files changed, 7 insertions(+), 2 deletions(-) |
19 | 3 files changed, 8 insertions(+), 3 deletions(-) | ||
20 | 19 | ||
21 | diff --git a/sshconnect.c b/sshconnect.c | 20 | diff --git a/kex.c b/kex.c |
22 | index 158e8146f..b9418e277 100644 | 21 | index a2a4794e8..be354206d 100644 |
23 | --- a/sshconnect.c | 22 | --- a/kex.c |
24 | +++ b/sshconnect.c | 23 | +++ b/kex.c |
25 | @@ -609,7 +609,7 @@ send_client_banner(int connection_out, int minor1) | 24 | @@ -1186,7 +1186,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, |
26 | { | 25 | if (version_addendum != NULL && *version_addendum == '\0') |
27 | /* Send our own protocol version identification. */ | 26 | version_addendum = NULL; |
28 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", | 27 | if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", |
29 | - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); | 28 | - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, |
30 | + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); | 29 | + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, |
31 | if (atomicio(vwrite, connection_out, client_version_string, | 30 | version_addendum == NULL ? "" : " ", |
32 | strlen(client_version_string)) != strlen(client_version_string)) | 31 | version_addendum == NULL ? "" : version_addendum)) != 0) { |
33 | fatal("write: %.100s", strerror(errno)); | 32 | error("%s: sshbuf_putf: %s", __func__, ssh_err(r)); |
34 | diff --git a/sshd.c b/sshd.c | ||
35 | index 2bc6679e5..9481272fc 100644 | ||
36 | --- a/sshd.c | ||
37 | +++ b/sshd.c | ||
38 | @@ -384,7 +384,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) | ||
39 | char remote_version[256]; /* Must be at least as big as buf. */ | ||
40 | |||
41 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", | ||
42 | - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, | ||
43 | + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, | ||
44 | *options.version_addendum == '\0' ? "" : " ", | ||
45 | options.version_addendum); | ||
46 | |||
47 | diff --git a/version.h b/version.h | 33 | diff --git a/version.h b/version.h |
48 | index 422dfbc3a..5e1ce0426 100644 | 34 | index 806ead9a6..599c859e6 100644 |
49 | --- a/version.h | 35 | --- a/version.h |
50 | +++ b/version.h | 36 | +++ b/version.h |
51 | @@ -3,4 +3,9 @@ | 37 | @@ -3,4 +3,9 @@ |
52 | #define SSH_VERSION "OpenSSH_7.9" | 38 | #define SSH_VERSION "OpenSSH_8.0" |
53 | 39 | ||
54 | #define SSH_PORTABLE "p1" | 40 | #define SSH_PORTABLE "p1" |
55 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE | 41 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |