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

Add support for disconnect in OMEMO

Browse Source
This commit is contained in:
Paul Fariello 2019-03-22 00:03:16 +01:00
parent bc541cb8ac
commit 91ee289c77
7 changed files with 140 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/event/client_events.c
View File

@ -98,6 +98,9 @@ cl_ev_disconnect(void)
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
p_gpg_on_disconnect(); p_gpg_on_disconnect();
#endif #endif
#ifdef HAVE_OMEMO
omemo_on_disconnect();
#endif
} }
void void

98
src/omemo/omemo.c
View File

@ -35,7 +35,6 @@ static void unlock(void *user_data);
static void omemo_log(int level, const char *message, size_t len, void *user_data); static void omemo_log(int level, const char *message, size_t len, void *user_data);
static gboolean handle_own_device_list(const char *const jid, GList *device_list); static gboolean handle_own_device_list(const char *const jid, GList *device_list);
static gboolean handle_device_list_start_session(const char *const jid, GList *device_list); static gboolean handle_device_list_start_session(const char *const jid, GList *device_list);
static void free_omemo_key(omemo_key_t *key);
static char * omemo_fingerprint(ec_public_key *identity, gboolean formatted); static char * omemo_fingerprint(ec_public_key *identity, gboolean formatted);
static unsigned char *omemo_fingerprint_decode(const char *const fingerprint, size_t *len); static unsigned char *omemo_fingerprint_decode(const char *const fingerprint, size_t *len);
static void cache_device_identity(const char *const jid, uint32_t device_id, ec_public_key *identity); static void cache_device_identity(const char *const jid, uint32_t device_id, ec_public_key *identity);
@ -196,6 +195,8 @@ omemo_on_connect(ProfAccount *account)
} }
} }
g_string_free(basedir, TRUE);
omemo_devicelist_subscribe(); omemo_devicelist_subscribe();
omemo_ctx.identity_keyfile = g_key_file_new(); omemo_ctx.identity_keyfile = g_key_file_new();
@ -218,6 +219,28 @@ omemo_on_connect(ProfAccount *account)
} }
void
omemo_on_disconnect(void)
{
signal_protocol_signed_pre_key_remove_key(omemo_ctx.store, omemo_ctx.signed_pre_key_id);
g_hash_table_free(omemo_ctx.signed_pre_key_store);
GHashTableIter iter;
gpointer id;
g_hash_table_iter_init(&iter, omemo_ctx.pre_key_store);
while (g_hash_table_iter_next(&iter, &id, NULL)) {
signal_protocol_pre_key_remove_key(omemo_ctx.store, GPOINTER_TO_INT(id));
}
g_hash_table_free(omemo_ctx.pre_key_store);
g_string_free(omemo_ctx.identity_filename, TRUE);
g_key_file_free(omemo_ctx.identity_keyfile);
g_string_free(omemo_ctx.sessions_filename, TRUE);
g_key_file_free(omemo_ctx.sessions_keyfile);
}
void void
omemo_generate_crypto_materials(ProfAccount *account) omemo_generate_crypto_materials(ProfAccount *account)
{ {
@ -261,6 +284,13 @@ omemo_generate_short_term_crypto_materials(ProfAccount *account)
signal_protocol_key_helper_pre_key_list_node *pre_keys_head; signal_protocol_key_helper_pre_key_list_node *pre_keys_head;
signal_protocol_key_helper_generate_pre_keys(&pre_keys_head, start, 100, omemo_ctx.signal); signal_protocol_key_helper_generate_pre_keys(&pre_keys_head, start, 100, omemo_ctx.signal);
signal_protocol_key_helper_pre_key_list_node *p;
for (p = pre_keys_head; p != NULL; p = signal_protocol_key_helper_key_list_next(p)) {
session_pre_key *prekey = signal_protocol_key_helper_key_list_element(p);
signal_protocol_pre_key_store_key(omemo_ctx.store, prekey);
}
signal_protocol_key_helper_key_list_free(pre_keys_head);
session_signed_pre_key *signed_pre_key; session_signed_pre_key *signed_pre_key;
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
@ -268,13 +298,8 @@ omemo_generate_short_term_crypto_materials(ProfAccount *account)
omemo_ctx.signed_pre_key_id = 1; omemo_ctx.signed_pre_key_id = 1;
signal_protocol_key_helper_generate_signed_pre_key(&signed_pre_key, omemo_ctx.identity_key_pair, omemo_ctx.signed_pre_key_id, timestamp, omemo_ctx.signal); signal_protocol_key_helper_generate_signed_pre_key(&signed_pre_key, omemo_ctx.identity_key_pair, omemo_ctx.signed_pre_key_id, timestamp, omemo_ctx.signal);
signal_protocol_key_helper_pre_key_list_node *p;
for (p = pre_keys_head; p != NULL; p = signal_protocol_key_helper_key_list_next(p)) {
session_pre_key *prekey = signal_protocol_key_helper_key_list_element(p);
signal_protocol_pre_key_store_key(omemo_ctx.store, prekey);
}
signal_protocol_signed_pre_key_store_key(omemo_ctx.store, signed_pre_key); signal_protocol_signed_pre_key_store_key(omemo_ctx.store, signed_pre_key);
SIGNAL_UNREF(signed_pre_key);
loaded = TRUE; loaded = TRUE;
@ -315,6 +340,7 @@ omemo_start_muc_sessions(const char *const roomjid)
omemo_start_session(jid->barejid); omemo_start_session(jid->barejid);
jid_destroy(jid); jid_destroy(jid);
} }
g_list_free(roster);
} }
gboolean gboolean
@ -348,6 +374,7 @@ omemo_signed_prekey(unsigned char **output, size_t *length)
signal_protocol_signed_pre_key_load_key(omemo_ctx.store, &signed_pre_key, omemo_ctx.signed_pre_key_id); signal_protocol_signed_pre_key_load_key(omemo_ctx.store, &signed_pre_key, omemo_ctx.signed_pre_key_id);
ec_public_key_serialize(&buffer, ec_key_pair_get_public(session_signed_pre_key_get_key_pair(signed_pre_key))); ec_public_key_serialize(&buffer, ec_key_pair_get_public(session_signed_pre_key_get_key_pair(signed_pre_key)));
SIGNAL_UNREF(signed_pre_key);
*length = signal_buffer_len(buffer); *length = signal_buffer_len(buffer);
*output = malloc(*length); *output = malloc(*length);
memcpy(*output, signal_buffer_data(buffer), *length); memcpy(*output, signal_buffer_data(buffer), *length);
@ -363,6 +390,7 @@ omemo_signed_prekey_signature(unsigned char **output, size_t *length)
*length = session_signed_pre_key_get_signature_len(signed_pre_key); *length = session_signed_pre_key_get_signature_len(signed_pre_key);
*output = malloc(*length); *output = malloc(*length);
memcpy(*output, session_signed_pre_key_get_signature(signed_pre_key), *length); memcpy(*output, session_signed_pre_key_get_signature(signed_pre_key), *length);
SIGNAL_UNREF(signed_pre_key);
} }
void void
@ -382,9 +410,12 @@ omemo_prekeys(GList **prekeys, GList **ids, GList **lengths)
signal_buffer *public_key; signal_buffer *public_key;
ec_public_key_serialize(&public_key, ec_key_pair_get_public(session_pre_key_get_key_pair(pre_key))); ec_public_key_serialize(&public_key, ec_key_pair_get_public(session_pre_key_get_key_pair(pre_key)));
SIGNAL_UNREF(pre_key);
size_t length = signal_buffer_len(public_key); size_t length = signal_buffer_len(public_key);
unsigned char *prekey_value = malloc(length); unsigned char *prekey_value = malloc(length);
memcpy(prekey_value, signal_buffer_data(public_key), length); memcpy(prekey_value, signal_buffer_data(public_key), length);
signal_buffer_free(public_key);
*prekeys = g_list_append(*prekeys, prekey_value); *prekeys = g_list_append(*prekeys, prekey_value);
*ids = g_list_append(*ids, GINT_TO_POINTER(id)); *ids = g_list_append(*ids, GINT_TO_POINTER(id));
*lengths = g_list_append(*lengths, GINT_TO_POINTER(length)); *lengths = g_list_append(*lengths, GINT_TO_POINTER(length));
@ -454,7 +485,7 @@ omemo_start_device_session(const char *const jid, uint32_t device_id,
const unsigned char *const identity_key_raw, size_t identity_key_len) const unsigned char *const identity_key_raw, size_t identity_key_len)
{ {
signal_protocol_address address = { signal_protocol_address address = {
.name = strdup(jid), .name = jid,
.name_len = strlen(jid), .name_len = strlen(jid),
.device_id = device_id, .device_id = device_id,
}; };
@ -538,7 +569,7 @@ omemo_start_device_session(const char *const jid, uint32_t device_id,
} }
out: out:
g_list_free_full(prekeys, (GDestroyNotify)free_omemo_key); SIGNAL_UNREF(identity_key);
jid_destroy(ownjid); jid_destroy(ownjid);
} }
@ -591,6 +622,7 @@ omemo_on_message_send(ProfWin *win, const char *const message, gboolean request_
} }
jid_destroy(jid); jid_destroy(jid);
} }
g_list_free(roster);
} else { } else {
ProfChatWin *chatwin = (ProfChatWin *)win; ProfChatWin *chatwin = (ProfChatWin *)win;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
@ -625,17 +657,20 @@ omemo_on_message_send(ProfWin *win, const char *const message, gboolean request_
} }
res = session_cipher_encrypt(cipher, key_tag, AES128_GCM_KEY_LENGTH + AES128_GCM_TAG_LENGTH, &ciphertext); res = session_cipher_encrypt(cipher, key_tag, AES128_GCM_KEY_LENGTH + AES128_GCM_TAG_LENGTH, &ciphertext);
session_cipher_free(cipher);
if (res != 0) { if (res != 0) {
log_error("OMEMO: cannot encrypt key for %s device id %d", address.name, address.device_id); log_error("OMEMO: cannot encrypt key for %s device id %d", address.name, address.device_id);
continue; continue;
} }
signal_buffer *buffer = ciphertext_message_get_serialized(ciphertext); signal_buffer *buffer = ciphertext_message_get_serialized(ciphertext);
omemo_key_t *key = malloc(sizeof(omemo_key_t)); omemo_key_t *key = malloc(sizeof(omemo_key_t));
key->data = signal_buffer_data(buffer);
key->length = signal_buffer_len(buffer); key->length = signal_buffer_len(buffer);
key->data = malloc(key->length);
memcpy(key->data, signal_buffer_data(buffer), key->length);
key->device_id = GPOINTER_TO_INT(device_ids_iter->data); key->device_id = GPOINTER_TO_INT(device_ids_iter->data);
key->prekey = ciphertext_message_get_type(ciphertext) == CIPHERTEXT_PREKEY_TYPE; key->prekey = ciphertext_message_get_type(ciphertext) == CIPHERTEXT_PREKEY_TYPE;
keys = g_list_append(keys, key); keys = g_list_append(keys, key);
SIGNAL_UNREF(ciphertext);
} }
} }
@ -660,17 +695,20 @@ omemo_on_message_send(ProfWin *win, const char *const message, gboolean request_
} }
res = session_cipher_encrypt(cipher, key_tag, AES128_GCM_KEY_LENGTH + AES128_GCM_TAG_LENGTH, &ciphertext); res = session_cipher_encrypt(cipher, key_tag, AES128_GCM_KEY_LENGTH + AES128_GCM_TAG_LENGTH, &ciphertext);
session_cipher_free(cipher);
if (res != 0) { if (res != 0) {
log_error("OMEMO: cannot encrypt key for %s device id %d", address.name, address.device_id); log_error("OMEMO: cannot encrypt key for %s device id %d", address.name, address.device_id);
continue; continue;
} }
signal_buffer *buffer = ciphertext_message_get_serialized(ciphertext); signal_buffer *buffer = ciphertext_message_get_serialized(ciphertext);
omemo_key_t *key = malloc(sizeof(omemo_key_t)); omemo_key_t *key = malloc(sizeof(omemo_key_t));
key->data = signal_buffer_data(buffer);
key->length = signal_buffer_len(buffer); key->length = signal_buffer_len(buffer);
key->data = malloc(key->length);
memcpy(key->data, signal_buffer_data(buffer), key->length);
key->device_id = GPOINTER_TO_INT(device_ids_iter->data); key->device_id = GPOINTER_TO_INT(device_ids_iter->data);
key->prekey = ciphertext_message_get_type(ciphertext) == CIPHERTEXT_PREKEY_TYPE; key->prekey = ciphertext_message_get_type(ciphertext) == CIPHERTEXT_PREKEY_TYPE;
keys = g_list_append(keys, key); keys = g_list_append(keys, key);
SIGNAL_UNREF(ciphertext);
} }
} }
@ -686,7 +724,7 @@ omemo_on_message_send(ProfWin *win, const char *const message, gboolean request_
out: out:
jid_destroy(jid); jid_destroy(jid);
g_list_free_full(keys, free); g_list_free_full(keys, (GDestroyNotify)omemo_key_free);
free(ciphertext); free(ciphertext);
gcry_free(key); gcry_free(key);
gcry_free(iv); gcry_free(iv);
@ -734,6 +772,7 @@ omemo_on_message_recv(const char *const from_jid, uint32_t sid,
break; break;
} }
} }
g_list_free(roster);
if (!sender) { if (!sender) {
log_warning("OMEMO: cannot find MUC message sender fulljid"); log_warning("OMEMO: cannot find MUC message sender fulljid");
goto out; goto out;
@ -770,6 +809,9 @@ omemo_on_message_recv(const char *const from_jid, uint32_t sid,
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);
signal_protocol_pre_key_store_key(omemo_ctx.store, new_pre_key); signal_protocol_pre_key_store_key(omemo_ctx.store, new_pre_key);
SIGNAL_UNREF(new_pre_key);
SIGNAL_UNREF(message);
SIGNAL_UNREF(ec_pair);
omemo_bundle_publish(); omemo_bundle_publish();
if (res == 0) { if (res == 0) {
@ -781,16 +823,19 @@ omemo_on_message_recv(const char *const from_jid, uint32_t sid,
signal_message *message; signal_message *message;
signal_message_deserialize(&message, key->data, key->length, omemo_ctx.signal); signal_message_deserialize(&message, key->data, key->length, omemo_ctx.signal);
res = session_cipher_decrypt_signal_message(cipher, message, NULL, &plaintext_key); res = session_cipher_decrypt_signal_message(cipher, message, NULL, &plaintext_key);
SIGNAL_UNREF(message);
} }
session_cipher_free(cipher);
if (res != 0) { if (res != 0) {
log_error("OMEMO: cannot decrypt message key"); log_error("OMEMO: cannot decrypt message key");
return NULL; goto out;
} }
if (signal_buffer_len(plaintext_key) != AES128_GCM_KEY_LENGTH + AES128_GCM_TAG_LENGTH) { if (signal_buffer_len(plaintext_key) != AES128_GCM_KEY_LENGTH + AES128_GCM_TAG_LENGTH) {
log_error("OMEMO: invalid key length"); log_error("OMEMO: invalid key length");
signal_buffer_free(plaintext_key); signal_buffer_free(plaintext_key);
return NULL; goto out;
} }
size_t plaintext_len = payload_len; size_t plaintext_len = payload_len;
@ -798,11 +843,12 @@ omemo_on_message_recv(const char *const from_jid, uint32_t sid,
res = aes128gcm_decrypt(plaintext, &plaintext_len, payload, payload_len, iv, res = aes128gcm_decrypt(plaintext, &plaintext_len, payload, payload_len, iv,
signal_buffer_data(plaintext_key), signal_buffer_data(plaintext_key),
signal_buffer_data(plaintext_key) + AES128_GCM_KEY_LENGTH); signal_buffer_data(plaintext_key) + AES128_GCM_KEY_LENGTH);
signal_buffer_free(plaintext_key);
if (res != 0) { if (res != 0) {
log_error("OMEMO: cannot decrypt message: %s", gcry_strerror(res)); log_error("OMEMO: cannot decrypt message: %s", gcry_strerror(res));
signal_buffer_free(plaintext_key);
free(plaintext); free(plaintext);
return NULL; plaintext = NULL;
goto out;
} }
plaintext[plaintext_len] = '\0'; plaintext[plaintext_len] = '\0';
@ -1040,14 +1086,14 @@ handle_device_list_start_session(const char *const jid, GList *device_list)
return FALSE; return FALSE;
} }
static void void
free_omemo_key(omemo_key_t *key) omemo_key_free(omemo_key_t *key)
{ {
if (key == NULL) { if (key == NULL) {
return; return;
} }
free((void *)key->data); free(key->data);
free(key); free(key);
} }
@ -1062,13 +1108,14 @@ load_identity(void)
char *identity_key_public_b64 = g_key_file_get_string(omemo_ctx.identity_keyfile, OMEMO_STORE_GROUP_IDENTITY, OMEMO_STORE_KEY_IDENTITY_KEY_PUBLIC, NULL); char *identity_key_public_b64 = g_key_file_get_string(omemo_ctx.identity_keyfile, OMEMO_STORE_GROUP_IDENTITY, OMEMO_STORE_KEY_IDENTITY_KEY_PUBLIC, NULL);
size_t identity_key_public_len; size_t identity_key_public_len;
unsigned char *identity_key_public = g_base64_decode(identity_key_public_b64, &identity_key_public_len); unsigned char *identity_key_public = g_base64_decode(identity_key_public_b64, &identity_key_public_len);
g_free(identity_key_public_b64);
omemo_ctx.identity_key_store.public = signal_buffer_create(identity_key_public, identity_key_public_len); omemo_ctx.identity_key_store.public = signal_buffer_create(identity_key_public, identity_key_public_len);
char *identity_key_private_b64 = g_key_file_get_string(omemo_ctx.identity_keyfile, OMEMO_STORE_GROUP_IDENTITY, OMEMO_STORE_KEY_IDENTITY_KEY_PRIVATE, NULL); char *identity_key_private_b64 = g_key_file_get_string(omemo_ctx.identity_keyfile, OMEMO_STORE_GROUP_IDENTITY, OMEMO_STORE_KEY_IDENTITY_KEY_PRIVATE, NULL);
size_t identity_key_private_len; size_t identity_key_private_len;
unsigned char *identity_key_private = g_base64_decode(identity_key_private_b64, &identity_key_private_len); unsigned char *identity_key_private = g_base64_decode(identity_key_private_b64, &identity_key_private_len);
g_free(identity_key_private_b64);
omemo_ctx.identity_key_store.private = signal_buffer_create(identity_key_private, identity_key_private_len); omemo_ctx.identity_key_store.private = signal_buffer_create(identity_key_private, identity_key_private_len);
signal_buffer_create(identity_key_private, identity_key_private_len);
ec_public_key *public_key; ec_public_key *public_key;
curve_decode_point(&public_key, identity_key_public, identity_key_public_len, omemo_ctx.signal); curve_decode_point(&public_key, identity_key_public, identity_key_public_len, omemo_ctx.signal);
@ -1086,11 +1133,13 @@ load_identity(void)
char *key_b64 = g_key_file_get_string(omemo_ctx.identity_keyfile, OMEMO_STORE_GROUP_TRUST, keys[i], NULL); char *key_b64 = g_key_file_get_string(omemo_ctx.identity_keyfile, OMEMO_STORE_GROUP_TRUST, keys[i], NULL);
size_t key_len; size_t key_len;
unsigned char *key = g_base64_decode(key_b64, &key_len); unsigned char *key = g_base64_decode(key_b64, &key_len);
g_free(key_b64);
signal_buffer *buffer = signal_buffer_create(key, key_len); signal_buffer *buffer = signal_buffer_create(key, key_len);
g_hash_table_insert(omemo_ctx.identity_key_store.trusted, keys[i], buffer); g_free(key);
free(key_b64); g_hash_table_insert(omemo_ctx.identity_key_store.trusted, strdup(keys[i]), buffer);
} }
} }
g_strfreev(keys);
} }
static void static void
@ -1115,11 +1164,14 @@ load_sessions(void)
char *record_b64 = g_key_file_get_string(omemo_ctx.sessions_keyfile, groups[i], keys[j], NULL); char *record_b64 = g_key_file_get_string(omemo_ctx.sessions_keyfile, groups[i], keys[j], NULL);
size_t record_len; size_t record_len;
unsigned char *record = g_base64_decode(record_b64, &record_len); unsigned char *record = g_base64_decode(record_b64, &record_len);
g_free(record_b64);
signal_buffer *buffer = signal_buffer_create(record, record_len); signal_buffer *buffer = signal_buffer_create(record, record_len);
g_free(record);
g_hash_table_insert(device_store, GINT_TO_POINTER(id), buffer); g_hash_table_insert(device_store, GINT_TO_POINTER(id), buffer);
free(record_b64);
} }
g_strfreev(keys);
} }
free(groups);
} }
} }

4
src/omemo/omemo.h
View File

@ -9,7 +9,7 @@
typedef struct omemo_context_t omemo_context; typedef struct omemo_context_t omemo_context;
typedef struct omemo_key { typedef struct omemo_key {
const unsigned char *data; unsigned char *data;
size_t length; size_t length;
gboolean prekey; gboolean prekey;
uint32_t device_id; uint32_t device_id;
@ -18,7 +18,9 @@ typedef struct omemo_key {
void omemo_init(void); void omemo_init(void);
void omemo_on_connect(ProfAccount *account); void omemo_on_connect(ProfAccount *account);
void omemo_on_disconnect(void);
void omemo_generate_crypto_materials(ProfAccount *account); void omemo_generate_crypto_materials(ProfAccount *account);
void omemo_key_free(omemo_key_t *key);
uint32_t omemo_device_id(void); uint32_t omemo_device_id(void);
void omemo_identity_key(unsigned char **output, size_t *length); void omemo_identity_key(unsigned char **output, size_t *length);

16
src/omemo/store.c
View File

@ -109,7 +109,10 @@ store_session(const signal_protocol_address *address,
char *record_b64 = g_base64_encode(record, record_len); char *record_b64 = g_base64_encode(record, record_len);
g_key_file_set_string(omemo_sessions_keyfile(), address->name, g_strdup_printf("%d", address->device_id), record_b64); char *device_id = g_strdup_printf("%d", address->device_id);
g_key_file_set_string(omemo_sessions_keyfile(), address->name, device_id, record_b64);
free(device_id);
g_free(record_b64);
omemo_sessions_keyfile_save(); omemo_sessions_keyfile_save();
@ -283,9 +286,10 @@ save_identity(const signal_protocol_address *address, uint8_t *key_data,
char *key_b64 = g_base64_encode(key_data, key_len); char *key_b64 = g_base64_encode(key_data, key_len);
g_key_file_set_string(omemo_identity_keyfile(), OMEMO_STORE_GROUP_TRUST, node, key_b64); g_key_file_set_string(omemo_identity_keyfile(), OMEMO_STORE_GROUP_TRUST, node, key_b64);
g_free(key_b64);
omemo_identity_keyfile_save(); omemo_identity_keyfile_save();
free(node); g_free(node);
return SG_SUCCESS; return SG_SUCCESS;
} }
@ -294,13 +298,19 @@ int
is_trusted_identity(const signal_protocol_address *address, uint8_t *key_data, is_trusted_identity(const signal_protocol_address *address, uint8_t *key_data,
size_t key_len, void *user_data) size_t key_len, void *user_data)
{ {
int ret;
identity_key_store_t *identity_key_store = (identity_key_store_t *)user_data; identity_key_store_t *identity_key_store = (identity_key_store_t *)user_data;
char *node = g_strdup_printf("%s:%d", address->name, address->device_id); char *node = g_strdup_printf("%s:%d", address->name, address->device_id);
signal_buffer *buffer = signal_buffer_create(key_data, key_len); signal_buffer *buffer = signal_buffer_create(key_data, key_len);
signal_buffer *original = g_hash_table_lookup(identity_key_store->trusted, node); signal_buffer *original = g_hash_table_lookup(identity_key_store->trusted, node);
g_free(node);
return original != NULL && signal_buffer_compare(buffer, original) == 0; ret = original != NULL && signal_buffer_compare(buffer, original) == 0;
signal_buffer_free(buffer);
return ret;
} }
int int

1
src/xmpp/message.c
View File

@ -405,6 +405,7 @@ message_send_chat_omemo(const char *const jid, uint32_t sid, GList *keys,
xmpp_stanza_add_child(body, body_text); xmpp_stanza_add_child(body, body_text);
xmpp_stanza_release(body_text); xmpp_stanza_release(body_text);
xmpp_stanza_add_child(message, body); xmpp_stanza_add_child(message, body);
xmpp_stanza_release(body);
if (state) { if (state) {
stanza_attach_state(ctx, message, state); stanza_attach_state(ctx, message, state);

42
src/xmpp/omemo.c
View File

@ -70,6 +70,10 @@ omemo_bundle_publish(void)
signed_prekey_signature, signed_prekey_signature_length, signed_prekey_signature, signed_prekey_signature_length,
prekeys, ids, lengths); prekeys, ids, lengths);
g_list_free_full(prekeys, free);
g_list_free(lengths);
g_list_free(ids);
Jid *jid = jid_create(connection_get_fulljid()); Jid *jid = jid_create(connection_get_fulljid());
if (caps_jid_has_feature(jid->barejid, XMPP_FEATURE_PUBSUB_PUBLISH_OPTIONS)) { if (caps_jid_has_feature(jid->barejid, XMPP_FEATURE_PUBSUB_PUBLISH_OPTIONS)) {
stanza_attach_publish_options(ctx, iq, "pubsub#access_model", "open"); stanza_attach_publish_options(ctx, iq, "pubsub#access_model", "open");
@ -157,7 +161,9 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t *const stanza, void *cons
if (!prekey_text) { if (!prekey_text) {
return 1; return 1;
} }
key->data = g_base64_decode(xmpp_stanza_get_text(prekey_text), &key->length); char *prekey_b64 = xmpp_stanza_get_text(prekey_text);
key->data = g_base64_decode(prekey_b64, &key->length);
free(prekey_b64);
key->prekey = TRUE; key->prekey = TRUE;
key->device_id = device_id; key->device_id = device_id;
@ -178,7 +184,9 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t *const stanza, void *cons
return 1; return 1;
} }
size_t signed_prekey_len; size_t signed_prekey_len;
unsigned char *signed_prekey_raw = g_base64_decode(xmpp_stanza_get_text(signed_prekey_text), &signed_prekey_len); char *signed_prekey_b64 = xmpp_stanza_get_text(signed_prekey_text);
unsigned char *signed_prekey_raw = g_base64_decode(signed_prekey_b64, &signed_prekey_len);
free(signed_prekey_b64);
xmpp_stanza_t *signed_prekey_signature = xmpp_stanza_get_child_by_name(bundle, "signedPreKeySignature"); xmpp_stanza_t *signed_prekey_signature = xmpp_stanza_get_child_by_name(bundle, "signedPreKeySignature");
if (!signed_prekey_signature) { if (!signed_prekey_signature) {
@ -189,7 +197,9 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t *const stanza, void *cons
return 1; return 1;
} }
size_t signed_prekey_signature_len; size_t signed_prekey_signature_len;
unsigned char *signed_prekey_signature_raw = g_base64_decode(xmpp_stanza_get_text(signed_prekey_signature_text), &signed_prekey_signature_len); char *signed_prekey_signature_b64 = xmpp_stanza_get_text(signed_prekey_signature_text);
unsigned char *signed_prekey_signature_raw = g_base64_decode(signed_prekey_signature_b64, &signed_prekey_signature_len);
free(signed_prekey_signature_b64);
xmpp_stanza_t *identity_key = xmpp_stanza_get_child_by_name(bundle, "identityKey"); xmpp_stanza_t *identity_key = xmpp_stanza_get_child_by_name(bundle, "identityKey");
if (!identity_key) { if (!identity_key) {
@ -200,11 +210,18 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t *const stanza, void *cons
return 1; return 1;
} }
size_t identity_key_len; size_t identity_key_len;
unsigned char *identity_key_raw = g_base64_decode(xmpp_stanza_get_text(identity_key_text), &identity_key_len); char *identity_key_b64 = xmpp_stanza_get_text(identity_key_text);
unsigned char *identity_key_raw = g_base64_decode(identity_key_b64, &identity_key_len);
free(identity_key_b64);
omemo_start_device_session(from, device_id, prekeys_list, signed_prekey_id, omemo_start_device_session(from, device_id, prekeys_list, signed_prekey_id,
signed_prekey_raw, signed_prekey_len, signed_prekey_signature_raw, signed_prekey_raw, signed_prekey_len, signed_prekey_signature_raw,
signed_prekey_signature_len, identity_key_raw, identity_key_len); signed_prekey_signature_len, identity_key_raw, identity_key_len);
g_list_free_full(prekeys_list, (GDestroyNotify)omemo_key_free);
g_free(signed_prekey_raw);
g_free(identity_key_raw);
g_free(signed_prekey_signature_raw);
return 1; return 1;
} }
@ -233,23 +250,23 @@ omemo_receive_message(xmpp_stanza_t *const stanza)
if (!iv) { if (!iv) {
return NULL; return NULL;
} }
const char *iv_text = xmpp_stanza_get_text(iv); char *iv_text = xmpp_stanza_get_text(iv);
if (!iv_text) { if (!iv_text) {
return NULL; return NULL;
} }
size_t iv_len; size_t iv_len;
const unsigned char *iv_raw = g_base64_decode(iv_text, &iv_len); unsigned char *iv_raw = g_base64_decode(iv_text, &iv_len);
xmpp_stanza_t *payload = xmpp_stanza_get_child_by_name(encrypted, "payload"); xmpp_stanza_t *payload = xmpp_stanza_get_child_by_name(encrypted, "payload");
if (!payload) { if (!payload) {
return NULL; return NULL;
} }
const char *payload_text = xmpp_stanza_get_text(payload); char *payload_text = xmpp_stanza_get_text(payload);
if (!payload_text) { if (!payload_text) {
return NULL; return NULL;
} }
size_t payload_len; size_t payload_len;
const unsigned char *payload_raw = g_base64_decode(payload_text, &payload_len); unsigned char *payload_raw = g_base64_decode(payload_text, &payload_len);
GList *keys = NULL; GList *keys = NULL;
xmpp_stanza_t *key_stanza; xmpp_stanza_t *key_stanza;
@ -259,7 +276,7 @@ omemo_receive_message(xmpp_stanza_t *const stanza)
} }
omemo_key_t *key = malloc(sizeof(omemo_key_t)); omemo_key_t *key = malloc(sizeof(omemo_key_t));
const char *key_text = xmpp_stanza_get_text(key_stanza); char *key_text = xmpp_stanza_get_text(key_stanza);
if (!key_text) { if (!key_text) {
goto skip; goto skip;
} }
@ -271,6 +288,7 @@ omemo_receive_message(xmpp_stanza_t *const stanza)
goto skip; goto skip;
} }
key->data = g_base64_decode(key_text, &key->length); key->data = g_base64_decode(key_text, &key->length);
free(key_text);
key->prekey = g_strcmp0(xmpp_stanza_get_attribute(key_stanza, "prekey"), "true") == 0; key->prekey = g_strcmp0(xmpp_stanza_get_attribute(key_stanza, "prekey"), "true") == 0;
keys = g_list_append(keys, key); keys = g_list_append(keys, key);
continue; continue;
@ -285,6 +303,12 @@ skip:
keys, payload_raw, payload_len, keys, payload_raw, payload_len,
g_strcmp0(type, STANZA_TYPE_GROUPCHAT) == 0); g_strcmp0(type, STANZA_TYPE_GROUPCHAT) == 0);
g_list_free_full(keys, (GDestroyNotify)omemo_key_free);
g_free(iv_raw);
g_free(payload_raw);
g_free(iv_text);
g_free(payload_text);
return plaintext; return plaintext;
} }

16
src/xmpp/stanza.c
View File

@ -2274,7 +2274,9 @@ stanza_create_omemo_bundle_publish(xmpp_ctx_t *ctx, uint32_t device_id,
xmpp_stanza_set_attribute(signed_prekey_public_stanza, "signedPreKeyId", "1"); xmpp_stanza_set_attribute(signed_prekey_public_stanza, "signedPreKeyId", "1");
xmpp_stanza_t *signed_prekey_public_stanza_text= xmpp_stanza_new(ctx); xmpp_stanza_t *signed_prekey_public_stanza_text= xmpp_stanza_new(ctx);
xmpp_stanza_set_text(signed_prekey_public_stanza_text, g_base64_encode(signed_prekey, signed_prekey_length)); char *signed_prekey_b64 = g_base64_encode(signed_prekey, signed_prekey_length);
xmpp_stanza_set_text(signed_prekey_public_stanza_text, signed_prekey_b64);
g_free(signed_prekey_b64);
xmpp_stanza_add_child(signed_prekey_public_stanza, signed_prekey_public_stanza_text); xmpp_stanza_add_child(signed_prekey_public_stanza, signed_prekey_public_stanza_text);
xmpp_stanza_release(signed_prekey_public_stanza_text); xmpp_stanza_release(signed_prekey_public_stanza_text);
@ -2282,7 +2284,9 @@ stanza_create_omemo_bundle_publish(xmpp_ctx_t *ctx, uint32_t device_id,
xmpp_stanza_set_name(signed_prekey_signature_stanza , "signedPreKeySignature"); xmpp_stanza_set_name(signed_prekey_signature_stanza , "signedPreKeySignature");
xmpp_stanza_t *signed_prekey_signature_stanza_text= xmpp_stanza_new(ctx); xmpp_stanza_t *signed_prekey_signature_stanza_text= xmpp_stanza_new(ctx);
xmpp_stanza_set_text(signed_prekey_signature_stanza_text, g_base64_encode(signed_prekey_signature, signed_prekey_signature_length)); char *signed_prekey_signature_b64 = g_base64_encode(signed_prekey_signature, signed_prekey_signature_length);
xmpp_stanza_set_text(signed_prekey_signature_stanza_text, signed_prekey_signature_b64);
g_free(signed_prekey_signature_b64);
xmpp_stanza_add_child(signed_prekey_signature_stanza, signed_prekey_signature_stanza_text); xmpp_stanza_add_child(signed_prekey_signature_stanza, signed_prekey_signature_stanza_text);
xmpp_stanza_release(signed_prekey_signature_stanza_text); xmpp_stanza_release(signed_prekey_signature_stanza_text);
@ -2290,7 +2294,9 @@ stanza_create_omemo_bundle_publish(xmpp_ctx_t *ctx, uint32_t device_id,
xmpp_stanza_set_name(identity_key_stanza , "identityKey"); xmpp_stanza_set_name(identity_key_stanza , "identityKey");
xmpp_stanza_t *identity_key_stanza_text= xmpp_stanza_new(ctx); xmpp_stanza_t *identity_key_stanza_text= xmpp_stanza_new(ctx);
xmpp_stanza_set_text(identity_key_stanza_text, g_base64_encode(identity_key, identity_key_length)); char *identity_key_b64 = g_base64_encode(identity_key, identity_key_length);
xmpp_stanza_set_text(identity_key_stanza_text, identity_key_b64);
g_free(identity_key_b64);
xmpp_stanza_add_child(identity_key_stanza, identity_key_stanza_text); xmpp_stanza_add_child(identity_key_stanza, identity_key_stanza_text);
xmpp_stanza_release(identity_key_stanza_text); xmpp_stanza_release(identity_key_stanza_text);
@ -2306,7 +2312,9 @@ stanza_create_omemo_bundle_publish(xmpp_ctx_t *ctx, uint32_t device_id,
g_free(id); g_free(id);
xmpp_stanza_t *prekey_text = xmpp_stanza_new(ctx); xmpp_stanza_t *prekey_text = xmpp_stanza_new(ctx);
xmpp_stanza_set_text(prekey_text, g_base64_encode(p->data, GPOINTER_TO_INT(l->data))); char *prekey_b64 = g_base64_encode(p->data, GPOINTER_TO_INT(l->data));
xmpp_stanza_set_text(prekey_text, prekey_b64);
g_free(prekey_b64);
xmpp_stanza_add_child(prekey, prekey_text); xmpp_stanza_add_child(prekey, prekey_text);
xmpp_stanza_add_child(prekeys_stanza, prekey); xmpp_stanza_add_child(prekeys_stanza, prekey);