tyler.durden/PyKMIP
1
0
Fork 0
mirror of https://github.com/OpenKMIP/PyKMIP.git synced 2025-07-24 14:34:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #419 from OpenKMIP/bug/fix-create-key-pair-masks

Browse Source 
Fix cryptographic usage mask handling for CreateKeyPair
This commit is contained in:
Peter Hamilton 2018-04-11 22:17:00 -04:00 committed by GitHub
commit 33d1aabf76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kmip/core/objects.py
View File

@ -2453,6 +2453,8 @@ class TemplateAttribute(Struct):
if len(self.attributes) != len(other.attributes): if len(self.attributes) != len(other.attributes):
return False return False
# TODO (peter-hamilton) Allow order independence?
for i in xrange(len(self.names)): for i in xrange(len(self.names)):
a = self.names[i] a = self.names[i]
b = other.names[i] b = other.names[i]

25
kmip/pie/client.py
View File

@ -227,13 +227,13 @@ class ProxyKmipClient(object):
length (int): The length in bits for the key pair. length (int): The length in bits for the key pair.
operation_policy_name (string): The name of the operation policy operation_policy_name (string): The name of the operation policy
to use for the new key pair. Optional, defaults to None. to use for the new key pair. Optional, defaults to None.
public_name (string): The name to give the public key. public_name (string): The name to give the public key. Optional,
Optional, defaults to None. defaults to None.
public_usage_mask (list): A list of CryptographicUsageMask public_usage_mask (list): A list of CryptographicUsageMask
enumerations indicating how the public key should be used. enumerations indicating how the public key should be used.
Optional, defaults to None. Optional, defaults to None.
private_name (string): The name to give the public key. private_name (string): The name to give the public key. Optional,
Optional, defaults to None. defaults to None.
private_usage_mask (list): A list of CryptographicUsageMask private_usage_mask (list): A list of CryptographicUsageMask
enumerations indicating how the private key should be used. enumerations indicating how the private key should be used.
Optional, defaults to None. Optional, defaults to None.
@ -258,9 +258,20 @@ class ProxyKmipClient(object):
common_attributes = self._build_common_attributes( common_attributes = self._build_common_attributes(
operation_policy_name operation_policy_name
) )
key_attributes = self._build_key_attributes(algorithm, length)
key_attributes.extend(common_attributes) algorithm_attribute = self.attribute_factory.create_attribute(
template = cobjects.CommonTemplateAttribute(attributes=key_attributes) enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM,
algorithm
)
length_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_LENGTH,
length
)
common_attributes.extend([algorithm_attribute, length_attribute])
template = cobjects.CommonTemplateAttribute(
attributes=common_attributes
)
# Create public / private specific attributes # Create public / private specific attributes
public_template = None public_template = None

6
kmip/tests/integration/services/test_proxykmipclient.py
View File

@ -181,7 +181,11 @@ class TestProxyKmipClientIntegration(testtools.TestCase):
asymmetric key pair. asymmetric key pair.
""" """
public_uid, private_uid = self.client.create_key_pair( public_uid, private_uid = self.client.create_key_pair(
enums.CryptographicAlgorithm.RSA, 2048) enums.CryptographicAlgorithm.RSA,
2048,
public_usage_mask=[enums.CryptographicUsageMask.ENCRYPT],
private_usage_mask=[enums.CryptographicUsageMask.DECRYPT]
)
self.assertIsInstance(public_uid, six.string_types) self.assertIsInstance(public_uid, six.string_types)
self.assertIsInstance(private_uid, six.string_types) self.assertIsInstance(private_uid, six.string_types)

35
kmip/tests/unit/pie/test_client.py
View File

@ -450,12 +450,8 @@ class TestProxyKmipClient(testtools.TestCase):
enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM, algorithm) enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM, algorithm)
length_attribute = self.attribute_factory.create_attribute( length_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_LENGTH, length) enums.AttributeType.CRYPTOGRAPHIC_LENGTH, length)
mask_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_USAGE_MASK,
[enums.CryptographicUsageMask.ENCRYPT,
enums.CryptographicUsageMask.DECRYPT])
attributes = [algorithm_attribute, length_attribute, mask_attribute] attributes = [algorithm_attribute, length_attribute]
template = obj.CommonTemplateAttribute(attributes=attributes) template = obj.CommonTemplateAttribute(attributes=attributes)
status = enums.ResultStatus.SUCCESS status = enums.ResultStatus.SUCCESS
@ -470,7 +466,9 @@ class TestProxyKmipClient(testtools.TestCase):
client.proxy.create_key_pair.return_value = result client.proxy.create_key_pair.return_value = result
public_uid, private_uid = client.create_key_pair( public_uid, private_uid = client.create_key_pair(
enums.CryptographicAlgorithm.RSA, 2048) enums.CryptographicAlgorithm.RSA,
2048
)
kwargs = {'common_template_attribute': template, kwargs = {'common_template_attribute': template,
'private_key_template_attribute': None, 'private_key_template_attribute': None,
@ -494,20 +492,15 @@ class TestProxyKmipClient(testtools.TestCase):
enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM, algorithm) enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM, algorithm)
length_attribute = self.attribute_factory.create_attribute( length_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_LENGTH, length) enums.AttributeType.CRYPTOGRAPHIC_LENGTH, length)
mask_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_USAGE_MASK,
[enums.CryptographicUsageMask.ENCRYPT,
enums.CryptographicUsageMask.DECRYPT])
opn_attribute = self.attribute_factory.create_attribute( opn_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.OPERATION_POLICY_NAME, enums.AttributeType.OPERATION_POLICY_NAME,
'test' 'test'
) )
pair_attributes = [ pair_attributes = [
opn_attribute,
algorithm_attribute, algorithm_attribute,
length_attribute, length_attribute
mask_attribute,
opn_attribute
] ]
template = obj.CommonTemplateAttribute(attributes=pair_attributes) template = obj.CommonTemplateAttribute(attributes=pair_attributes)
@ -548,10 +541,6 @@ class TestProxyKmipClient(testtools.TestCase):
enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM, algorithm) enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM, algorithm)
length_attribute = self.attribute_factory.create_attribute( length_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_LENGTH, length) enums.AttributeType.CRYPTOGRAPHIC_LENGTH, length)
mask_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_USAGE_MASK,
[enums.CryptographicUsageMask.ENCRYPT,
enums.CryptographicUsageMask.DECRYPT])
private_name_attribute = self.attribute_factory.create_attribute( private_name_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.NAME, "private") enums.AttributeType.NAME, "private")
@ -560,8 +549,8 @@ class TestProxyKmipClient(testtools.TestCase):
pair_attributes = [ pair_attributes = [
algorithm_attribute, algorithm_attribute,
length_attribute, length_attribute
mask_attribute] ]
template = obj.CommonTemplateAttribute(attributes=pair_attributes) template = obj.CommonTemplateAttribute(attributes=pair_attributes)
private_template = obj.PrivateKeyTemplateAttribute( private_template = obj.PrivateKeyTemplateAttribute(
@ -607,10 +596,6 @@ class TestProxyKmipClient(testtools.TestCase):
enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM, algorithm) enums.AttributeType.CRYPTOGRAPHIC_ALGORITHM, algorithm)
length_attribute = self.attribute_factory.create_attribute( length_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_LENGTH, length) enums.AttributeType.CRYPTOGRAPHIC_LENGTH, length)
mask_attribute = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_USAGE_MASK,
[enums.CryptographicUsageMask.ENCRYPT,
enums.CryptographicUsageMask.DECRYPT])
private_usage_mask = self.attribute_factory.create_attribute( private_usage_mask = self.attribute_factory.create_attribute(
enums.AttributeType.CRYPTOGRAPHIC_USAGE_MASK, enums.AttributeType.CRYPTOGRAPHIC_USAGE_MASK,
@ -623,8 +608,8 @@ class TestProxyKmipClient(testtools.TestCase):
pair_attributes = [ pair_attributes = [
algorithm_attribute, algorithm_attribute,
length_attribute, length_attribute
mask_attribute] ]
template = obj.CommonTemplateAttribute(attributes=pair_attributes) template = obj.CommonTemplateAttribute(attributes=pair_attributes)
private_template = obj.PrivateKeyTemplateAttribute( private_template = obj.PrivateKeyTemplateAttribute(