diff options
-rw-r--r-- | sshconnect.c | 2 | ||||
-rw-r--r-- | sshd.c | 2 | ||||
-rw-r--r-- | version.h | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index 7ce2716cf..3280b310d 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -517,7 +517,7 @@ send_client_banner(int connection_out, int minor1) | |||
517 | { | 517 | { |
518 | /* Send our own protocol version identification. */ | 518 | /* Send our own protocol version identification. */ |
519 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", | 519 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", |
520 | PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); | 520 | PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); |
521 | if (atomicio(vwrite, connection_out, client_version_string, | 521 | if (atomicio(vwrite, connection_out, client_version_string, |
522 | strlen(client_version_string)) != strlen(client_version_string)) | 522 | strlen(client_version_string)) != strlen(client_version_string)) |
523 | fatal("write: %.100s", strerror(errno)); | 523 | fatal("write: %.100s", strerror(errno)); |
@@ -378,7 +378,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) | |||
378 | char remote_version[256]; /* Must be at least as big as buf. */ | 378 | char remote_version[256]; /* Must be at least as big as buf. */ |
379 | 379 | ||
380 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", | 380 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", |
381 | PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, | 381 | PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, |
382 | *options.version_addendum == '\0' ? "" : " ", | 382 | *options.version_addendum == '\0' ? "" : " ", |
383 | options.version_addendum); | 383 | options.version_addendum); |
384 | 384 | ||
@@ -3,4 +3,9 @@ | |||
3 | #define SSH_VERSION "OpenSSH_7.6" | 3 | #define SSH_VERSION "OpenSSH_7.6" |
4 | 4 | ||
5 | #define SSH_PORTABLE "p1" | 5 | #define SSH_PORTABLE "p1" |
6 | #define SSH_RELEASE SSH_VERSION SSH_PORTABLE | 6 | #define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE |
7 | #ifdef SSH_EXTRAVERSION | ||
8 | #define SSH_RELEASE SSH_RELEASE_MINIMUM " " SSH_EXTRAVERSION | ||
9 | #else | ||
10 | #define SSH_RELEASE SSH_RELEASE_MINIMUM | ||
11 | #endif | ||