upstream: Replace "security key" with "authenticator" in program

messages.

This replaces "security key" in error/usage/verbose messages and
distinguishes between "authenticator" and "authenticator-hosted key".

ok djm@

OpenBSD-Commit-ID: 7c63800e9c340c59440a054cde9790a78f18592e

1 files changed, 4 insertions, 3 deletions

diff --git a/monitor.c b/monitor.c
index dc6d78d3c..2ce89fe90 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.207 2020/01/23 07:10:22 dtucker Exp $ */
+/* $OpenBSD: monitor.c,v 1.208 2020/02/06 22:30:54 naddy Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1445,8 +1445,9 @@ mm_answer_keyverify(struct ssh *ssh, int sock, struct sshbuf *m)
                 if (req_presence &&
                     (sig_details->sk_flags & SSH_SK_USER_PRESENCE_REQD) == 0) {
                         error("public key %s %s signature for %s%s from %.128s "
-                            "port %d rejected: user presence (key touch) "
-                            "requirement not met ", sshkey_type(key), fp,
+                            "port %d rejected: user presence "
+                            "(authenticator touch) requirement not met ",
+                            sshkey_type(key), fp,
                             authctxt->valid ? "" : "invalid user ",
                             authctxt->user, ssh_remote_ipaddr(ssh),
                             ssh_remote_port(ssh));