From c6e5296ed7e9c5021d09dde381d77d2d17d5715d Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Fri, 19 Dec 2014 07:38:42 -0600
Subject: Fix key upgrade on no expiration date and higher validation level

---
 src/leap/keymanager/validation.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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
-- 
cgit v1.2.3