From d16cb759463bf0353c4bfff6fe4caf00f6311a2e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 13 Sep 2024 23:24:31 +0900
Subject: [PATCH] PKCS11: Remove deprecated algorithm argument/option

It was deprecated 6 years ago[1].

[1] df8c62aab357954000e8539ac17daea45f93ee7c

Change-Id: I4457c4e1feb2b9e326de2acc08b3684c67603e27
---
 barbican/plugin/crypto/p11_crypto.py                        | 2 +-
 .../notes/pkcs11-remove-alrogithm-5ffcccc5197b236a.yaml     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/pkcs11-remove-alrogithm-5ffcccc5197b236a.yaml

diff --git a/barbican/plugin/crypto/p11_crypto.py b/barbican/plugin/crypto/p11_crypto.py
index 46366a44b..58f5fc3f8 100644
--- a/barbican/plugin/crypto/p11_crypto.py
+++ b/barbican/plugin/crypto/p11_crypto.py
@@ -74,7 +74,7 @@ p11_crypto_plugin_opts = [
                default=100),
     cfg.StrOpt('encryption_mechanism',
                help=u._('Secret encryption mechanism'),
-               default='CKM_AES_CBC', deprecated_name='algorithm'),
+               default='CKM_AES_CBC'),
     cfg.StrOpt('hmac_key_type',
                help=u._('HMAC Key Type'),
                default='CKK_AES'),
diff --git a/releasenotes/notes/pkcs11-remove-alrogithm-5ffcccc5197b236a.yaml b/releasenotes/notes/pkcs11-remove-alrogithm-5ffcccc5197b236a.yaml
new file mode 100644
index 000000000..9536809bb
--- /dev/null
+++ b/releasenotes/notes/pkcs11-remove-alrogithm-5ffcccc5197b236a.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The ``[p11_crypto_plugin] algorithm`` option, which is effectively
+    a deprecated alias of the ``[p11_crypto_plugin] encryption_mechanism``
+    option, has been removed.