summaryrefslogtreecommitdiff
path: root/ssh-add.c
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2020-02-06 22:30:54 +0000
committerDamien Miller <djm@mindrot.org>2020-02-07 09:52:59 +1100
commita47f6a6c0e06628eed0c2a08dc31a8923bcc37ba (patch)
tree4f65bc75647cf817ea926a6a585defd3af534d24 /ssh-add.c
parent849a9b87144f8a5b1771de6c85e44bfeb86be9a9 (diff)
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
Diffstat (limited to 'ssh-add.c')
-rw-r--r--ssh-add.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh-add.c b/ssh-add.c
index f3b666c93..8057eb1fe 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.151 2020/01/25 23:02:13 djm Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.152 2020/02/06 22:30:54 naddy Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -315,8 +315,8 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag,
315 if (!sshkey_is_sk(private)) 315 if (!sshkey_is_sk(private))
316 skprovider = NULL; /* Don't send constraint for other keys */ 316 skprovider = NULL; /* Don't send constraint for other keys */
317 else if (skprovider == NULL) { 317 else if (skprovider == NULL) {
318 fprintf(stderr, "Cannot load security key %s without " 318 fprintf(stderr, "Cannot load authenticator-hosted key %s "
319 "provider\n", filename); 319 "without provider\n", filename);
320 goto out; 320 goto out;
321 } 321 }
322 322
@@ -546,7 +546,7 @@ load_resident_keys(int agent_fd, const char *skprovider, int qflag)
546 int r, ok = 0; 546 int r, ok = 0;
547 char *fp; 547 char *fp;
548 548
549 pass = read_passphrase("Enter PIN for security key: ", RP_ALLOW_STDIN); 549 pass = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN);
550 if ((r = sshsk_load_resident(skprovider, NULL, pass, 550 if ((r = sshsk_load_resident(skprovider, NULL, pass,
551 &keys, &nkeys)) != 0) { 551 &keys, &nkeys)) != 0) {
552 error("Unable to load resident keys: %s", ssh_err(r)); 552 error("Unable to load resident keys: %s", ssh_err(r));