summaryrefslogtreecommitdiff
path: root/keymanager/src/leap
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-12-19 07:38:42 -0600
committerRuben Pollan <meskio@sindominio.net>2015-01-15 13:10:57 -0600
commit679a1b90b11c9b7e06fde72e72314c757af7767e (patch)
treeb92afbfb0f909a7eddeb80358c7802902fbb0ed9 /keymanager/src/leap
parentfb74dafe063683441108a198fc09d85b4d68c276 (diff)
Fix key upgrade on no expiration date and higher validation level
Diffstat (limited to 'keymanager/src/leap')
-rw-r--r--keymanager/src/leap/keymanager/validation.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keymanager/src/leap/keymanager/validation.py b/keymanager/src/leap/keymanager/validation.py
index 245013e5..87de2af8 100644
--- a/keymanager/src/leap/keymanager/validation.py
+++ b/keymanager/src/leap/keymanager/validation.py
@@ -82,7 +82,8 @@ def can_upgrade(new_key, old_key):
return True
# No expiration date and higher validation level
- elif new_key.validation >= old_key.validation:
+ if (old_key.expiry_date is None and
+ new_key.validation > old_key.validation):
return True
return False