openstack/barbican
Code Issues Proposed changes

Merge "Set correct names for Thales and NetHSM"

Browse Source
This commit is contained in:
Zuul 2020-01-23 01:03:30 +00:00 committed by Gerrit Code Review
commit 8443b878a7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barbican/plugin/crypto/pkcs11.py
View File

@ -142,7 +142,7 @@ CKM_AES_KEY_WRAP = 0x1090
CKM_GENERIC_SECRET_KEY_GEN = 0x350 CKM_GENERIC_SECRET_KEY_GEN = 0x350
VENDOR_SAFENET_CKM_AES_GCM = 0x8000011c VENDOR_SAFENET_CKM_AES_GCM = 0x8000011c
# Thales Vendor-defined Mechanisms # nCipher Vendor-defined Mechanisms
CKM_NC_SHA256_HMAC_KEY_GEN = 0xDE436997 CKM_NC_SHA256_HMAC_KEY_GEN = 0xDE436997
_ENCRYPTION_MECHANISMS = { _ENCRYPTION_MECHANISMS = {

6
doc/source/install/barbican-backend.rst
View File

@ -125,10 +125,10 @@ The PKCS#11 plugin configuration looks like:
# Max number of items in pkek cache # Max number of items in pkek cache
# pkek_cache_limit = 100 # pkek_cache_limit = 100
Thales nCipher
++++++ +++++++
For a Thales NetHSM, the plugin configuration looks like: For a nCipher nShield Connect XC, the plugin configuration looks like:
.. code-block:: ini .. code-block:: ini