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

20030622 

- (dtucker) OpenBSD CVS Sync
   - djm@cvs.openbsd.org 2003/06/20 05:47:58
     [sshd_config.5]
     sync description of protocol 2 cipher proposal; ok markus
This commit is contained in:
Darren Tucker 2003-06-22 20:46:53 +10:00
parent a251f809a0
commit 91cf261bd5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6,6 +6,9 @@
[ssh-rsa.c] [ssh-rsa.c]
backout last change, since it violates pkcs#1 backout last change, since it violates pkcs#1
switch to share/misc/license.template switch to share/misc/license.template
- djm@cvs.openbsd.org 2003/06/20 05:47:58
[sshd_config.5]
sync description of protocol 2 cipher proposal; ok markus
- (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS. - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS.
- (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before
testing its value. testing its value.
@ -572,4 +575,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2819 2003/06/22 10:45:15 dtucker Exp $ $Id: ChangeLog,v 1.2820 2003/06/22 10:46:53 dtucker Exp $

4
sshd_config.5
View File

@ -34,7 +34,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.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.19 2003/06/10 09:12:12 jmc Exp $ .\" $OpenBSD: sshd_config.5,v 1.20 2003/06/20 05:47:58 djm Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
@ -139,7 +139,7 @@ The default is
.Pp .Pp
.Bd -literal .Bd -literal
``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
aes192-cbc,aes256-cbc'' aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr''
.Ed .Ed
.It Cm ClientAliveInterval .It Cm ClientAliveInterval
Sets a timeout interval in seconds after which if no data has been received Sets a timeout interval in seconds after which if no data has been received