Module Name: src
Committed By: martin
Date: Tue Oct 8 11:07:03 UTC 2024
Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-9]: kex.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1892):
crypto/external/bsd/openssh/dist/kex.c: revision 1.38
openssh: kex: Do not pass NULL as %s for logit() in our local diff
newkeys->mac.name can be NULL since OpenSSH 6.2:
http://cvsweb.netbsd.org/bsdweb.cgi/src/crypto/external/bsd/openssh/dist/kex.c.diff?r1=1.1.1.4&r2=1.1.1.5&f=h
Use "<implicit>" as done for debug() in the upstream code.
This is harmless for our snprintf(3) implementation although.
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/crypto/external/bsd/openssh/dist/kex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/kex.c
diff -u src/crypto/external/bsd/openssh/dist/kex.c:1.24.2.1 src/crypto/external/bsd/openssh/dist/kex.c:1.24.2.2
--- src/crypto/external/bsd/openssh/dist/kex.c:1.24.2.1 Mon Dec 25 12:31:04 2023
+++ src/crypto/external/bsd/openssh/dist/kex.c Tue Oct 8 11:07:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: kex.c,v 1.24.2.1 2023/12/25 12:31:04 martin Exp $ */
+/* $NetBSD: kex.c,v 1.24.2.2 2024/10/08 11:07:03 martin Exp $ */
/* $OpenBSD: kex.c,v 1.184 2023/12/18 14:45:49 djm Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: kex.c,v 1.24.2.1 2023/12/25 12:31:04 martin Exp $");
+__RCSID("$NetBSD: kex.c,v 1.24.2.2 2024/10/08 11:07:03 martin Exp $");
#include <sys/param.h> /* MAX roundup */
#include <sys/types.h>
@@ -1270,7 +1270,7 @@ kex_choose_conf(struct ssh *ssh, uint32_
ssh_remote_ipaddr(ssh),
ssh_remote_port(ssh),
newkeys->enc.name,
- newkeys->mac.name,
+ authlen == 0 ? newkeys->mac.name : "<implicit>",
newkeys->comp.name);
}
log_flag = 1;
