summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-02-21 11:57:14 +0000
committerColin Watson <cjwatson@debian.org>2020-02-21 11:57:14 +0000
commitf0de78bd4f29fa688c5df116f3f9cd43543a76d0 (patch)
tree856b0dee3f2764c13a32dad5ffe2424fab7fef41 /readconf.h
parent4213eec74e74de6310c27a40c3e9759a08a73996 (diff)
parent8aa3455b16fddea4c0144a7c4a1edb10ec67dcc8 (diff)
Import openssh_8.2p1.orig.tar.gz
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h
index 8e36bf32a..feedb3d20 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.129 2018/11/23 05:08:07 djm Exp $ */ 1/* $OpenBSD: readconf.h,v 1.132 2020/01/23 02:46:49 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -29,6 +29,7 @@ struct allowed_cname {
29 29
30typedef struct { 30typedef struct {
31 int forward_agent; /* Forward authentication agent. */ 31 int forward_agent; /* Forward authentication agent. */
32 char *forward_agent_sock_path; /* Optional path of the agent. */
32 int forward_x11; /* Forward X11 display. */ 33 int forward_x11; /* Forward X11 display. */
33 int forward_x11_timeout; /* Expiration for Cookies */ 34 int forward_x11_timeout; /* Expiration for Cookies */
34 int forward_x11_trusted; /* Trust Forward X11 display. */ 35 int forward_x11_trusted; /* Trust Forward X11 display. */
@@ -82,6 +83,7 @@ typedef struct {
82 char *bind_address; /* local socket address for connection to sshd */ 83 char *bind_address; /* local socket address for connection to sshd */
83 char *bind_interface; /* local interface for bind address */ 84 char *bind_interface; /* local interface for bind address */
84 char *pkcs11_provider; /* PKCS#11 provider */ 85 char *pkcs11_provider; /* PKCS#11 provider */
86 char *sk_provider; /* Security key provider */
85 int verify_host_key_dns; /* Verify host key using DNS */ 87 int verify_host_key_dns; /* Verify host key using DNS */
86 88
87 int num_identity_files; /* Number of files for RSA/DSA identities. */ 89 int num_identity_files; /* Number of files for RSA/DSA identities. */
@@ -197,6 +199,7 @@ typedef struct {
197#define SSH_STRICT_HOSTKEY_YES 2 199#define SSH_STRICT_HOSTKEY_YES 2
198#define SSH_STRICT_HOSTKEY_ASK 3 200#define SSH_STRICT_HOSTKEY_ASK 3
199 201
202const char *kex_default_pk_alg(void);
200void initialize_options(Options *); 203void initialize_options(Options *);
201void fill_default_options(Options *); 204void fill_default_options(Options *);
202void fill_default_options_for_canonicalization(Options *); 205void fill_default_options_for_canonicalization(Options *);