openstack/barbican
Code Issues Proposed changes

Merge "Pass secret metadata to crypto extension manager for plugin search."

Browse Source
This commit is contained in:
Jenkins 2014-05-16 19:52:18 +00:00 committed by Gerrit Code Review
commit 309665cb41
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
barbican/crypto/extension_manager.py
View File

@ -305,7 +305,9 @@ class CryptoExtensionManager(named.NamedExtensionManager):
is then returned from this method.
"""
encrypting_plugin = \
self._determine_crypto_plugin(secret.algorithm)
self._determine_crypto_plugin(secret.algorithm,
secret.bit_length,
secret.mode)
kek_datum, kek_meta_dto = self._find_or_create_kek_objects(
encrypting_plugin, tenant, kek_repo)

15
barbican/tests/crypto/test_extension_manager.py
View File

@ -315,6 +315,21 @@ class WhenTestingCryptoExtensionManager(testtools.TestCase):
mock.MagicMock(),
)
def test_generate_symmetric_encryption_key(self):
secret = mock.MagicMock(algorithm='aes', bit_length=128)
content_type = 'application/octet-stream'
tenant = mock.MagicMock()
kek_repo = mock.MagicMock(name='kek_repo')
plugin = SimpleCryptoPlugin()
plugin_mock = mock.MagicMock(obj=plugin)
self.manager.extensions = [plugin_mock]
datum = self.manager.generate_symmetric_encryption_key(
secret, content_type, tenant, kek_repo
)
self.assertIsNotNone(datum)
def test_generate_data_encryption_key_no_supported_plugin(self):
plugin = TestSupportsCryptoPlugin()
plugin_mock = mock.MagicMock(obj=plugin)