diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-02-16 22:13:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-02-17 09:32:32 +1100 |
commit | 523463a3a2a9bfc6cfc5afa01bae9147f76a37cc (patch) | |
tree | 772be92cee9553c19d51b4570113c3d4de0c2d8b /readconf.h | |
parent | 6c5c949782d86a6e7d58006599c7685bfcd01685 (diff) |
upstream commit
Revise hostkeys@openssh.com hostkey learning extension.
The client will not ask the server to prove ownership of the private
halves of any hitherto-unseen hostkeys it offers to the client.
Allow UpdateHostKeys option to take an 'ask' argument to let the
user manually review keys offered.
ok markus@
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h index 701b9c696..576b9e352 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.108 2015/01/30 11:43:14 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.109 2015/02/16 22:13:32 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -148,7 +148,7 @@ typedef struct { | |||
148 | 148 | ||
149 | int fingerprint_hash; | 149 | int fingerprint_hash; |
150 | 150 | ||
151 | int update_hostkeys; | 151 | int update_hostkeys; /* one of SSH_UPDATE_HOSTKEYS_* */ |
152 | 152 | ||
153 | char *hostbased_key_types; | 153 | char *hostbased_key_types; |
154 | 154 | ||
@@ -174,6 +174,10 @@ typedef struct { | |||
174 | #define SSHCONF_USERCONF 2 /* user provided config file not system */ | 174 | #define SSHCONF_USERCONF 2 /* user provided config file not system */ |
175 | #define SSHCONF_POSTCANON 4 /* After hostname canonicalisation */ | 175 | #define SSHCONF_POSTCANON 4 /* After hostname canonicalisation */ |
176 | 176 | ||
177 | #define SSH_UPDATE_HOSTKEYS_NO 0 | ||
178 | #define SSH_UPDATE_HOSTKEYS_YES 1 | ||
179 | #define SSH_UPDATE_HOSTKEYS_ASK 2 | ||
180 | |||
177 | void initialize_options(Options *); | 181 | void initialize_options(Options *); |
178 | void fill_default_options(Options *); | 182 | void fill_default_options(Options *); |
179 | void fill_default_options_for_canonicalization(Options *); | 183 | void fill_default_options_for_canonicalization(Options *); |