summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kex.c2
-rw-r--r--version.h7
2 files changed, 7 insertions, 2 deletions
diff --git a/kex.c b/kex.c
index e09355dbd..65ed6af02 100644
--- a/kex.c
+++ b/kex.c
@@ -1239,7 +1239,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
1239 if (version_addendum != NULL && *version_addendum == '\0') 1239 if (version_addendum != NULL && *version_addendum == '\0')
1240 version_addendum = NULL; 1240 version_addendum = NULL;
1241 if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", 1241 if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
1242 PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, 1242 PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
1243 version_addendum == NULL ? "" : " ", 1243 version_addendum == NULL ? "" : " ",
1244 version_addendum == NULL ? "" : version_addendum)) != 0) { 1244 version_addendum == NULL ? "" : version_addendum)) != 0) {
1245 error("%s: sshbuf_putf: %s", __func__, ssh_err(r)); 1245 error("%s: sshbuf_putf: %s", __func__, ssh_err(r));
diff --git a/version.h b/version.h
index 6b3fadf89..a24017eca 100644
--- a/version.h
+++ b/version.h
@@ -3,4 +3,9 @@
3#define SSH_VERSION "OpenSSH_8.1" 3#define SSH_VERSION "OpenSSH_8.1"
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