summaryrefslogtreecommitdiff
path: root/src/leap/keymanager
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
commitc6e5296ed7e9c5021d09dde381d77d2d17d5715d (patch)
treed0ea5462c89dd1080393ec8f23de4a8a6d136a2c /src/leap/keymanager
parent9482f5426dca3c9f053b71501aa08514cfab6672 (diff)
Fix key upgrade on no expiration date and higher validation level
Diffstat (limited to 'src/leap/keymanager')
-rw-r--r--src/leap/keymanager/validation.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/keymanager/validation.py b/src/leap/keymanager/validation.py
index 245013e5..87de2af8 100644
--- a/src/leap/keymanager/validation.py
+++ b/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