summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-06-30 08:35:59 +1000
committerDamien Miller <djm@mindrot.org>2012-06-30 08:35:59 +1000
commitee3c196ec7b74ef971da4208577daf8039f25326 (patch)
tree52ad5923d2305d9c6ce94b30b90c1e0d757c89fa
parentdb4f8e86184ef0e8d14a370a5569a52d8ed28551 (diff)
- 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@ (actual patch accidentally committed with previous)
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f574f4de..12083c1bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
20 Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed 20 Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
21 from draft6 of the spec and will not be in the RFC when published. Patch 21 from draft6 of the spec and will not be in the RFC when published. Patch
22 from mdb at juniper net via bz#2023, ok markus. 22 from mdb at juniper net via bz#2023, ok markus.
23 - naddy@cvs.openbsd.org 2012/06/29 13:57:25
24 [ssh_config.5 sshd_config.5]
25 match the documented MAC order of preference to the actual one; ok dtucker@
23 26
2420120628 2720120628
25 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null 28 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null