From 2beb32f290390c4f7c2a86dd5d096475e3b76c5b Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 24 Sep 2010 22:16:03 +1000
Subject: [PATCH]    - jmc@cvs.openbsd.org 2010/09/23 13:36:46      [scp.1
 sftp.1]      add KexAlgorithms to the -o list;

---
 ChangeLog | 3 +++
 scp.1     | 5 +++--
 sftp.1    | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1dc4f82e4..2b0f5c045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,9 @@
    - jmc@cvs.openbsd.org 2010/09/23 13:34:43
      [sftp.c]
      add [-l limit] to usage();
+   - jmc@cvs.openbsd.org 2010/09/23 13:36:46
+     [scp.1 sftp.1]
+     add KexAlgorithms to the -o list;
 
 20100910
  - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
diff --git a/scp.1 b/scp.1
index 82da30f4f..13a43f6b4 100644
--- a/scp.1
+++ b/scp.1
@@ -9,9 +9,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.51 2010/09/03 11:09:29 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.52 2010/09/23 13:36:46 jmc Exp $
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: September 23 2010 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -148,6 +148,7 @@ For full details of the options listed below, and their possible values, see
 .It IdentityFile
 .It IdentitiesOnly
 .It KbdInteractiveDevices
+.It KexAlgorithms
 .It LogLevel
 .It MACs
 .It NoHostAuthenticationForLocalhost
diff --git a/sftp.1 b/sftp.1
index b2a19b72d..0d253cc8f 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.85 2010/09/22 22:58:51 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.86 2010/09/23 13:36:46 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: September 22 2010 $
+.Dd $Mdocdate: September 23 2010 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -202,6 +202,7 @@ For full details of the options listed below, and their possible values, see
 .It IdentityFile
 .It IdentitiesOnly
 .It KbdInteractiveDevices
+.It KexAlgorithms
 .It LogLevel
 .It MACs
 .It NoHostAuthenticationForLocalhost