CHANGES and release note for [GL #3905]

diff --git a/CHANGES b/CHANGES
index 1436b79277f6fdd4da740e2c7a07e324ab410da5..09bad51be2a3186a168bc9fe90d0ace67abace12 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+6181.  [func]          The "tkey-dhkey" option has been deprecated; a
+                       warning will be logged when it is used. In a future
+                       release, Diffie-Hellman TKEY mode will be removed.
+                       [GL #3905]
+
 6180.  [bug]           The session key object could be incorrectly added
                        to multiple different views' keyrings. [GL #4079]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index f42a9e0019bb7fadedc909d14e8f40e4f63dc88e..9324b85735b67d5e25999017d0d93dfd7467604a 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -28,7 +28,9 @@ New Features
 Removed Features
 ~~~~~~~~~~~~~~~~
 
-- None.
+- TKEY mode 2 (Diffie-Hellman Exchanged Keying) is now deprecated, and
+  will be removed in a future release. A warning will be logged when
+  the ``tkey-dhkey`` option is used in ``named.conf``. :gl:`#3905`
 
 Feature Changes
 ~~~~~~~~~~~~~~~