- naddy@cvs.openbsd.org 2012/06/29 13:57:25

     [ssh_config.5 sshd_config.5]
     match the documented MAC order of preference to the actual one;
     ok dtucker@

diff --git a/ChangeLog b/ChangeLog
index 3754146b6980a7ab62ba5ff0b113a3c39ac236bc..5608909da8af9b8c3cac78cb30ccbb217523a4f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20120702
+- (dtucker) OpenBSD CVS Sync
+   - naddy@cvs.openbsd.org 2012/06/29 13:57:25
+     [ssh_config.5 sshd_config.5]
+     match the documented MAC order of preference to the actual one;
+     ok dtucker@
+
 20120629
  - OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2012/06/21 00:16:07

diff --git a/ssh_config.5 b/ssh_config.5
index db7ea5cddd50e5fc1cba89e6e99a9e7b823bcdec..36b1af195d62fe4257809b29ecd2d3b2126a4ff6 100644 (file)
--- a/ssh_config.5
+++ b/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/sshd_config.5 b/sshd_config.5
index 897b8a4196be5ddce0ccc5681b11ba18a7789376..314ecfb0e6703bb69a3b7814c80eb45ae59bbf86 100644 (file)
--- a/sshd_config.5
+++ b/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
@@ -657,8 +657,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.