From 6fa8b2a9e7f02c59f794e9dd080fac574841e50b Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Fri, 19 Dec 2014 22:37:40 -0600
Subject: upgrade key when signed by old key

---
 src/leap/keymanager/validation.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/leap/keymanager/validation.py')

diff --git a/src/leap/keymanager/validation.py b/src/leap/keymanager/validation.py
index b3aff3e..c6fe478 100644
--- a/src/leap/keymanager/validation.py
+++ b/src/leap/keymanager/validation.py
@@ -60,8 +60,6 @@ def can_upgrade(new_key, old_key):
     :type old_key: EncryptionKey
     :rtype: bool
     """
-    # XXX implement key signature checking (#6120)
-
     # First contact
     if old_key is None:
         return True
@@ -90,4 +88,8 @@ def can_upgrade(new_key, old_key):
             new_key.validation > old_key.validation):
         return True
 
+    # New key signed by the old key
+    if old_key.key_id in new_key.signatures:
+        return True
+
     return False
-- 
cgit v1.2.3