diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-09-24 06:15:11 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-10-06 12:21:54 +1100 |
commit | 4e44a79a07d4b88b6a4e5e8c1bed5f58c841b1b8 (patch) | |
tree | 7ef647dabf413a83da2f0c26917a8e0b5e1d2145 /readconf.h | |
parent | e3cbb06ade83c72b640a53728d362bbefa0008e2 (diff) |
upstream commit
add ssh_config CertificateFile option to explicitly list
a certificate; patch from Meghana Bhat on bz#2436; ok markus@
Upstream-ID: 58648ec53c510b41c1f46d8fe293aadc87229ab8
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index bb2d55283..6d6927f06 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.110 2015/07/10 06:21:53 markus Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.111 2015/09/24 06:15:11 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -95,6 +95,11 @@ typedef struct { | |||
95 | int identity_file_userprovided[SSH_MAX_IDENTITY_FILES]; | 95 | int identity_file_userprovided[SSH_MAX_IDENTITY_FILES]; |
96 | struct sshkey *identity_keys[SSH_MAX_IDENTITY_FILES]; | 96 | struct sshkey *identity_keys[SSH_MAX_IDENTITY_FILES]; |
97 | 97 | ||
98 | int num_certificate_files; /* Number of extra certificates for ssh. */ | ||
99 | char *certificate_files[SSH_MAX_CERTIFICATE_FILES]; | ||
100 | int certificate_file_userprovided[SSH_MAX_CERTIFICATE_FILES]; | ||
101 | struct sshkey *certificates[SSH_MAX_CERTIFICATE_FILES]; | ||
102 | |||
98 | /* Local TCP/IP forward requests. */ | 103 | /* Local TCP/IP forward requests. */ |
99 | int num_local_forwards; | 104 | int num_local_forwards; |
100 | struct Forward *local_forwards; | 105 | struct Forward *local_forwards; |
@@ -194,5 +199,6 @@ void dump_client_config(Options *o, const char *host); | |||
194 | void add_local_forward(Options *, const struct Forward *); | 199 | void add_local_forward(Options *, const struct Forward *); |
195 | void add_remote_forward(Options *, const struct Forward *); | 200 | void add_remote_forward(Options *, const struct Forward *); |
196 | void add_identity_file(Options *, const char *, const char *, int); | 201 | void add_identity_file(Options *, const char *, const char *, int); |
202 | void add_certificate_file(Options *, const char *, int); | ||
197 | 203 | ||
198 | #endif /* READCONF_H */ | 204 | #endif /* READCONF_H */ |