diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-09-03 23:33:13 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-09-04 09:38:57 +1000 |
commit | 22376d27a349f62c502fec3396dfe0fdcb2a40b7 (patch) | |
tree | 8368234874273df676d62ffab3bfc184ef58405f /readconf.h | |
parent | ff3c42384033514e248ba5d7376aa033f4a2b99a (diff) |
upstream commit
Expand ssh_config's StrictModes option with two new
settings:
StrictModes=accept-new will automatically accept hitherto-unseen keys
but will refuse connections for changed or invalid hostkeys.
StrictModes=off is the same as StrictModes=no
Motivation:
StrictModes=no combines two behaviours for host key processing:
automatically learning new hostkeys and continuing to connect to hosts
with invalid/changed hostkeys. The latter behaviour is quite dangerous
since it removes most of the protections the SSH protocol is supposed to
provide.
Quite a few users want to automatically learn hostkeys however, so
this makes that feature available with less danger.
At some point in the future, StrictModes=no will change to be a synonym
for accept-new, with its current behaviour remaining available via
StrictModes=off.
bz#2400, suggested by Michael Samuel; ok markus
Upstream-ID: 0f55502bf75fc93a74fb9853264a8276b9680b64
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index 94dd427f5..22fe5c187 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.122 2017/05/30 18:58:37 bluhm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.123 2017/09/03 23:33:13 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -190,6 +190,11 @@ typedef struct { | |||
190 | #define SSH_UPDATE_HOSTKEYS_YES 1 | 190 | #define SSH_UPDATE_HOSTKEYS_YES 1 |
191 | #define SSH_UPDATE_HOSTKEYS_ASK 2 | 191 | #define SSH_UPDATE_HOSTKEYS_ASK 2 |
192 | 192 | ||
193 | #define SSH_STRICT_HOSTKEY_OFF 0 | ||
194 | #define SSH_STRICT_HOSTKEY_NEW 1 | ||
195 | #define SSH_STRICT_HOSTKEY_YES 2 | ||
196 | #define SSH_STRICT_HOSTKEY_ASK 3 | ||
197 | |||
193 | void initialize_options(Options *); | 198 | void initialize_options(Options *); |
194 | void fill_default_options(Options *); | 199 | void fill_default_options(Options *); |
195 | void fill_default_options_for_canonicalization(Options *); | 200 | void fill_default_options_for_canonicalization(Options *); |