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

Implemented message encryption, session started with whitspace tags on first message

Browse Source
This commit is contained in:
James Booth 2014-01-10 21:57:38 +00:00
parent e294a6db92
commit df8c7dedc1
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/otr.c
View File

@ -37,7 +37,7 @@ static OtrlPolicy
cb_policy(void *opdata, ConnContext *context) cb_policy(void *opdata, ConnContext *context)
{ {
// cons_debug("cb_policy"); // cons_debug("cb_policy");
return OTRL_POLICY_DEFAULT; return OTRL_POLICY_DEFAULT ;
} }
static void static void
@ -45,20 +45,6 @@ cb_create_privkey(void *opdata, const char *accountname,
const char *protocol) const char *protocol)
{ {
// cons_debug("cb_create_privkey accountname: %s, protocol: %s", accountname, protocol); // cons_debug("cb_create_privkey accountname: %s, protocol: %s", accountname, protocol);
// GString *key_filename = g_string_new("./");
// g_string_append(key_filename, accountname);
// g_string_append(key_filename, "_key.txt");
// gcry_error_t err = 0;
// err = otrl_privkey_generate(user_state, key_filename->str, accountname, protocol);
// if (!err == GPG_ERR_NO_ERROR) {
// cons_debug("Failed to generate private key");
// g_string_free(key_filename, TRUE);
// return;
// }
// otrl_privkey_read(user_state, key_filename->str);
// cons_debug("Generated private key");
} }
static int static int
@ -76,8 +62,7 @@ cb_inject_message(void *opdata, const char *accountname,
{ {
// cons_debug("cb_inject_message: account: %s, protocol, %s, recipient: %s, message: %s", // cons_debug("cb_inject_message: account: %s, protocol, %s, recipient: %s, message: %s",
// accountname, protocol, recipient, message); // accountname, protocol, recipient, message);
char *msg_decrypt = NULL; message_send(message, recipient);
otrl_message_receiving(user_state, &ops, NULL, recipient, protocol, accountname, message, &msg_decrypt, 0, NULL, NULL);
} }
static void static void
@ -272,7 +257,7 @@ otr_get_fingerprint(void)
char * char *
otr_encrypt_message(const char * const to, const char * const message) otr_encrypt_message(const char * const to, const char * const message)
{ {
// cons_debug("otr_encrypt_message, account: %s, recipient: %s, message: %s", jid, to, message); cons_debug("Encrypting message: %s", message);
gcry_error_t err; gcry_error_t err;
char *newmessage = NULL; char *newmessage = NULL;
@ -292,7 +277,7 @@ otr_encrypt_message(const char * const to, const char * const message)
// cons_debug("Error encrypting, result: %s", newmessage); // cons_debug("Error encrypting, result: %s", newmessage);
return NULL; return NULL;
} else { } else {
cons_debug("Encrypted, result: %s", newmessage); cons_debug("Encrypted message: %s", newmessage);
return newmessage; return newmessage;
} }
} }
@ -300,10 +285,11 @@ otr_encrypt_message(const char * const to, const char * const message)
char * char *
otr_decrypt_message(const char * const from, const char * const message) otr_decrypt_message(const char * const from, const char * const message)
{ {
// cons_debug("otr_decrypt_message, account: %s, from: %s, message: %s", jid, from, message); cons_debug("Decrypting message: %s", message);
char *decrypted = NULL; char *decrypted = NULL;
int ignore_mesage = otrl_message_receiving(user_state, &ops, NULL, jid, "xmpp", from, message, &decrypted, 0, NULL, NULL); int ignore_mesage = otrl_message_receiving(user_state, &ops, NULL, jid, "xmpp", from, message, &decrypted, 0, NULL, NULL);
if (!ignore_mesage) { if (!ignore_mesage) {
cons_debug("Decrypted message: %s", decrypted);
return decrypted; return decrypted;
} else { } else {
return NULL; return NULL;

2
src/otr.h
View File

@ -28,8 +28,10 @@
void otr_init(void); void otr_init(void);
void otr_account_load(ProfAccount *account); void otr_account_load(ProfAccount *account);
char * otr_get_fingerprint(void); char * otr_get_fingerprint(void);
char * otr_encrypt_message(const char * const to, const char * const message); char * otr_encrypt_message(const char * const to, const char * const message);
char * otr_decrypt_message(const char * const from, const char * const message); char * otr_decrypt_message(const char * const from, const char * const message);
void otr_free_message(char *message); void otr_free_message(char *message);
#endif #endif