merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
405 changed files with 15187 additions and 37744 deletions
Showing only changes of commit 1ac05754be - Show all commits

View File

@@ -1141,6 +1141,12 @@ omemo_on_message_recv(const char* const from_jid, uint32_t sid,
return NULL;
}
if (payload == NULL) {
signal_buffer_free(plaintext_key);
*error = OMEMO_ERR_KEY_TRANSPORT;
return NULL;
}
if (signal_buffer_len(plaintext_key) != AES128_GCM_KEY_LENGTH + AES128_GCM_TAG_LENGTH) {
log_error("[OMEMO][RECV] invalid key length");
signal_buffer_free(plaintext_key);
@@ -1148,12 +1154,6 @@ omemo_on_message_recv(const char* const from_jid, uint32_t sid,
return NULL;
}
if (payload == NULL) {
signal_buffer_free(plaintext_key);
*error = OMEMO_ERR_KEY_TRANSPORT;
return NULL;
}
size_t plaintext_len = payload_len;
plaintext = malloc(plaintext_len + 1);
res = aes128gcm_decrypt(plaintext, &plaintext_len, payload, payload_len, iv,