diff options
| author |   naddy <naddy@openbsd.org> | 2012-06-29 13:57:25 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2012-06-29 13:57:25 +0000 |
| commit | c45596b82b233d3aacbfb8b3d8c7a61a4a0a8a72 (patch) | |
| tree | eb6beb87cf03199e545446ee669074c99c5b67bc | |
| parent | tcp/udp mandatory for "user"; from ti zed (diff) | |
| download | wireguard-openbsd-c45596b82b233d3aacbfb8b3d8c7a61a4a0a8a72.tar.xz wireguard-openbsd-c45596b82b233d3aacbfb8b3d8c7a61a4a0a8a72.zip | |
match the documented MAC order of preference to the actual one; ok dtucker@
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index db7ea5cddd5..36b1af195d6 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.156 2012/06/28 05:07:45 dtucker Exp $ -.Dd $Mdocdate: June 28 2012 $ +.\" $OpenBSD: ssh_config.5,v 1.157 2012/06/29 13:57:25 naddy Exp $ +.Dd $Mdocdate: June 29 2012 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -793,8 +793,8 @@ Multiple algorithms must be comma-separated. The default is: .Bd -literal -offset indent hmac-md5,hmac-sha1,umac-64@openssh.com, -hmac-ripemd160,hmac-sha1-96,hmac-md5-96, -hmac-sha2-256,hmac-sha2-512 +hmac-sha2-256,hmac-sha2-512,hmac-ripemd160, +hmac-sha1-96,hmac-md5-96 .Ed .It Cm NoHostAuthenticationForLocalhost This option can be used if the home directory is shared across machines. diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index 5656b502086..d1431e61290 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.143 2012/06/28 05:07:45 dtucker Exp $ -.Dd $Mdocdate: June 28 2012 $ +.\" $OpenBSD: sshd_config.5,v 1.144 2012/06/29 13:57:25 naddy Exp $ +.Dd $Mdocdate: June 29 2012 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -658,8 +658,8 @@ Multiple algorithms must be comma-separated. The default is: .Bd -literal -offset indent hmac-md5,hmac-sha1,umac-64@openssh.com, -hmac-ripemd160,hmac-sha1-96,hmac-md5-96, -hmac-sha2-256,hmac-sha2-512 +hmac-sha2-256,hmac-sha2-512,hmac-ripemd160, +hmac-sha1-96,hmac-md5-96 .Ed .It Cm Match Introduces a conditional block. |