Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
path: root/pskc
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2016-09-11 21:41:37 +0200
committerArthur de Jong <arthur@arthurdejong.org>2016-09-11 23:44:05 +0200
commitff811c9041312c2ae5eaa3bb47b96e3ea5f6f9db (patch)
treefb73fffeef998b42dc693720da92157ef9aead05 /pskc
parentfa07aa588d8c0b5932bab2b056e07ed9c11dd7eb (diff)
Fix bug in passing explicit key to setup_preshared_key()
Diffstat (limited to 'pskc')
-rw-r--r--pskc/encryption.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pskc/encryption.py b/pskc/encryption.py
index 16cc565..fd8dd49 100644
--- a/pskc/encryption.py
+++ b/pskc/encryption.py
@@ -335,8 +335,8 @@ class Encryption(object):
chosen for missing arguments.
"""
self._setup_encryption(kwargs)
- key = kwargs.pop('key', self.key)
- if not key:
+ self.key = kwargs.pop('key', self.key)
+ if not self.key:
from Crypto import Random
self.key = Random.get_random_bytes(kwargs.pop(
'key_length', self.algorithm_key_lengths[-1]))