summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2022-11-09 01:37:44 +0000
committerDarren Tucker <dtucker@dtucker.net>2022-11-09 20:43:16 +1100
commitdb2027a687516f87c3fb141e87154bb3d8a7807c (patch)
tree5fc9fafce7d8714b1d507a149e4197b5a5f7f544
parent1c2be7c2004cf1abcd172fee9fe3eab57cd4c426 (diff)
upstream: rename client_global_hostkeys_private_confirm() to
client_global_hostkeys_prove_confirm(), as it handles the "hostkeys-prove00@openssh.com" message; no functional change OpenBSD-Commit-ID: 31e09bd3cca6eed26855b88fb8beed18e9bd026d
-rw-r--r--clientloop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c
index 0050f3eb..289d0b68 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.380 2022/06/03 04:30:46 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.381 2022/11/09 01:37:44 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1792,7 +1792,7 @@ struct hostkeys_update_ctx {
* Keys received from the server and a flag for each indicating
* whether they already exist in known_hosts.
* keys_match is filled in by hostkeys_find() and later (for new
- * keys) by client_global_hostkeys_private_confirm().
+ * keys) by client_global_hostkeys_prove_confirm().
*/
struct sshkey **keys;
u_int *keys_match; /* mask of HKF_MATCH_* from hostfile.h */
@@ -2100,7 +2100,7 @@ update_known_hosts(struct hostkeys_update_ctx *ctx)
}
static void
-client_global_hostkeys_private_confirm(struct ssh *ssh, int type,
+client_global_hostkeys_prove_confirm(struct ssh *ssh, int type,
u_int32_t seq, void *_ctx)
{
struct hostkeys_update_ctx *ctx = (struct hostkeys_update_ctx *)_ctx;
@@ -2407,7 +2407,7 @@ client_input_hostkeys(struct ssh *ssh)
if ((r = sshpkt_send(ssh)) != 0)
fatal_fr(r, "send hostkeys-prove");
client_register_global_confirm(
- client_global_hostkeys_private_confirm, ctx);
+ client_global_hostkeys_prove_confirm, ctx);
ctx = NULL; /* will be freed in callback */
/* Success */