summaryrefslogtreecommitdiffstats
path: root/auth2-pubkey.c
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2022-02-27 02:33:59 +0100
committerDamien Miller <djm@mindrot.org>2022-03-01 03:00:26 +0100
commiteceafbe0bdbbd9bd2f3cf024ccb350666a9934dd (patch)
tree32affa748fba32e59a87e82dba433fdb7e966706 /auth2-pubkey.c
parentupstream: Remove the char * casts from arguments to do_lstat, (diff)
downloadopenssh-eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd.tar.xz
openssh-eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd.zip
upstream: include rejected signature algorithm in error message and
not the (useless) key type; ok djm@ OpenBSD-Commit-ID: d0c0f552a4d9161203e07e95d58a76eb602a76ff
Diffstat (limited to '')
-rw-r--r--auth2-pubkey.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 9c2298fc8..d297a5c3d 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.112 2021/12/19 22:12:30 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.113 2022/02/27 01:33:59 naddy Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -166,8 +166,8 @@ userauth_pubkey(struct ssh *ssh, const char *method)
goto done;
}
if (match_pattern_list(pkalg, options.pubkey_accepted_algos, 0) != 1) {
- logit_f("key type %s not in PubkeyAcceptedAlgorithms",
- sshkey_ssh_name(key));
+ logit_f("signature algorithm %s not in "
+ "PubkeyAcceptedAlgorithms", pkalg);
goto done;
}
if ((r = sshkey_check_cert_sigtype(key,