diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-01-22 03:44:58 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-01-22 05:03:56 +0100 |
| commit | ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec (patch) | |
| tree | f7e1994cbf8c3da79a7ea53d71147851e89de30c /monitor.c | |
| parent | upstream: Change types in convtime() unit test to int to match change (diff) | |
| download | openssh-ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec.tar.xz openssh-ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec.zip | |
upstream: 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@
OpenBSD-Commit-ID: 0346b2f73f54c43d4e001089759d149bfe402ca5
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.219 2020/12/29 00:59:15 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.220 2021/01/22 02:44:58 dtucker Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -1186,7 +1186,7 @@ mm_answer_keyallowed(struct ssh *ssh, int sock, struct sshbuf *m) if (auth2_key_already_used(authctxt, key)) break; if (!key_base_type_match(auth_method, key, - options.pubkey_key_types)) + options.pubkey_accepted_algos)) break; allowed = user_key_allowed(ssh, authctxt->pw, key, pubkey_auth_attempt, &opts); |