From: Evan Hunt <each@isc.org>
Date: Mon, 22 May 2023 23:15:36 +0000 (-0700)
Subject: CHANGES and release note for [GL #3905]
X-Git-Tag: v9.18.16~17^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9a8f8d60469a2d9485730ff2bf2645e8601d55de;p=thirdparty%2Fbind9.git

CHANGES and release note for [GL #3905]
---

diff --git a/CHANGES b/CHANGES
index 1436b79277f..09bad51be2a 100644
--- 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 f42a9e0019b..9324b85735b 100644
--- 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
 ~~~~~~~~~~~~~~~