summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh_config.59
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ab835b57..db3978358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
16 Add a "MACs" line after "Ciphers" with the default MAC algorithms, 16 Add a "MACs" line after "Ciphers" with the default MAC algorithms,
17 to ease people who want to tweak both (eg. for performance reasons). 17 to ease people who want to tweak both (eg. for performance reasons).
18 ok deraadt@ djm@ dtucker@ 18 ok deraadt@ djm@ dtucker@
19 - jmc@cvs.openbsd.org 2007/06/08 07:43:46
20 [ssh_config.5]
21 put the MAC list into a display, like we do for ciphers,
22 since groff has trouble handling wide lines;
19 23
2020070605 2420070605
21 - (dtucker) OpenBSD CVS Sync 25 - (dtucker) OpenBSD CVS Sync
@@ -2991,4 +2995,4 @@
2991 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2995 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2992 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2996 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2993 2997
2994$Id: ChangeLog,v 1.4682 2007/06/11 04:04:42 djm Exp $ 2998$Id: ChangeLog,v 1.4683 2007/06/11 04:06:32 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 4537fb7f8..2af086592 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,8 @@
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.100 2007/06/07 19:37:34 pvalchev Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.101 2007/06/08 07:43:46 jmc Exp $
38.Dd $Mdocdate: June 7 2007 $ 38.Dd $Mdocdate: June 8 2007 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -641,7 +641,10 @@ The MAC algorithm is used in protocol version 2
641for data integrity protection. 641for data integrity protection.
642Multiple algorithms must be comma-separated. 642Multiple algorithms must be comma-separated.
643The default is: 643The default is:
644.Dq hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . 644.Bd -literal -offset indent
645hmac-md5,hmac-sha1,umac-64@openssh.com,
646hmac-ripemd160,hmac-sha1-96,hmac-md5-96
647.Ed
645.It Cm NoHostAuthenticationForLocalhost 648.It Cm NoHostAuthenticationForLocalhost
646This option can be used if the home directory is shared across machines. 649This option can be used if the home directory is shared across machines.
647In this case localhost will refer to a different machine on each of 650In this case localhost will refer to a different machine on each of