RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-04-11 03:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

- pvalchev@cvs.openbsd.org 2007/06/08 04:40:40

Browse Source 
[ssh_config]
     Add a "MACs" line after "Ciphers" with the default MAC algorithms,
     to ease people who want to tweak both (eg. for performance reasons).
     ok deraadt@ djm@ dtucker@
This commit is contained in:
Damien Miller 2007-06-11 14:04:42 +10:00
parent e45796f7b4
commit 4de545a6fb
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -11,6 +11,12 @@
one of its underlying hash algorithms is found to be vulnerable to a one of its underlying hash algorithms is found to be vulnerable to a
new attack. http://www.ietf.org/rfc/rfc4418.txt new attack. http://www.ietf.org/rfc/rfc4418.txt
in conjunction with and OK djm@ in conjunction with and OK djm@
- pvalchev@cvs.openbsd.org 2007/06/08 04:40:40
[ssh_config]
Add a "MACs" line after "Ciphers" with the default MAC algorithms,
to ease people who want to tweak both (eg. for performance reasons).
ok deraadt@ djm@ dtucker@
20070605 20070605
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2007/05/22 10:18:52 - djm@cvs.openbsd.org 2007/05/22 10:18:52
@ -2985,4 +2991,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4681 2007/06/11 04:01:42 djm Exp $ $Id: ChangeLog,v 1.4682 2007/06/11 04:04:42 djm Exp $

3
ssh_config
View File

@ -1,4 +1,4 @@
# $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $ # $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
# This is the ssh client system-wide configuration file. See # This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for # ssh_config(5) for more information. This file provides defaults for
@ -38,6 +38,7 @@
# Protocol 2,1 # Protocol 2,1
# Cipher 3des # Cipher 3des
# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
# EscapeChar ~ # EscapeChar ~
# Tunnel no # Tunnel no
# TunnelDevice any:any # TunnelDevice any:any