summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--scp.13
-rw-r--r--sftp.13
-rw-r--r--ssh.13
-rw-r--r--ssh_config.517
5 files changed, 27 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ea78b6504..5fa01b32d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
6 - jmc@cvs.openbsd.org 2006/01/18 10:53:29 6 - jmc@cvs.openbsd.org 2006/01/18 10:53:29
7 [ssh.1] 7 [ssh.1]
8 add a section on ssh-based vpn, based on reyk's README.tun; 8 add a section on ssh-based vpn, based on reyk's README.tun;
9 - dtucker@cvs.openbsd.org 2006/01/20 00:14:55
10 [scp.1 ssh.1 ssh_config.5 sftp.1]
11 Document RekeyLimit. Based on patch from jan.iven at cern.ch from mindrot
12 #1056 with feedback from jmc, djm and markus; ok jmc@ djm@
9 13
1020060114 1420060114
11 - (djm) OpenBSD CVS Sync 15 - (djm) OpenBSD CVS Sync
@@ -3714,4 +3718,4 @@
3714 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3718 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3715 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3719 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3716 3720
3717$Id: ChangeLog,v 1.4092 2006/01/20 00:30:58 dtucker Exp $ 3721$Id: ChangeLog,v 1.4093 2006/01/20 00:31:47 dtucker Exp $
diff --git a/scp.1 b/scp.1
index b5191e318..d9b1f8e8f 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
9.\" 9.\"
10.\" Created: Sun May 7 00:14:37 1995 ylo 10.\" Created: Sun May 7 00:14:37 1995 ylo
11.\" 11.\"
12.\" $OpenBSD: scp.1,v 1.38 2005/03/01 17:19:35 jmc Exp $ 12.\" $OpenBSD: scp.1,v 1.39 2006/01/20 00:14:55 dtucker Exp $
13.\" 13.\"
14.Dd September 25, 1999 14.Dd September 25, 1999
15.Dt SCP 1 15.Dt SCP 1
@@ -152,6 +152,7 @@ For full details of the options listed below, and their possible values, see
152.It Protocol 152.It Protocol
153.It ProxyCommand 153.It ProxyCommand
154.It PubkeyAuthentication 154.It PubkeyAuthentication
155.It RekeyLimit
155.It RhostsRSAAuthentication 156.It RhostsRSAAuthentication
156.It RSAAuthentication 157.It RSAAuthentication
157.It SendEnv 158.It SendEnv
diff --git a/sftp.1 b/sftp.1
index 6b500596c..47aafa89e 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.62 2005/12/30 16:59:00 jmc Exp $ 1.\" $OpenBSD: sftp.1,v 1.63 2006/01/20 00:14:55 dtucker Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -180,6 +180,7 @@ For full details of the options listed below, and their possible values, see
180.It Protocol 180.It Protocol
181.It ProxyCommand 181.It ProxyCommand
182.It PubkeyAuthentication 182.It PubkeyAuthentication
183.It RekeyLimit
183.It RhostsRSAAuthentication 184.It RhostsRSAAuthentication
184.It RSAAuthentication 185.It RSAAuthentication
185.It SendEnv 186.It SendEnv
diff --git a/ssh.1 b/ssh.1
index 661e8f962..3fe142dc1 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.250 2006/01/18 10:53:29 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.251 2006/01/20 00:14:55 dtucker Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -477,6 +477,7 @@ For full details of the options listed below, and their possible values, see
477.It Protocol 477.It Protocol
478.It ProxyCommand 478.It ProxyCommand
479.It PubkeyAuthentication 479.It PubkeyAuthentication
480.It RekeyLimit
480.It RemoteForward 481.It RemoteForward
481.It RhostsRSAAuthentication 482.It RhostsRSAAuthentication
482.It RSAAuthentication 483.It RSAAuthentication
diff --git a/ssh_config.5 b/ssh_config.5
index e8186a988..790c9b204 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.74 2006/01/12 22:26:02 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.75 2006/01/20 00:14:55 dtucker Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -718,6 +718,21 @@ or
718The default is 718The default is
719.Dq yes . 719.Dq yes .
720This option applies to protocol version 2 only. 720This option applies to protocol version 2 only.
721.It Cm RekeyLimit
722Specifies the maximum amount of data that may be transmitted before the
723session key will be renegotiated.
724The argument is the number of bytes, with an optional suffix of
725.Dq K ,
726.Dq M ,
727or
728.Dq G
729to indicate Kilobytes, Megabytes, or Gigabytes, respectively.
730The default is between
731.Dq 1G
732and
733.Dq 4G ,
734depending on the cipher.
735Note that this option applies to protocol version 2 only.
721.It Cm RemoteForward 736.It Cm RemoteForward
722Specifies that a TCP port on the remote machine be forwarded over 737Specifies that a TCP port on the remote machine be forwarded over
723the secure channel to the specified host and port from the local machine. 738the secure channel to the specified host and port from the local machine.