- jmc@cvs.openbsd.org 2007/06/08 07:43:46

[ssh_config.5]
     put the MAC list into a display, like we do for ciphers,
     since groff has trouble handling wide lines;
This commit is contained in:
Damien Miller 2007-06-11 14:06:32 +10:00
parent 4de545a6fb
commit 5e7c30bdf1
2 changed files with 11 additions and 4 deletions

View File

@ -16,6 +16,10 @@
Add a "MACs" line after "Ciphers" with the default MAC algorithms, Add a "MACs" line after "Ciphers" with the default MAC algorithms,
to ease people who want to tweak both (eg. for performance reasons). to ease people who want to tweak both (eg. for performance reasons).
ok deraadt@ djm@ dtucker@ ok deraadt@ djm@ dtucker@
- jmc@cvs.openbsd.org 2007/06/08 07:43:46
[ssh_config.5]
put the MAC list into a display, like we do for ciphers,
since groff has trouble handling wide lines;
20070605 20070605
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -2991,4 +2995,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.4682 2007/06/11 04:04:42 djm Exp $ $Id: ChangeLog,v 1.4683 2007/06/11 04:06:32 djm Exp $

View File

@ -34,8 +34,8 @@
.\" (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: ssh_config.5,v 1.100 2007/06/07 19:37:34 pvalchev Exp $ .\" $OpenBSD: ssh_config.5,v 1.101 2007/06/08 07:43:46 jmc Exp $
.Dd $Mdocdate: June 7 2007 $ .Dd $Mdocdate: June 8 2007 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -641,7 +641,10 @@ The MAC algorithm is used in protocol version 2
for data integrity protection. for data integrity protection.
Multiple algorithms must be comma-separated. Multiple algorithms must be comma-separated.
The default is: The default is:
.Dq hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . .Bd -literal -offset indent
hmac-md5,hmac-sha1,umac-64@openssh.com,
hmac-ripemd160,hmac-sha1-96,hmac-md5-96
.Ed
.It Cm NoHostAuthenticationForLocalhost .It Cm NoHostAuthenticationForLocalhost
This option can be used if the home directory is shared across machines. This option can be used if the home directory is shared across machines.
In this case localhost will refer to a different machine on each of In this case localhost will refer to a different machine on each of