diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-07-10 06:21:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-07-15 15:38:02 +1000 |
commit | 3a1638dda19bbc73d0ae02b4c251ce08e564b4b9 (patch) | |
tree | e74e4219344349a4f9a4393aa4c2c6b7baecb127 /readconf.h | |
parent | 16db0a7ee9a87945cc594d13863cfcb86038db59 (diff) |
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 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.109 2015/02/16 22:13:32 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.110 2015/07/10 06:21:53 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -150,7 +150,8 @@ typedef struct { | |||
150 | 150 | ||
151 | int update_hostkeys; /* one of SSH_UPDATE_HOSTKEYS_* */ | 151 | int update_hostkeys; /* one of SSH_UPDATE_HOSTKEYS_* */ |
152 | 152 | ||
153 | char *hostbased_key_types; | 153 | char *hostbased_key_types; |
154 | char *pubkey_key_types; | ||
154 | 155 | ||
155 | char *ignored_unknown; /* Pattern list of unknown tokens to ignore */ | 156 | char *ignored_unknown; /* Pattern list of unknown tokens to ignore */ |
156 | } Options; | 157 | } Options; |