Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2014-04-12 22:45:25 +0200
committerArthur de Jong <arthur@arthurdejong.org>2014-04-13 13:44:43 +0200
commit2ff470fa3b7d8eb0dc0a504e9007ba352584fe69 (patch)
treebfacf49545b9e5446cd669b65103f3c0fdb21ff9
parent460f335781f8146a04262edb8f2384310118baee (diff)
Add id attribute from EncryptionKey
-rw-r--r--pskc/encryption.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pskc/encryption.py b/pskc/encryption.py
index 2c06ae6..b310715 100644
--- a/pskc/encryption.py
+++ b/pskc/encryption.py
@@ -71,14 +71,17 @@ class Encryption(object):
"""Class for handling encryption keys that are used in the PSKC file."""
def __init__(self, key_info=None):
+ self.id = None
self.key_names = []
self.key = None
- if key_info is not None:
- self.parse(key_info)
+ self.parse(key_info)
def parse(self, key_info):
"""Read encryption information from the EncryptionKey XML tree."""
from pskc.parse import g_e_v, namespaces
+ if key_info is None:
+ return
+ self.id = key_info.attrib.get('Id')
for name in key_info.findall('ds:KeyName', namespaces=namespaces):
self.key_names.append(g_e_v(name, '.'))