diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2021-01-22 02:44:59 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2021-01-22 02:44:59 +0000 |
| commit | 93d7e143add6d68247ed22f4a78298a2b9592164 (patch) | |
| tree | 7062af29e509e03cc6dcd9bb4f48985b999c2329 /usr.bin/ssh/auth2-pubkey.c | |
| parent | 4ee16b98d7957af264d2168ac83109e9d6506cfe (diff) | |
Rename PubkeyAcceptedKeyTypes keyword to PubkeyAcceptedAlgorithms.
While the two were originally equivalent, this actually specifies the
signature algorithms that are accepted. Some key types (eg RSA) can be
used by multiple algorithms (eg ssh-rsa, rsa-sha2-512) so the old name is
becoming increasingly misleading. The old name is retained as an alias.
Prompted by bz#3253, help & ok djm@, man page help jmc@
Diffstat (limited to 'usr.bin/ssh/auth2-pubkey.c')
| -rw-r--r-- | usr.bin/ssh/auth2-pubkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/auth2-pubkey.c b/usr.bin/ssh/auth2-pubkey.c index f06a30e688e..9b5cd2441ca 100644 --- a/usr.bin/ssh/auth2-pubkey.c +++ b/usr.bin/ssh/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.103 2020/12/22 00:12:22 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.104 2021/01/22 02:44:58 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -147,8 +147,8 @@ userauth_pubkey(struct ssh *ssh) logit("refusing previously-used %s key", sshkey_type(key)); goto done; } - if (match_pattern_list(pkalg, options.pubkey_key_types, 0) != 1) { - logit_f("key type %s not in PubkeyAcceptedKeyTypes", + if (match_pattern_list(pkalg, options.pubkey_accepted_algos, 0) != 1) { + logit_f("key type %s not in PubkeyAcceptedAlgorithms", sshkey_ssh_name(key)); goto done; } |