aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Fix prekey handling after first use

Browse Source 
libsignal will remove prekey on its own.
This commit is contained in:
Paul Fariello 2019-03-15 18:47:43 +01:40
parent 319fb856e0
commit 33b0b46420
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/omemo/omemo.c
View File

@ -675,21 +675,20 @@ omemo_on_message_recv(const char *const from, uint32_t sid,
pre_key_signal_message_deserialize(&message, key->data, key->length, omemo_ctx.signal); pre_key_signal_message_deserialize(&message, key->data, key->length, omemo_ctx.signal);
res = session_cipher_decrypt_pre_key_signal_message(cipher, message, NULL, &plaintext_key);
/* Replace used pre_key in bundle */ /* Replace used pre_key in bundle */
uint32_t pre_key_id = pre_key_signal_message_get_pre_key_id(message); uint32_t pre_key_id = pre_key_signal_message_get_pre_key_id(message);
g_hash_table_remove(omemo_ctx.pre_key_store, GINT_TO_POINTER(pre_key_id));
ec_key_pair *ec_pair; ec_key_pair *ec_pair;
session_pre_key *new_pre_key; session_pre_key *new_pre_key;
curve_generate_key_pair(omemo_ctx.signal, &ec_pair); curve_generate_key_pair(omemo_ctx.signal, &ec_pair);
session_pre_key_create(&new_pre_key, pre_key_id, ec_pair); session_pre_key_create(&new_pre_key, pre_key_id, ec_pair);
g_hash_table_insert(omemo_ctx.pre_key_store, GINT_TO_POINTER(pre_key_id), new_pre_key); signal_protocol_pre_key_store_key(omemo_ctx.store, new_pre_key);
omemo_bundle_publish(); omemo_bundle_publish();
if (res == 0) {
/* Start a new session */ /* Start a new session */
omemo_bundle_request(from, sid, omemo_start_device_session_handle_bundle, free, strdup(from)); omemo_bundle_request(from, sid, omemo_start_device_session_handle_bundle, free, strdup(from));
}
/* Try to decrypt message anyway, it will fail */
res = session_cipher_decrypt_pre_key_signal_message(cipher, message, NULL, &plaintext_key);
} else { } else {
log_debug("OMEMO: decrypting message with existing session"); log_debug("OMEMO: decrypting message with existing session");
signal_message *message; signal_message *message;
@ -697,7 +696,7 @@ omemo_on_message_recv(const char *const from, uint32_t sid,
res = session_cipher_decrypt_signal_message(cipher, message, NULL, &plaintext_key); res = session_cipher_decrypt_signal_message(cipher, message, NULL, &plaintext_key);
} }
if (res != 0) { if (res != 0) {
log_debug("OMEMO: cannot to decrypt message key"); log_error("OMEMO: cannot decrypt message key");
return NULL; return NULL;
} }