Add CHANGES and release note for [GL #3905]

diff --git a/CHANGES b/CHANGES
index 8023c4855bec8f115c9e9399ebdd1c5839212b7c..9dba28c24dd9a83c9b03c5ca9c14af966499ec81 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6121.  [cleanup]       Remove support for TKEY Mode 2 (Diffie-Hellman Exchanged
+                       Keying). [GL #3905]
+
 6120.  [bug]           Use two pairs of dns_db_t and dns_dbversion_t in a
                        catalog zone structure to avoid a race between the
                        dns__catz_update_cb() and dns_catz_dbupdate_callback()

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 0b51e2ebd8954e43b63a0d5e0b96c454b560843a..57e1274d7425ff3c8ee96ed0ddacd8c409104892 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -27,6 +27,10 @@ Removed Features
 
 - None.
 
+- The TKEY Mode 2 (Diffie-Hellman Exchanged Keying Mode) has been removed and
+  using TKEY Mode 2 is now a fatal error.  Users are advised to switch to TKEY
+  Mode 3 (GSS-API). :gl:`#3905`
+
 Feature Changes
 ~~~~~~~~~~~~~~~