Module Name: src
Committed By: rin
Date: Thu Oct 3 08:14:13 UTC 2024
Modified Files:
src/crypto/external/bsd/openssh/dist: kex.c
Log Message:
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.37 -r1.38 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.37 src/crypto/external/bsd/openssh/dist/kex.c:1.38
--- src/crypto/external/bsd/openssh/dist/kex.c:1.37 Tue Sep 24 21:32:18 2024
+++ src/crypto/external/bsd/openssh/dist/kex.c Thu Oct 3 08:14:13 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: kex.c,v 1.37 2024/09/24 21:32:18 christos Exp $ */
+/* $NetBSD: kex.c,v 1.38 2024/10/03 08:14:13 rin Exp $ */
/* $OpenBSD: kex.c,v 1.187 2024/08/23 04:51:00 deraadt Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: kex.c,v 1.37 2024/09/24 21:32:18 christos Exp $");
+__RCSID("$NetBSD: kex.c,v 1.38 2024/10/03 08:14:13 rin Exp $");
#include <sys/param.h> /* MAX roundup */
#include <sys/types.h>
@@ -1051,7 +1051,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;
