diff options
Diffstat (limited to 'src/leap/bitmask/keymanager/keys.py')
| -rw-r--r-- | src/leap/bitmask/keymanager/keys.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/keymanager/keys.py b/src/leap/bitmask/keymanager/keys.py index 6c0c64ff..0f68c06b 100644 --- a/src/leap/bitmask/keymanager/keys.py +++ b/src/leap/bitmask/keymanager/keys.py @@ -191,7 +191,7 @@ class OpenPGPKey(object): return False - def merge(self, newkey, key_renewal=False): + def merge(self, newkey): if newkey.fingerprint != self.fingerprint: self.log.critical( "Can't put a key whith the same key_id and different " @@ -223,8 +223,7 @@ class OpenPGPKey(object): if newkey.last_audited_at > self.last_audited_at: self.validation = newkey.last_audited_at self.encr_used = newkey.encr_used or self.encr_used - if not key_renewal: - self.sign_used = newkey.sign_used or self.sign_used + self.sign_used = newkey.sign_used or self.sign_used self.refreshed_at = datetime.now() def get_json(self): |