diff options
author | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
commit | 0f31b02d696704321e4e94e63dceff52599ab808 (patch) | |
tree | 953c18ea1e163d5ebd4b0d153b6378646ff41808 /crypto/openssh/scp.1 | |
parent | 5080a59fa0c3561940d69fe29dc75ac489f0183a (diff) | |
download | FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.zip FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.tar.gz |
MFS (r296781):
MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)
MFH (r296634): re-add aes-cbc to server-side default cipher list
MFH (r296651, r296657): fix gcc build of pam_ssh
PR: 207679
Security: CVE-2016-3115
Approved by: re (marius)
Diffstat (limited to 'crypto/openssh/scp.1')
-rw-r--r-- | crypto/openssh/scp.1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/scp.1 b/crypto/openssh/scp.1 index 279b0d7..54ea352 100644 --- a/crypto/openssh/scp.1 +++ b/crypto/openssh/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 |