openstack/barbican
Code Issues Proposed changes

pkcs11: Remove deprecated token_label option

Browse Source 
It was deprecated in favor of the token_labels option some cycles
ago[1].

[1] 1ca03610d7257c782b11d6bcf54074d66a79c545

Change-Id: I20b15e23f06af8df86d888e86081058b8c96a77a
This commit is contained in:
Takashi Kajinami 2023-12-15 16:54:36 +09:00
parent 6dc5a6c8d3
commit 20b4b34299
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
barbican/plugin/crypto/p11_crypto.py
View File

@ -39,12 +39,8 @@ p11_crypto_plugin_opts = [
cfg.StrOpt('token_serial_number', cfg.StrOpt('token_serial_number',
help=u._('Token serial number used to identify the token to be ' help=u._('Token serial number used to identify the token to be '
'used.')), 'used.')),
cfg.StrOpt('token_label',
deprecated_for_removal=True,
help=u._('DEPRECATED: Use token_labels instead. '
'Token label used to identify the token to '
'be used.')),
cfg.ListOpt('token_labels', cfg.ListOpt('token_labels',
default=[],
help=u._('List of labels for one or more tokens to be used. ' help=u._('List of labels for one or more tokens to be used. '
'Typically this is a single label, but some HSM ' 'Typically this is a single label, but some HSM '
'devices may require more than one label for Load ' 'devices may require more than one label for Load '
@ -159,12 +155,7 @@ class P11CryptoPlugin(plugin.CryptoPluginBase):
self.slot_id = plugin_conf.slot_id self.slot_id = plugin_conf.slot_id
self.login = plugin_conf.login self.login = plugin_conf.login
self.token_serial_number = plugin_conf.token_serial_number self.token_serial_number = plugin_conf.token_serial_number
self.token_labels = plugin_conf.token_labels or list() self.token_labels = plugin_conf.token_labels
if plugin_conf.token_label:
LOG.warning('Using deprecated option "token_label". Please update '
'your configuration file.')
if plugin_conf.token_label not in self.token_labels:
self.token_labels.append(plugin_conf.token_label)
# Use specified or create new pkcs11 object # Use specified or create new pkcs11 object
self.pkcs11 = pkcs11 or self._create_pkcs11(ffi) self.pkcs11 = pkcs11 or self._create_pkcs11(ffi)

4
releasenotes/notes/remove-pkcs11-token-label-69d4368906b91b7e.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``token_label`` option in the PKCS#11 driver has been removed.