diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-07-10 08:21:53 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-07-15 07:38:02 +0200 |
| commit | 3a1638dda19bbc73d0ae02b4c251ce08e564b4b9 (patch) | |
| tree | e74e4219344349a4f9a4393aa4c2c6b7baecb127 /readconf.h | |
| parent | upstream commit (diff) | |
| download | openssh-3a1638dda19bbc73d0ae02b4c251ce08e564b4b9.tar.xz openssh-3a1638dda19bbc73d0ae02b4c251ce08e564b4b9.zip | |
upstream commit
Turn off DSA by default; add HostKeyAlgorithms to the
server and PubkeyAcceptedKeyTypes to the client side, so it still can be
tested or turned back on; feedback and ok djm@
Upstream-ID: 8450a9e6d83f80c9bfed864ff061dfc9323cec21
Diffstat (limited to 'readconf.h')
| -rw-r--r-- | readconf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h index 576b9e352..bb2d55283 100644 --- a/readconf.h +++ b/readconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.109 2015/02/16 22:13:32 djm Exp $ */ +/* $OpenBSD: readconf.h,v 1.110 2015/07/10 06:21:53 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -150,7 +150,8 @@ typedef struct { int update_hostkeys; /* one of SSH_UPDATE_HOSTKEYS_* */ - char *hostbased_key_types; + char *hostbased_key_types; + char *pubkey_key_types; char *ignored_unknown; /* Pattern list of unknown tokens to ignore */ } Options; |