jgaunt/pykmip
2
0
Fork 0
mirror of https://github.com/openkmip/pykmip synced 2025-12-15 15:53:36 +00:00
Code Issues Releases Wiki Activity

Update key wrapping data structures to support dict arguments

Browse Source 
This change makes several minor updates to different structs
pertaining to key wrapping, allowing these structs to accept and
process dict arguments. Unit tests have been updated to reflect
this change.
This commit is contained in:
Peter Hamilton
2017-10-04 16:58:35 -04:00
parent 84a8168a11
commit 9acf38568f
2 changed files with 120 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kmip/core/objects.py
View File

@@ -715,8 +715,10 @@ class EncryptionKeyInformation(Struct):
@cryptographic_parameters.setter
def cryptographic_parameters(self, value):
if value is None:
if not value:
self._cryptographic_parameters = None
elif isinstance(value, dict):
self._cryptographic_parameters = CryptographicParameters(**value)
elif isinstance(value, CryptographicParameters):
self._cryptographic_parameters = value
else:
@@ -871,8 +873,10 @@ class MACSignatureKeyInformation(primitives.Struct):
@cryptographic_parameters.setter
def cryptographic_parameters(self, value):
if value is None:
if not value:
self._cryptographic_parameters = None
elif isinstance(value, dict):
self._cryptographic_parameters = CryptographicParameters(**value)
elif isinstance(value, CryptographicParameters):
self._cryptographic_parameters = value
else:
@@ -1051,8 +1055,11 @@ class KeyWrappingData(Struct):
@encryption_key_information.setter
def encryption_key_information(self, value):
if value is None:
if not value:
self._encryption_key_information = None
elif isinstance(value, dict):
self._encryption_key_information = \
EncryptionKeyInformation(**value)
elif isinstance(value, EncryptionKeyInformation):
self._encryption_key_information = value
else:
@@ -1067,8 +1074,11 @@ class KeyWrappingData(Struct):
@mac_signature_key_information.setter
def mac_signature_key_information(self, value):
if value is None:
if not value:
self._mac_signature_key_information = None
elif isinstance(value, dict):
self._mac_signature_key_information = \
MACSignatureKeyInformation(**value)
elif isinstance(value, MACSignatureKeyInformation):
self._mac_signature_key_information = value
else: