From: Ondřej Surý <ondrej@isc.org>
Date: Tue, 28 Feb 2023 15:26:31 +0000 (+0100)
Subject: Add CHANGES and release note for [GL #3905]
X-Git-Tag: v9.19.12~95^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf21e053138394be71cf3644044b3a72716f241e;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 8023c4855be..9dba28c24dd 100644
--- 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 0b51e2ebd89..57e1274d742 100644
--- 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
 ~~~~~~~~~~~~~~~