upstream commit

some certificatefile tweaks; ok djm Upstream-ID: 0e5a7852c28c05fc193419cc7e50e64c1c535af0
author: jmc@openbsd.org <jmc@openbsd.org> 2015-09-25 18:19:54 +0000
committer: Damien Miller <djm@mindrot.org> 2015-10-06 12:21:55 +1100
commit: c5f7c0843cb6e6074a93c8ac34e49ce33a6f5546 (patch)
tree: 4175d40176ce9a9e0d48b5f44951167acffd83de
parent: 4e44a79a07d4b88b6a4e5e8c1bed5f58c841b1b8 (diff)
3 files changed, 9 insertions, 7 deletions
diff --git a/scp.1 b/scp.1
index 279b0d70b..54ea352ce 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" 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
 .Os
 .Sh NAME
@@ -133,6 +133,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
diff --git a/sftp.1 b/sftp.1
index 214f0118c..edc5a85e6 100644
--- a/sftp.1
+++ b/sftp.1
@@ -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.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 30 2015 $
+.Dd $Mdocdate: September 25 2015 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -198,6 +198,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
diff --git a/ssh.1 b/ssh.1
index b08fa7975..4dd4c3b4e 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.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
 .Os
 .Sh NAME
@@ -304,7 +304,7 @@ It is possible to have multiple
 .Fl i
 options (and multiple identities specified in
 configuration files).
-If no certificates have been explicitly specified by
+If no certificates have been explicitly specified by the
 .Cm CertificateFile
 directive,
 .Nm
author	jmc@openbsd.org <jmc@openbsd.org>	2015-09-25 18:19:54 +0000
committer	Damien Miller <djm@mindrot.org>	2015-10-06 12:21:55 +1100
commit	c5f7c0843cb6e6074a93c8ac34e49ce33a6f5546 (patch)
tree	4175d40176ce9a9e0d48b5f44951167acffd83de
parent	4e44a79a07d4b88b6a4e5e8c1bed5f58c841b1b8 (diff)

diff --git a/scp.1 b/scp.1 index 279b0d70b..54ea352ce 100644 --- a/scp.1 +++ b/scp.1
@@ -8,9 +8,9 @@
8	.\"	8	.\"
9	.\" Created: Sun May 7 00:14:37 1995 ylo	9	.\" Created: Sun May 7 00:14:37 1995 ylo
10	.\"	10	.\"
11	.\" $OpenBSD: scp.1,v 1.67 2015/07/10 06:21:53 markus Exp $	11	.\" $OpenBSD: scp.1,v 1.68 2015/09/25 18:19:54 jmc Exp $
12	.\"	12	.\"
13	.Dd $Mdocdate: July 10 2015 $	13	.Dd $Mdocdate: September 25 2015 $
14	.Dt SCP 1	14	.Dt SCP 1
15	.Os	15	.Os
16	.Sh NAME	16	.Sh NAME
@@ -133,6 +133,7 @@ For full details of the options listed below, and their possible values, see
133	.It CanonicalizeHostname	133	.It CanonicalizeHostname
134	.It CanonicalizeMaxDots	134	.It CanonicalizeMaxDots
135	.It CanonicalizePermittedCNAMEs	135	.It CanonicalizePermittedCNAMEs
		136	.It CertificateFile
136	.It ChallengeResponseAuthentication	137	.It ChallengeResponseAuthentication
137	.It CheckHostIP	138	.It CheckHostIP
138	.It Cipher	139	.It Cipher


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


diff --git a/ssh.1 b/ssh.1 index b08fa7975..4dd4c3b4e 100644 --- a/ssh.1 +++ b/ssh.1
@@ -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.363 2015/09/24 06:15:11 djm Exp $	36	.\" $OpenBSD: ssh.1,v 1.364 2015/09/25 18:19:54 jmc Exp $
37	.Dd $Mdocdate: September 24 2015 $	37	.Dd $Mdocdate: September 25 2015 $
38	.Dt SSH 1	38	.Dt SSH 1
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -304,7 +304,7 @@ 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	307	If no certificates have been explicitly specified by the
308	.Cm CertificateFile	308	.Cm CertificateFile
309	directive,	309	directive,
310	.Nm	310	.Nm