summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2021-01-22 02:44:58 +0000
committerDarren Tucker <dtucker@dtucker.net>2021-01-22 15:03:56 +1100
commitee9c0da8035b3168e8e57c1dedc2d1b0daf00eec (patch)
treef7e1994cbf8c3da79a7ea53d71147851e89de30c /readconf.h
parenta8e798feabe36d02de292bcfd274712cae1d8d17 (diff)
downloadopenssh-git-ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec.tar.gz
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 'readconf.h')
-rw-r--r--readconf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h
index 85ea2e11..4ee730b9 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.137 2020/12/22 00:15:23 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.138 2021/01/22 02:44:58 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -162,7 +162,7 @@ typedef struct {
int update_hostkeys; /* one of SSH_UPDATE_HOSTKEYS_* */
char *hostbased_key_types;
- char *pubkey_key_types;
+ char *pubkey_accepted_algos;
char *jump_user;
char *jump_host;