[openssh-commits] [openssh] 02/03: upstream: Include local and remote versions in ~I connection info.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 941d7632096abd37bb10826cf8f08c5cfb99ccc4
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Tue Sep 22 00:24:47 2026 +0000

    upstream: Include local and remote versions in ~I connection info.
    
    ok job@ djm at .
    
    OpenBSD-Commit-ID: 8cc5d41e5e034e86de66c1e3bfda52c95f0e1c52
---
 kex.c    | 4 ++--
 packet.c | 5 ++++-
 packet.h | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kex.c b/kex.c
index af9108b7b..d3015e8af 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.195 2026/09/16 00:29:44 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.196 2026/09/22 00:24:47 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -1473,7 +1473,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
  out:
 	free(our_version_string);
 	free(peer_version_string);
-	free(remote_version);
+	ssh->remote_version = remote_version;  /* transferred */
 	if (r == SSH_ERR_SYSTEM_ERROR)
 		errno = oerrno;
 	return r;
diff --git a/packet.c b/packet.c
index fe78097d2..09343197e 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.343 2026/09/16 00:29:44 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.344 2026/09/22 00:24:47 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -87,6 +87,7 @@
 #include "packet.h"
 #include "ssherr.h"
 #include "sshbuf.h"
+#include "version.h"
 
 #ifdef PACKET_DEBUG
 #define DBG(x) x
@@ -3104,6 +3105,7 @@ connection_info_message(struct ssh *ssh)
 	comp_info = comp_status_message(ssh);
 
 	xasprintf(&ret, "Connection information for %s pid %lld\r\n"
+	    "  versions %s -> %s\r\n"
 	    "%s"
 	    "  duration %s\r\n"
 	    "  kexalgorithm %s\r\n  hostkeyalgorithm %s\r\n"
@@ -3112,6 +3114,7 @@ connection_info_message(struct ssh *ssh)
 	    "  traffic %s in, %s out\r\n"
 	    "%s",
 	    thishost, (long long)getpid(),
+	    SSH_RELEASE, ssh->remote_version,
 	    tcp_info,
 	    fmt_timeframe(monotime() - state->start_time),
 	    kex->name, kex->hostkey_alg,
diff --git a/packet.h b/packet.h
index 442e38bb7..ecab22a2d 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.107 2026/03/03 09:57:25 dtucker Exp $ */
+/* $OpenBSD: packet.h,v 1.108 2026/09/22 00:24:47 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -70,6 +70,7 @@ struct ssh {
 
 	/* datafellows */
 	uint32_t compat;
+	char *remote_version;
 
 	/* Lists for private and public keys */
 	TAILQ_HEAD(, key_entry) private_keys;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.