From 37fed289e62ef6d46063b9f2acba150fb419dd4c Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sat, 27 Jan 2024 10:44:08 +0100
Subject: [PATCH] Release 2.17.1.

---
 CHANGELOG.rst                                 | 15 +++++++++++++++
 changelogs/changelog.yaml                     | 19 +++++++++++++++++++
 changelogs/fragments/2.17.1.yml               |  1 -
 .../698-openssl_dhparam-cryptography.yml      |  4 ----
 .../701-private_key_info-consistency.yml      |  2 --
 ...05-openssl_privatekey_info-consistency.yml |  2 --
 6 files changed, 34 insertions(+), 9 deletions(-)
 delete mode 100644 changelogs/fragments/2.17.1.yml
 delete mode 100644 changelogs/fragments/698-openssl_dhparam-cryptography.yml
 delete mode 100644 changelogs/fragments/701-private_key_info-consistency.yml
 delete mode 100644 changelogs/fragments/705-openssl_privatekey_info-consistency.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 80d47c3c..5bb7c6a0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,21 @@ Community Crypto Release Notes
 .. contents:: Topics
 
 
+v2.17.1
+=======
+
+Release Summary
+---------------
+
+Bugfix release for compatibility with cryptography 42.0.0.
+
+Bugfixes
+--------
+
+- openssl_dhparam - was using an internal function instead of the public API to load DH param files when using the ``cryptography`` backend. The internal function was removed in cryptography 42.0.0. The module now uses the public API, which has been available since support for DH params was added to cryptography (https://github.com/ansible-collections/community.crypto/pull/698).
+- openssl_privatekey_info - ``check_consistency=true`` no longer works for RSA keys with cryptography 42.0.0+ (https://github.com/ansible-collections/community.crypto/pull/701).
+- openssl_privatekey_info - ``check_consistency=true`` now reports a warning if it cannot determine consistency (https://github.com/ansible-collections/community.crypto/pull/705).
+
 v2.17.0
 =======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 26f7d393..813bb8e2 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -988,6 +988,25 @@ releases:
     - 2.17.0.yml
     - 693-allow-discards.yaml
     release_date: '2024-01-21'
+  2.17.1:
+    changes:
+      bugfixes:
+      - openssl_dhparam - was using an internal function instead of the public API
+        to load DH param files when using the ``cryptography`` backend. The internal
+        function was removed in cryptography 42.0.0. The module now uses the public
+        API, which has been available since support for DH params was added to cryptography
+        (https://github.com/ansible-collections/community.crypto/pull/698).
+      - openssl_privatekey_info - ``check_consistency=true`` no longer works for RSA
+        keys with cryptography 42.0.0+ (https://github.com/ansible-collections/community.crypto/pull/701).
+      - openssl_privatekey_info - ``check_consistency=true`` now reports a warning
+        if it cannot determine consistency (https://github.com/ansible-collections/community.crypto/pull/705).
+      release_summary: Bugfix release for compatibility with cryptography 42.0.0.
+    fragments:
+    - 2.17.1.yml
+    - 698-openssl_dhparam-cryptography.yml
+    - 701-private_key_info-consistency.yml
+    - 705-openssl_privatekey_info-consistency.yml
+    release_date: '2024-01-27'
   2.2.0:
     changes:
       bugfixes:
diff --git a/changelogs/fragments/2.17.1.yml b/changelogs/fragments/2.17.1.yml
deleted file mode 100644
index 136b0ee2..00000000
--- a/changelogs/fragments/2.17.1.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix release for compatibility with cryptography 42.0.0.
diff --git a/changelogs/fragments/698-openssl_dhparam-cryptography.yml b/changelogs/fragments/698-openssl_dhparam-cryptography.yml
deleted file mode 100644
index ad937da8..00000000
--- a/changelogs/fragments/698-openssl_dhparam-cryptography.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-bugfixes:
-  - "openssl_dhparam - was using an internal function instead of the public API to load DH param files when using the ``cryptography`` backend.
-     The internal function was removed in cryptography 42.0.0. The module now uses the public API, which has been available since support for
-     DH params was added to cryptography (https://github.com/ansible-collections/community.crypto/pull/698)."
diff --git a/changelogs/fragments/701-private_key_info-consistency.yml b/changelogs/fragments/701-private_key_info-consistency.yml
deleted file mode 100644
index fe920423..00000000
--- a/changelogs/fragments/701-private_key_info-consistency.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "openssl_privatekey_info - ``check_consistency=true`` no longer works for RSA keys with cryptography 42.0.0+ (https://github.com/ansible-collections/community.crypto/pull/701)."
diff --git a/changelogs/fragments/705-openssl_privatekey_info-consistency.yml b/changelogs/fragments/705-openssl_privatekey_info-consistency.yml
deleted file mode 100644
index 8c63aed2..00000000
--- a/changelogs/fragments/705-openssl_privatekey_info-consistency.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "openssl_privatekey_info - ``check_consistency=true`` now reports a warning if it cannot determine consistency (https://github.com/ansible-collections/community.crypto/pull/705)."