Skip to content

Consider device_id when dealing with remote identity keys #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
root-hardenedvault wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Consider device_id when dealing with remote identity keys #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b59878
Consider device_id when dealing with remote identity keys.
root-hardenedvault Nov 4, 2019
845ca2a
Apply static storage class for semantic constants
root-hardenedvault Nov 5, 2019
e18a986
Add missing logic to handle added row in identity key storage
root-hardenedvault May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 11 additions & 48 deletions src/axc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,40 +459,14 @@ int axc_init(axc_context * ctx_p) {
axc_mutexes * mutexes_p = (void *) 0;
signal_protocol_store_context * store_context_p = (void *) 0;

signal_protocol_session_store session_store = {
.load_session_func = &axc_db_session_load,
.get_sub_device_sessions_func = &axc_db_session_get_sub_device_sessions,
.store_session_func = &axc_db_session_store,
.contains_session_func = &axc_db_session_contains,
.delete_session_func = &axc_db_session_delete,
.delete_all_sessions_func = &axc_db_session_delete_all,
.destroy_func = &axc_db_session_destroy_store_ctx,
.user_data = ctx_p
};
signal_protocol_pre_key_store pre_key_store = {
.load_pre_key = &axc_db_pre_key_load,
.store_pre_key = &axc_db_pre_key_store,
.contains_pre_key = &axc_db_pre_key_contains,
.remove_pre_key = &axc_db_pre_key_remove,
.destroy_func = &axc_db_pre_key_destroy_ctx,
.user_data = ctx_p
};
signal_protocol_signed_pre_key_store signed_pre_key_store = {
.load_signed_pre_key = &axc_db_signed_pre_key_load,
.store_signed_pre_key = &axc_db_signed_pre_key_store,
.contains_signed_pre_key = &axc_db_signed_pre_key_contains,
.remove_signed_pre_key = &axc_db_signed_pre_key_remove,
.destroy_func = &axc_db_signed_pre_key_destroy_ctx,
.user_data = ctx_p
};
signal_protocol_identity_key_store identity_key_store = {
.get_identity_key_pair = &axc_db_identity_get_key_pair,
.get_local_registration_id = &axc_db_identity_get_local_registration_id,
.save_identity = &axc_db_identity_save,
.is_trusted_identity = &axc_db_identity_always_trusted,
.destroy_func = &axc_db_identity_destroy_ctx,
.user_data = ctx_p
};
signal_protocol_session_store session_store = axc_session_store_tmpl;
session_store.user_data = ctx_p;
signal_protocol_pre_key_store pre_key_store = axc_pre_key_store_tmpl;
pre_key_store.user_data = ctx_p;
signal_protocol_signed_pre_key_store signed_pre_key_store = axc_signed_pre_key_store_tmpl;
signed_pre_key_store.user_data = ctx_p;
signal_protocol_identity_key_store identity_key_store = axc_identity_key_store_tmpl;
identity_key_store.user_data = ctx_p;

// init mutexes
ret_val = axc_mutexes_create_and_init(&mutexes_p);
Expand All @@ -512,20 +486,9 @@ int axc_init(axc_context * ctx_p) {
axc_log(ctx_p, AXC_LOG_DEBUG, "%s: created and set axolotl context", __func__);

// 2. init and set crypto provider
signal_crypto_provider crypto_provider = {
.random_func = random_bytes,
.hmac_sha256_init_func = hmac_sha256_init,
.hmac_sha256_update_func = hmac_sha256_update,
.hmac_sha256_final_func = hmac_sha256_final,
.hmac_sha256_cleanup_func = hmac_sha256_cleanup,
.sha512_digest_init_func = sha512_digest_init,
.sha512_digest_update_func = sha512_digest_update,
.sha512_digest_final_func = sha512_digest_final,
.sha512_digest_cleanup_func = sha512_digest_cleanup,
.encrypt_func = aes_encrypt,
.decrypt_func = aes_decrypt,
.user_data = ctx_p
};
signal_crypto_provider crypto_provider = axc_crypto_provider_tmpl;
crypto_provider.user_data = ctx_p;

if (signal_context_set_crypto_provider(ctx_p->axolotl_global_context_p, &crypto_provider)) {
err_msg = "failed to set crypto provider";
ret_val = -1;
Expand Down
15 changes: 15 additions & 0 deletions src/axc_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,3 +490,18 @@ int aes_decrypt(signal_buffer ** output_pp,

return ret_val;
}

const signal_crypto_provider axc_crypto_provider_tmpl = {
.random_func = random_bytes,
.hmac_sha256_init_func = hmac_sha256_init,
.hmac_sha256_update_func = hmac_sha256_update,
.hmac_sha256_final_func = hmac_sha256_final,
.hmac_sha256_cleanup_func = hmac_sha256_cleanup,
.sha512_digest_init_func = sha512_digest_init,
.sha512_digest_update_func = sha512_digest_update,
.sha512_digest_final_func = sha512_digest_final,
.sha512_digest_cleanup_func = sha512_digest_cleanup,
.encrypt_func = aes_encrypt,
.decrypt_func = aes_decrypt,
.user_data = (void *) 0
};
2 changes: 2 additions & 0 deletions src/axc_crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "signal_protocol.h"

extern const signal_crypto_provider axc_crypto_provider_tmpl;

void axc_crypto_init(void);
void axc_crypto_teardown(void);

Expand Down
Loading