summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-06-07 10:19:24 +0100
committerColin Watson <cjwatson@debian.org>2020-06-07 11:03:12 +0100
commit30337f8b66c66af6b368d1e3c789e75f1247176c (patch)
tree17e0b8652fea31c04faa19ffc4cd088552ee473a /readconf.h
parentaef2be11c5ea90bc66e774923e6570213e54c195 (diff)
parent39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff)
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h
index a8a8870d7..c405b837f 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.132 2020/01/23 02:46:49 dtucker Exp $ */ 1/* $OpenBSD: readconf.h,v 1.133 2020/04/03 02:27:12 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -206,6 +206,8 @@ typedef struct {
206#define SSH_STRICT_HOSTKEY_ASK 3 206#define SSH_STRICT_HOSTKEY_ASK 3
207 207
208const char *kex_default_pk_alg(void); 208const char *kex_default_pk_alg(void);
209char *ssh_connection_hash(const char *thishost, const char *host,
210 const char *portstr, const char *user);
209void initialize_options(Options *); 211void initialize_options(Options *);
210void fill_default_options(Options *); 212void fill_default_options(Options *);
211void fill_default_options_for_canonicalization(Options *); 213void fill_default_options_for_canonicalization(Options *);