openstack
/
barbican
Code Issues Proposed changes

Merge "pkcs11-key-generation: convert mkek length to int"

This commit is contained in:
Jenkins 2016-07-17 22:52:15 +00:00 committed by Gerrit Code Review
parent e3ac69a008 50b4a1ae69
commit 2f2d718bb7
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
barbican/cmd/pkcs11_key_generation.py
View File

@ -95,15 +95,16 @@ class KeyGenerator(object):
def generate_mkek(self, args):
"""Process the generate MKEK with given arguments"""
self.verify_label_does_not_exist(args.label, self.session)
self.pkcs11.generate_key(args.length, self.session, args.label,
self.pkcs11.generate_key(int(args.length), self.session, args.label,
encrypt=True, wrap=True, master_key=True)
print ("MKEK successfully generated!")
def generate_hmac(self, args):
"""Process the generate HMAC with given arguments"""
self.verify_label_does_not_exist(args.label, self.session)
self.pkcs11.generate_key(args.length, self.session, args.label,
sign=True, master_key=True)
self.pkcs11.generate_key(int(args.length), self.session,
args.label, sign=True,
master_key=True)
print ("HMAC successfully generated!")
def execute(self):

25
barbican/tests/cmd/test_barbican_manage.py
View File

@ -154,3 +154,28 @@ class TestBarbicanManage(TestBarbicanManageBase):
'--library-path', 'mocklib', '--passphrase', 'mockpassewd',
'--label', 'mocklabel'], mock_genkey,
32, 1, 'mocklabel', sign=True, master_key=True)
@mock.patch('barbican.plugin.crypto.pkcs11.PKCS11')
def test_hsm_gen_mkek_non_default_length(self, mock_pkcs11):
mock_pkcs11.return_value.get_session.return_value = 1
mock_pkcs11.return_value.get_key_handle.return_value = None
mock_pkcs11.return_value.generate_key.return_value = 0
mock_genkey = mock_pkcs11.return_value.generate_key
self._main_test_helper(
['barbican.cmd.barbican_manage', 'hsm', 'gen_mkek',
'--length', '48', '--library-path', 'mocklib',
'--passphrase', 'mockpassewd', '--label', 'mocklabel'],
mock_genkey, 48, 1, 'mocklabel', encrypt=True, wrap=True,
master_key=True)
@mock.patch('barbican.plugin.crypto.pkcs11.PKCS11')
def test_hsm_gen_hmac_non_default_length(self, mock_pkcs11):
mock_pkcs11.return_value.get_session.return_value = 1
mock_pkcs11.return_value.get_key_handle.return_value = None
mock_pkcs11.return_value.generate_key.return_value = 0
mock_genkey = mock_pkcs11.return_value.generate_key
self._main_test_helper(
['barbican.cmd.barbican_manage', 'hsm', 'gen_hmac',
'--length', '48', '--library-path', 'mocklib',
'--passphrase', 'mockpassewd', '--label', 'mocklabel'],
mock_genkey, 48, 1, 'mocklabel', sign=True, master_key=True)