tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

some certificatefile tweaks; ok djm

Upstream-ID: 0e5a7852c28c05fc193419cc7e50e64c1c535af0
This commit is contained in:
jmc@openbsd.org 2015-09-25 18:19:54 +00:00 committed by Damien Miller
parent 4e44a79a07
commit c5f7c0843c
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scp.1
View File

@ -8,9 +8,9 @@
.\" .\"
.\" Created: Sun May 7 00:14:37 1995 ylo .\" Created: Sun May 7 00:14:37 1995 ylo
.\" .\"
.\" $OpenBSD: scp.1,v 1.67 2015/07/10 06:21:53 markus Exp $ .\" $OpenBSD: scp.1,v 1.68 2015/09/25 18:19:54 jmc Exp $
.\" .\"
.Dd $Mdocdate: July 10 2015 $ .Dd $Mdocdate: September 25 2015 $
.Dt SCP 1 .Dt SCP 1
.Os .Os
.Sh NAME .Sh NAME
@ -133,6 +133,7 @@ For full details of the options listed below, and their possible values, see
.It CanonicalizeHostname .It CanonicalizeHostname
.It CanonicalizeMaxDots .It CanonicalizeMaxDots
.It CanonicalizePermittedCNAMEs .It CanonicalizePermittedCNAMEs
.It CertificateFile
.It ChallengeResponseAuthentication .It ChallengeResponseAuthentication
.It CheckHostIP .It CheckHostIP
.It Cipher .It Cipher

5
sftp.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: sftp.1,v 1.101 2015/01/30 11:43:14 djm Exp $ .\" $OpenBSD: sftp.1,v 1.102 2015/09/25 18:19:54 jmc Exp $
.\" .\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\" .\"
@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.Dd $Mdocdate: January 30 2015 $ .Dd $Mdocdate: September 25 2015 $
.Dt SFTP 1 .Dt SFTP 1
.Os .Os
.Sh NAME .Sh NAME
@ -198,6 +198,7 @@ For full details of the options listed below, and their possible values, see
.It CanonicalizeHostname .It CanonicalizeHostname
.It CanonicalizeMaxDots .It CanonicalizeMaxDots
.It CanonicalizePermittedCNAMEs .It CanonicalizePermittedCNAMEs
.It CertificateFile
.It ChallengeResponseAuthentication .It ChallengeResponseAuthentication
.It CheckHostIP .It CheckHostIP
.It Cipher .It Cipher

6
ssh.1
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh.1,v 1.363 2015/09/24 06:15:11 djm Exp $ .\" $OpenBSD: ssh.1,v 1.364 2015/09/25 18:19:54 jmc Exp $
.Dd $Mdocdate: September 24 2015 $ .Dd $Mdocdate: September 25 2015 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -304,7 +304,7 @@ It is possible to have multiple
.Fl i .Fl i
options (and multiple identities specified in options (and multiple identities specified in
configuration files). configuration files).
If no certificates have been explicitly specified by If no certificates have been explicitly specified by the
.Cm CertificateFile .Cm CertificateFile
directive, directive,
.Nm .Nm