]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: s/%.100s/%s/ in SSH- banner construction as there's no
authordjm@openbsd.org <djm@openbsd.org>
Wed, 11 Oct 2023 04:46:29 +0000 (04:46 +0000)
committerDamien Miller <djm@mindrot.org>
Wed, 11 Oct 2023 04:57:09 +0000 (15:57 +1100)
reason to limit its size: the version string bring included is a compile time
constant going into an allocated banner string.

OpenBSD-Commit-ID: 0ef73304b9bf3e534c60900cd84ab699f859ebcd

kex.c

diff --git a/kex.c b/kex.c
index 8ff92f2a2d5e7c71b3fee181b3b2b700de12dc61..aa5e792ddc5d47b1d21676dc84d0bee80c66c5d4 100644 (file)
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.181 2023/08/28 03:28:43 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.182 2023/10/11 04:46:29 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -1310,7 +1310,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
        sshbuf_reset(our_version);
        if (version_addendum != NULL && *version_addendum == '\0')
                version_addendum = NULL;
-       if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
+       if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s\r\n",
            PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
            version_addendum == NULL ? "" : " ",
            version_addendum == NULL ? "" : version_addendum)) != 0) {