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 /ssh.1 | |
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 'ssh.1')
-rw-r--r-- | ssh.1 | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh.1,v 1.362 2015/09/11 03:42:32 djm Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.363 2015/09/24 06:15:11 djm Exp $ |
37 | .Dd $Mdocdate: September 11 2015 $ | 37 | .Dd $Mdocdate: September 24 2015 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -304,6 +304,9 @@ It is possible to have multiple | |||
304 | .Fl i | 304 | .Fl i |
305 | options (and multiple identities specified in | 305 | options (and multiple identities specified in |
306 | configuration files). | 306 | configuration files). |
307 | If no certificates have been explicitly specified by | ||
308 | .Cm CertificateFile | ||
309 | directive, | ||
307 | .Nm | 310 | .Nm |
308 | will also try to load certificate information from the filename obtained | 311 | will also try to load certificate information from the filename obtained |
309 | by appending | 312 | by appending |
@@ -468,6 +471,7 @@ For full details of the options listed below, and their possible values, see | |||
468 | .It CanonicalizeHostname | 471 | .It CanonicalizeHostname |
469 | .It CanonicalizeMaxDots | 472 | .It CanonicalizeMaxDots |
470 | .It CanonicalizePermittedCNAMEs | 473 | .It CanonicalizePermittedCNAMEs |
474 | .It CertificateFile | ||
471 | .It ChallengeResponseAuthentication | 475 | .It ChallengeResponseAuthentication |
472 | .It CheckHostIP | 476 | .It CheckHostIP |
473 | .It Cipher | 477 | .It Cipher |