diff options
| author | Vladislav Yarmak <vladislav-ex-gitlab@vm-0.com> | 2020-09-08 19:50:48 +0300 |
|---|---|---|
| committer | Philipp Hörist <philipp@hoerist.com> | 2020-09-08 19:50:48 +0300 |
| commit | fd4acbc71e357edd211d0844667e330b547a4608 (patch) | |
| tree | 21f351aef4d830f761ef234780d79bd27c24cfff /pgp/modules | |
| parent | 9da3d02bc750f0f2258e2c751d0c24749cc805e5 (diff) | |
[pgp] Use full key fingerprints instead of short ids
Diffstat (limited to 'pgp/modules')
| -rw-r--r-- | pgp/modules/pgp_legacy.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pgp/modules/pgp_legacy.py b/pgp/modules/pgp_legacy.py index 7bc0901..22a2261 100644 --- a/pgp/modules/pgp_legacy.py +++ b/pgp/modules/pgp_legacy.py @@ -74,8 +74,9 @@ class PGPLegacy(BaseModule): self.own_jid = self._con.get_own_jid() - self._store = KeyStore(self._account, self.own_jid, self._log) self._pgp = PGP() + self._store = KeyStore(self._account, self.own_jid, self._log, + self._pgp.list_keys) self._always_trust = [] self._presence_key_id_store = {} @@ -118,7 +119,7 @@ class PGPLegacy(BaseModule): if key_id is None: return - self._presence_key_id_store[jid] = key_id[8:] + self._presence_key_id_store[jid] = key_id key_data = self.get_contact_key_data(jid) if key_data is not None: @@ -131,7 +132,7 @@ class PGPLegacy(BaseModule): return self._log.info('Assign key-id: %s to %s', key_id, jid) - self.set_contact_key_data(jid, (key_id[8:], key[0]['uids'][0])) + self.set_contact_key_data(jid, (key_id, key[0]['uids'][0])) def _message_received(self, _con, stanza, properties): if not properties.is_pgp_legacy or properties.from_muc: |