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 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.362 2015/09/11 03:42:32 djm Exp $ -.Dd $Mdocdate: September 11 2015 $ +.\" $OpenBSD: ssh.1,v 1.363 2015/09/24 06:15:11 djm Exp $ +.Dd $Mdocdate: September 24 2015 $ .Dt SSH 1 .Os .Sh NAME @@ -304,6 +304,9 @@ It is possible to have multiple .Fl i options (and multiple identities specified in configuration files). +If no certificates have been explicitly specified by +.Cm CertificateFile +directive, .Nm will also try to load certificate information from the filename obtained by appending @@ -468,6 +471,7 @@ For full details of the options listed below, and their possible values, see .It CanonicalizeHostname .It CanonicalizeMaxDots .It CanonicalizePermittedCNAMEs +.It CertificateFile .It ChallengeResponseAuthentication .It CheckHostIP .It Cipher |