diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2017-10-31 10:36:35 +0100 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2017-12-03 20:43:38 +0100 |
| commit | f6c71494f0ada864e80ee74c60ec09939a14f44b (patch) | |
| tree | 89f89a5549ad462ff5ee3fc2ed6cda8c0c367109 /src/leap/bitmask/keymanager/keys.py | |
| parent | d13fb37acd01dc1e4d62631e0e131a937a001f33 (diff) | |
[refactor] remove rengenerate key
We are not planning to regenerate keys (for now), only to extend the
expiration date.
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): |