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

Merge pull request #34 from callidus/bug-fixes

Browse Source 
A few bug fixes in objects
This commit is contained in:
Peter Hamilton 2015-06-24 12:52:11 -04:00
commit 5025925388
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kmip/core/objects.py
View File

@ -571,7 +571,7 @@ class EncodingOption(Enumeration):
ENUM_TYPE = enums.EncodingOption ENUM_TYPE = enums.EncodingOption
def __init__(self, value=None): def __init__(self, value=None):
super(WrappingMethod, self).__init__(value, Tags.ENCODING_OPTION) super(EncodingOption, self).__init__(value, Tags.ENCODING_OPTION)
class KeyInformation(Struct): class KeyInformation(Struct):
@ -580,8 +580,7 @@ class KeyInformation(Struct):
unique_identifier=None, unique_identifier=None,
cryptographic_parameters=None, cryptographic_parameters=None,
tag=Tags.ENCRYPTION_KEY_INFORMATION): tag=Tags.ENCRYPTION_KEY_INFORMATION):
super(KeyInformation, self).__init__( super(KeyInformation, self).__init__(tag=tag)
tag=Tags.ENCRYPTION_KEY_INFORMATION)
self.unique_identifier = unique_identifier self.unique_identifier = unique_identifier
self.cryptographic_parameters = cryptographic_parameters self.cryptographic_parameters = cryptographic_parameters
self.validate() self.validate()