summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 3b84a2d56..4c4a61ba0 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.318 2020/01/23 10:24:30 dtucker Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.319 2020/02/06 22:30:54 naddy Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -613,7 +613,7 @@ format_identity(Identity *id)
613 if ((id->key->flags & SSHKEY_FLAG_EXT) != 0) 613 if ((id->key->flags & SSHKEY_FLAG_EXT) != 0)
614 note = " token"; 614 note = " token";
615 else if (sshkey_is_sk(id->key)) 615 else if (sshkey_is_sk(id->key))
616 note = " security-key"; 616 note = " authenticator";
617 } 617 }
618 xasprintf(&ret, "%s %s%s%s%s%s%s", 618 xasprintf(&ret, "%s %s%s%s%s%s%s",
619 id->filename, 619 id->filename,
@@ -1487,8 +1487,8 @@ load_identity_file(Identity *id)
1487 } 1487 }
1488 if (private != NULL && sshkey_is_sk(private) && 1488 if (private != NULL && sshkey_is_sk(private) &&
1489 options.sk_provider == NULL) { 1489 options.sk_provider == NULL) {
1490 debug("key \"%s\" is a security key, but no " 1490 debug("key \"%s\" is an authenticator-hosted key, "
1491 "provider specified", id->filename); 1491 "but no provider specified", id->filename);
1492 sshkey_free(private); 1492 sshkey_free(private);
1493 private = NULL; 1493 private = NULL;
1494 quit = 1; 1494 quit = 1;
@@ -1571,7 +1571,7 @@ pubkey_prepare(Authctxt *authctxt)
1571 continue; 1571 continue;
1572 } 1572 }
1573 if (key && sshkey_is_sk(key) && options.sk_provider == NULL) { 1573 if (key && sshkey_is_sk(key) && options.sk_provider == NULL) {
1574 debug("%s: ignoring security key %s as no " 1574 debug("%s: ignoring authenticator-hosted key %s as no "
1575 "SecurityKeyProvider has been specified", 1575 "SecurityKeyProvider has been specified",
1576 __func__, options.identity_files[i]); 1576 __func__, options.identity_files[i]);
1577 continue; 1577 continue;
@@ -1595,7 +1595,8 @@ pubkey_prepare(Authctxt *authctxt)
1595 continue; 1595 continue;
1596 } 1596 }
1597 if (key && sshkey_is_sk(key) && options.sk_provider == NULL) { 1597 if (key && sshkey_is_sk(key) && options.sk_provider == NULL) {
1598 debug("%s: ignoring security key certificate %s as no " 1598 debug("%s: ignoring authenticator-hosted key "
1599 "certificate %s as no "
1599 "SecurityKeyProvider has been specified", 1600 "SecurityKeyProvider has been specified",
1600 __func__, options.identity_files[i]); 1601 __func__, options.identity_files[i]);
1601 continue; 1602 continue;