hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[openpgp] Adapt to nbxmpp changes

Browse Source
This commit is contained in:
lovetox
2020-11-19 21:28:13 +01:00
parent ee0e8903c9
commit faf07ed819
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openpgp/modules/openpgp.py
View File

@@ -215,13 +215,13 @@ class OpenPGP(BaseModule):
signcrypt = Node(node=payload) signcrypt = Node(node=payload)
try: try:
payload, to, timestamp = parse_signcrypt(signcrypt) payload, recipients, _timestamp = parse_signcrypt(signcrypt)
except StanzaMalformed as error: except StanzaMalformed as error:
log.warning('Decryption failed: %s', error) log.warning('Decryption failed: %s', error)
log.warning(payload) log.warning(payload)
return return
if not self.own_jid.bareMatch(to): if not any(map(self.own_jid.bareMatch, recipients)):
log.warning('to attr not valid') log.warning('to attr not valid')
log.warning(payload) log.warning(payload)
return return
@@ -241,7 +241,9 @@ class OpenPGP(BaseModule):
keys += self._contacts.get_keys(self.own_jid) keys += self._contacts.get_keys(self.own_jid)
keys += [Key(self._fingerprint, None)] keys += [Key(self._fingerprint, None)]
payload = create_signcrypt_node(obj.stanza, NOT_ENCRYPTED_TAGS) payload = create_signcrypt_node(obj.stanza,
[obj.jid],
NOT_ENCRYPTED_TAGS)
encrypted_payload, error = self._pgp.encrypt(payload, keys) encrypted_payload, error = self._pgp.encrypt(payload, keys)
if error: if error: