devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-28 03:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle SMP secret response

Browse Source
This commit is contained in:
James Booth
2014-04-26 22:52:25 +01:00
parent 06d81ed9ce
commit aff9eee433
5 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/otr/otr.c
View File

@@ -41,6 +41,7 @@ static OtrlUserState user_state;
static OtrlMessageAppOps ops;
static char *jid;
static gboolean data_loaded;
static GHashTable *smp_initiators;
// ops callbacks
static OtrlPolicy
@@ -136,6 +137,8 @@ _otr_init(void)
otrlib_init_ops(&ops);
smp_initiators = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
data_loaded = FALSE;
}
@@ -389,7 +392,7 @@ _otr_untrust(const char * const recipient)
}
static void
_otr_smp_init_secret(const char * const recipient, const char *secret)
_otr_smp_secret(const char * const recipient, const char *secret)
{
ConnContext *context = otrlib_context_find(user_state, recipient, jid);
@@ -401,7 +404,12 @@ _otr_smp_init_secret(const char * const recipient, const char *secret)
return;
}
otrl_message_initiate_smp(user_state, &ops, NULL, context, (const unsigned char*)secret, strlen(secret));
// if recipient initiated SMP, send response, else initialise
if (g_hash_table_contains(smp_initiators, recipient)) {
otrl_message_respond_smp(user_state, &ops, NULL, context, (const unsigned char*)secret, strlen(secret));
} else {
otrl_message_initiate_smp(user_state, &ops, NULL, context, (const unsigned char*)secret, strlen(secret));
}
}
static void
@@ -471,7 +479,7 @@ _otr_decrypt_message(const char * const from, const char * const message, gboole
}
// library version specific tlv handling
otrlib_handle_tlvs(user_state, &ops, context, tlvs);
otrlib_handle_tlvs(user_state, &ops, context, tlvs, smp_initiators);
return NULL;
@@ -512,5 +520,5 @@ otr_init_module(void)
otr_encrypt_message = _otr_encrypt_message;
otr_decrypt_message = _otr_decrypt_message;
otr_free_message = _otr_free_message;
otr_smp_init_secret = _otr_smp_init_secret;
otr_smp_secret = _otr_smp_secret;
}