changeset cfb14b4cf025 in /home/hg/repos/gajim-plugins
author: lovetox <[email protected]>
branches:
details:gajim-plugins?cmd=changeset;node=cfb14b4cf025
description: Check PreKeyAmount before publishing bundle
diffstat:
omemo/omemo/state.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (27 lines):
diff -r 4e977e043adf -r cfb14b4cf025 omemo/omemo/state.py
--- a/omemo/omemo/state.py Sat Jul 23 15:29:00 2016 +0200
+++ b/omemo/omemo/state.py Sat Jul 23 16:15:02 2016 +0200
@@ -148,6 +148,7 @@
@property
def bundle(self):
+ self.checkPreKeyAmount()
prekeys = [
(k.getId(), b64encode(k.getKeyPair().getPublicKey().serialize()))
for k in self.store.loadPreKeys()
@@ -337,7 +338,9 @@
sessionCipher = self.get_session_cipher(recipient_id, device_id)
if self.isTrusted(sessionCipher) != UNTRUSTED:
key = sessionCipher.decryptPkmsg(preKeyWhisperMessage)
- self.checkPreKeyAmount()
+ # Publish new bundle after PreKey has been used
+ # for building a new Session
+ self.plugin.publish_bundle(self.account)
return key
else:
raise Exception("Received PreKeyWhisperMessage "
@@ -362,4 +365,3 @@
self.store.preKeyStore.generateNewPreKeys(newKeys)
log.info(self.account + ' => ' + str(newKeys) +
' PreKeys created')
- self.plugin.publish_bundle(self.account)
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
