]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Don't pass NULL as a string in debugging as it does not work
authordtucker@openbsd.org <dtucker@openbsd.org>
Tue, 4 May 2021 22:53:52 +0000 (22:53 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Wed, 5 May 2021 00:08:43 +0000 (10:08 +1000)
on some platforms in -portable.  ok djm@

OpenBSD-Commit-ID: 937c892c99aa3c9c272a8ed78fa7c2aba3a44fc9

clientloop.c

index cbfe098b7a452e7f8b88f20bd31379580f99e721..219f0e9048acd9674c9a7cb2a9edf41d1f5e253b 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.361 2021/05/03 00:16:45 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.362 2021/05/04 22:53:52 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2156,7 +2156,7 @@ client_global_hostkeys_private_confirm(struct ssh *ssh, int type,
                    sshkey_type_plain(ctx->keys[i]->type) == KEY_RSA;
                debug3_f("verify %s key %zu using %s sigalg",
                    sshkey_type(ctx->keys[i]), i,
-                   use_kexsigtype ? ssh->kex->hostkey_alg : NULL);
+                   use_kexsigtype ? ssh->kex->hostkey_alg : "default");
                if ((r = sshkey_verify(ctx->keys[i], sig, siglen,
                    sshbuf_ptr(signdata), sshbuf_len(signdata),
                    use_kexsigtype ? ssh->kex->hostkey_alg : NULL, 0,