diff options
| author |   dtucker <dtucker@openbsd.org> | 2021-01-22 02:44:58 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2021-01-22 02:44:58 +0000 |
| commit | 71ae1114819ff58f380296276b4b4ed8cd6a33a2 (patch) | |
| tree | 733a51cd08d581c84a1bcf6b7a3989aa88aec8eb /usr.bin/ssh/ssh.c | |
| parent | when using fake keys, skip the private key check (diff) | |
| download | wireguard-openbsd-71ae1114819ff58f380296276b4b4ed8cd6a33a2.tar.xz wireguard-openbsd-71ae1114819ff58f380296276b4b4ed8cd6a33a2.zip | |
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/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 3ad1cd9123b..6aa92326357 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.546 2020/12/20 23:40:19 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.547 2021/01/22 02:44:58 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -773,7 +773,8 @@ main(int ac, char **av) else if (strcmp(optarg, "key-plain") == 0) cp = sshkey_alg_list(0, 1, 0, '\n'); else if (strcmp(optarg, "key-sig") == 0 || - strcasecmp(optarg, "PubkeyAcceptedKeyTypes") == 0 || + strcasecmp(optarg, "PubkeyAcceptedKeyTypes") == 0 || /* deprecated name */ + strcasecmp(optarg, "PubkeyAcceptedAlgorithms") == 0 || strcasecmp(optarg, "HostKeyAlgorithms") == 0 || strcasecmp(optarg, "HostbasedKeyTypes") == 0 || strcasecmp(optarg, "HostbasedAcceptedKeyTypes") == 0) |