From 7e4b1b1dea89ff404bf9b75a380c064d78255239 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 8 Feb 2014 23:07:51 +0000 Subject: [PATCH 01/10] Added libotr back to configure by default Renamed to BUILD_OTR3 --- Makefile.am | 2 +- configure.ac | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index a977ea7c..1c3388d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,7 +105,7 @@ with_git_sources = $(core_sources) tests_with_git_sources = $(test_sources) endif -if BUILD_OTR +if BUILD_OTR3 with_otr_sources = $(with_git_sources) $(otr_sources) tests_with_otr_sources = $(tests_with_git_sources) $(otr_sources) else diff --git a/configure.ac b/configure.ac index 3ffb8ccf..6661e40b 100644 --- a/configure.ac +++ b/configure.ac @@ -131,17 +131,15 @@ elif test "x$with_xscreensaver" = x; then [AC_MSG_NOTICE([libX11 not found, falling back to profanity auto-away])]) fi -AM_CONDITIONAL([BUILD_OTR], [true]) +AM_CONDITIONAL([BUILD_OTR3], [false]) if test "x$enable_otr" = xyes; then - AC_CHECK_LIB([otr], [main], [], + AC_CHECK_LIB([otr], [main], + [AM_CONDITIONAL([BUILD_OTR3], [true])], [AC_MSG_ERROR([libotr is required for otr encryption support])]) -elif test "x$enable_otr" = xno; then - AM_CONDITIONAL([BUILD_OTR], [false]) elif test "x$enable_otr" = x; then - AM_CONDITIONAL([BUILD_OTR], [false]) -### Add the following back in once libotr 4.0.0 support is enabled -### AC_CHECK_LIB([otr], [main], [], -### [AM_CONDITIONAL([BUILD_OTR], [false]) AC_MSG_NOTICE([libotr not found, otr entryption support not enabled])]) + AC_CHECK_LIB([otr], [main], + [AM_CONDITIONAL([BUILD_OTR3], [true])], + [AC_MSG_NOTICE([libotr not found, otr entryption support not enabled])]) fi ### cmocka is required only for tests, profanity shouldn't be linked with it From 50afe7366e00767208fc9d17167a768cf924d6cb Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 8 Feb 2014 23:29:42 +0000 Subject: [PATCH 02/10] Use AC_SEARCH_LIBS for otr --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6661e40b..aed16cd8 100644 --- a/configure.ac +++ b/configure.ac @@ -133,12 +133,12 @@ fi AM_CONDITIONAL([BUILD_OTR3], [false]) if test "x$enable_otr" = xyes; then - AC_CHECK_LIB([otr], [main], - [AM_CONDITIONAL([BUILD_OTR3], [true])], + AC_SEARCH_LIBS([otrl_init], [otr], + [AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])], [AC_MSG_ERROR([libotr is required for otr encryption support])]) elif test "x$enable_otr" = x; then - AC_CHECK_LIB([otr], [main], - [AM_CONDITIONAL([BUILD_OTR3], [true])], + AC_SEARCH_LIBS([otrl_init], [otr], + [AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])], [AC_MSG_NOTICE([libotr not found, otr entryption support not enabled])]) fi From fa89e2aa628c769540a73989759394f2bd7744c1 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 9 Feb 2014 00:32:11 +0000 Subject: [PATCH 03/10] Check for libotr version --- Makefile.am | 17 +++++++++++++---- configure.ac | 28 ++++++++++++++++++++++++++-- src/{otr.c => otr3.c} | 2 +- 3 files changed, 40 insertions(+), 7 deletions(-) rename src/{otr.c => otr3.c} (99%) diff --git a/Makefile.am b/Makefile.am index 1c3388d2..9bea1a50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,8 +94,11 @@ main_source = src/main.c git_sources = \ src/gitversion.c -otr_sources = \ - src/otr.c src/otr.h +otr3_sources = \ + src/otr3.c src/otr.h + +otr4_sources = \ + src/otr4.c src/otr.h if INCLUDE_GIT_VERSION with_git_sources = $(git_sources) $(core_sources) @@ -105,9 +108,15 @@ with_git_sources = $(core_sources) tests_with_git_sources = $(test_sources) endif +if BUILD_OTR if BUILD_OTR3 -with_otr_sources = $(with_git_sources) $(otr_sources) -tests_with_otr_sources = $(tests_with_git_sources) $(otr_sources) +with_otr_sources = $(with_git_sources) $(otr3_sources) +tests_with_otr_sources = $(tests_with_git_sources) $(otr3_sources) +endif +if BUILD_OTR4 +with_otr_sources = $(with_git_sources) $(otr4_sources) +tests_with_otr_sources = $(tests_with_git_sources) $(otr4_sources) +endif else with_otr_sources = $(with_git_sources) tests_with_otr_sources = $(tests_with_git_sources) diff --git a/configure.ac b/configure.ac index aed16cd8..65560ac9 100644 --- a/configure.ac +++ b/configure.ac @@ -131,14 +131,38 @@ elif test "x$with_xscreensaver" = x; then [AC_MSG_NOTICE([libX11 not found, falling back to profanity auto-away])]) fi +AM_CONDITIONAL([BUILD_OTR], [false]) AM_CONDITIONAL([BUILD_OTR3], [false]) +AM_CONDITIONAL([BUILD_OTR4], [false]) if test "x$enable_otr" = xyes; then AC_SEARCH_LIBS([otrl_init], [otr], - [AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #include + ]],[[ + #if OTRL_VERSION_MAJOR == 4 + // OK + #else + # assume version 3 + #endif + ]])], + [AM_CONDITIONAL([BUILD_OTR], [true]) AM_CONDITIONAL([BUILD_OTR4], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])], + [AM_CONDITIONAL([BUILD_OTR], [true]) AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])])], [AC_MSG_ERROR([libotr is required for otr encryption support])]) elif test "x$enable_otr" = x; then AC_SEARCH_LIBS([otrl_init], [otr], - [AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #include + ]],[[ + #if OTRL_VERSION_MAJOR == 4 + // OK + #else + # assume version 3 + #endif + ]])], + [AM_CONDITIONAL([BUILD_OTR], [true]) AM_CONDITIONAL([BUILD_OTR4], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])], + [AM_CONDITIONAL([BUILD_OTR], [true]) AM_CONDITIONAL([BUILD_OTR3], [true]) AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])])], [AC_MSG_NOTICE([libotr not found, otr entryption support not enabled])]) fi diff --git a/src/otr.c b/src/otr3.c similarity index 99% rename from src/otr.c rename to src/otr3.c index fb8af681..5da2bfab 100644 --- a/src/otr.c +++ b/src/otr3.c @@ -1,5 +1,5 @@ /* - * otr.c + * otr3.c * * Copyright (C) 2012, 2013 James Booth * From 4bd5cf35ffe49f8ed78775997d45b667538d2935 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 9 Feb 2014 00:34:00 +0000 Subject: [PATCH 04/10] Added otr4.c --- src/otr4.c | 472 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 472 insertions(+) create mode 100644 src/otr4.c diff --git a/src/otr4.c b/src/otr4.c new file mode 100644 index 00000000..9cc4af63 --- /dev/null +++ b/src/otr4.c @@ -0,0 +1,472 @@ +/* + * otr4.c + * + * Copyright (C) 2012, 2013 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + */ + +#include +#include +#include +#include + +#include "otr.h" +#include "log.h" +#include "roster_list.h" +#include "contact.h" +#include "ui/ui.h" + +static OtrlUserState user_state; +static OtrlMessageAppOps ops; +static char *jid; +static gboolean data_loaded; + +// ops callbacks +static OtrlPolicy +cb_policy(void *opdata, ConnContext *context) +{ + return OTRL_POLICY_DEFAULT ; +} + +static int +cb_is_logged_in(void *opdata, const char *accountname, + const char *protocol, const char *recipient) +{ + PContact contact = roster_get_contact(recipient); + if (g_strcmp0(p_contact_presence(contact), "offline") == 0) { + return 0; + } else { + return 1; + } +} + +static void +cb_inject_message(void *opdata, const char *accountname, + const char *protocol, const char *recipient, const char *message) +{ + message_send(message, recipient); +} + +static int +cb_display_otr_message(void *opdata, const char *accountname, + const char *protocol, const char *username, const char *msg) +{ + cons_show_error("%s", msg); + return 0; +} + +static void +cb_write_fingerprints(void *opdata) +{ + gcry_error_t err = 0; + gchar *data_home = xdg_get_data_home(); + gchar *account_dir = str_replace(jid, "@", "_at_"); + + GString *basedir = g_string_new(data_home); + g_string_append(basedir, "/profanity/otr/"); + g_string_append(basedir, account_dir); + g_string_append(basedir, "/"); + free(account_dir); + + GString *fpsfilename = g_string_new(basedir->str); + g_string_append(fpsfilename, "fingerprints.txt"); + err = otrl_privkey_write_fingerprints(user_state, fpsfilename->str); + if (!err == GPG_ERR_NO_ERROR) { + log_error("Failed to write fingerprints file"); + cons_show_error("Failed to create fingerprints file"); + } + g_string_free(basedir, TRUE); + g_string_free(fpsfilename, TRUE); +} + +static void +cb_gone_secure(void *opdata, ConnContext *context) +{ + ui_gone_secure(context->username, otr_is_trusted(context->username)); +} + +void +otr_init(void) +{ + log_info("Initialising OTR"); + OTRL_INIT; + + ops.policy = cb_policy; + ops.is_logged_in = cb_is_logged_in; + ops.inject_message = cb_inject_message; + ops.display_otr_message = cb_display_otr_message; + ops.write_fingerprints = cb_write_fingerprints; + ops.gone_secure = cb_gone_secure; + + data_loaded = FALSE; +} + +void +otr_on_connect(ProfAccount *account) +{ + jid = strdup(account->jid); + log_info("Loading OTR key for %s", jid); + + gchar *data_home = xdg_get_data_home(); + gchar *account_dir = str_replace(jid, "@", "_at_"); + + GString *basedir = g_string_new(data_home); + g_string_append(basedir, "/profanity/otr/"); + g_string_append(basedir, account_dir); + g_string_append(basedir, "/"); + free(account_dir); + + if (!mkdir_recursive(basedir->str)) { + log_error("Could not create %s for account %s.", basedir->str, jid); + cons_show_error("Could not create %s for account %s.", basedir->str, jid); + g_string_free(basedir, TRUE); + return; + } + + user_state = otrl_userstate_create(); + + gcry_error_t err = 0; + + GString *keysfilename = g_string_new(basedir->str); + g_string_append(keysfilename, "keys.txt"); + if (!g_file_test(keysfilename->str, G_FILE_TEST_IS_REGULAR)) { + log_info("No private key file found %s", keysfilename->str); + data_loaded = FALSE; + } else { + log_info("Loading OTR private key %s", keysfilename->str); + err = otrl_privkey_read(user_state, keysfilename->str); + if (!err == GPG_ERR_NO_ERROR) { + g_string_free(basedir, TRUE); + g_string_free(keysfilename, TRUE); + log_error("Failed to load private key"); + return; + } else { + log_info("Loaded private key"); + data_loaded = TRUE; + } + } + + GString *fpsfilename = g_string_new(basedir->str); + g_string_append(fpsfilename, "fingerprints.txt"); + if (!g_file_test(fpsfilename->str, G_FILE_TEST_IS_REGULAR)) { + log_info("No fingerprints file found %s", fpsfilename->str); + data_loaded = FALSE; + } else { + log_info("Loading fingerprints %s", fpsfilename->str); + err = otrl_privkey_read_fingerprints(user_state, fpsfilename->str, NULL, NULL); + if (!err == GPG_ERR_NO_ERROR) { + g_string_free(basedir, TRUE); + g_string_free(keysfilename, TRUE); + g_string_free(fpsfilename, TRUE); + log_error("Failed to load fingerprints"); + return; + } else { + log_info("Loaded fingerprints"); + data_loaded = TRUE; + } + } + + if (data_loaded) { + cons_show("Loaded OTR private key for %s", jid); + } + + g_string_free(basedir, TRUE); + g_string_free(keysfilename, TRUE); + g_string_free(fpsfilename, TRUE); + return; +} + +void +otr_keygen(ProfAccount *account) +{ + if (data_loaded) { + cons_show("OTR key already generated."); + return; + } + + jid = strdup(account->jid); + log_info("Generating OTR key for %s", jid); + + jid = strdup(account->jid); + + gchar *data_home = xdg_get_data_home(); + gchar *account_dir = str_replace(jid, "@", "_at_"); + + GString *basedir = g_string_new(data_home); + g_string_append(basedir, "/profanity/otr/"); + g_string_append(basedir, account_dir); + g_string_append(basedir, "/"); + free(account_dir); + + if (!mkdir_recursive(basedir->str)) { + log_error("Could not create %s for account %s.", basedir->str, jid); + cons_show_error("Could not create %s for account %s.", basedir->str, jid); + g_string_free(basedir, TRUE); + return; + } + + gcry_error_t err = 0; + + GString *keysfilename = g_string_new(basedir->str); + g_string_append(keysfilename, "keys.txt"); + log_debug("Generating private key file %s for %s", keysfilename->str, jid); + cons_show("Generating private key, this may take some time."); + cons_show("Moving the mouse randomly around the screen may speed up the process!"); + ui_current_page_off(); + ui_refresh(); + err = otrl_privkey_generate(user_state, keysfilename->str, account->jid, "xmpp"); + if (!err == GPG_ERR_NO_ERROR) { + g_string_free(basedir, TRUE); + g_string_free(keysfilename, TRUE); + log_error("Failed to generate private key"); + cons_show_error("Failed to generate private key"); + return; + } + log_info("Private key generated"); + cons_show(""); + cons_show("Private key generation complete."); + + GString *fpsfilename = g_string_new(basedir->str); + g_string_append(fpsfilename, "fingerprints.txt"); + log_debug("Generating fingerprints file %s for %s", fpsfilename->str, jid); + err = otrl_privkey_write_fingerprints(user_state, fpsfilename->str); + if (!err == GPG_ERR_NO_ERROR) { + g_string_free(basedir, TRUE); + g_string_free(keysfilename, TRUE); + log_error("Failed to create fingerprints file"); + cons_show_error("Failed to create fingerprints file"); + return; + } + log_info("Fingerprints file created"); + + err = otrl_privkey_read(user_state, keysfilename->str); + if (!err == GPG_ERR_NO_ERROR) { + g_string_free(basedir, TRUE); + g_string_free(keysfilename, TRUE); + log_error("Failed to load private key"); + data_loaded = FALSE; + return; + } + + err = otrl_privkey_read_fingerprints(user_state, fpsfilename->str, NULL, NULL); + if (!err == GPG_ERR_NO_ERROR) { + g_string_free(basedir, TRUE); + g_string_free(keysfilename, TRUE); + log_error("Failed to load fingerprints"); + data_loaded = FALSE; + return; + } + + data_loaded = TRUE; + + g_string_free(basedir, TRUE); + g_string_free(keysfilename, TRUE); + g_string_free(fpsfilename, TRUE); + return; +} + +gboolean +otr_key_loaded(void) +{ + return data_loaded; +} + +gboolean +otr_is_secure(const char * const recipient) +{ + ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", + 0, NULL, NULL, NULL); + + if (context == NULL) { + return FALSE; + } + + if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) { + return FALSE; + } else { + return TRUE; + } +} + +gboolean +otr_is_trusted(const char * const recipient) +{ + ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", + 0, NULL, NULL, NULL); + + if (context == NULL) { + return FALSE; + } + + if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) { + return TRUE; + } + + if (context->active_fingerprint && + g_strcmp0(context->active_fingerprint->trust, "trusted") == 0) { + return TRUE; + } + + return FALSE; +} + +void +otr_trust(const char * const recipient) +{ + ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", + 0, NULL, NULL, NULL); + + if (context == NULL) { + return; + } + + if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) { + return; + } + + if (context->active_fingerprint) { + context->active_fingerprint->trust = "trusted"; + cb_write_fingerprints(NULL); + } + + return; +} + +void +otr_untrust(const char * const recipient) +{ + ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", + 0, NULL, NULL, NULL); + + if (context == NULL) { + return; + } + + if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) { + return; + } + + if (context->active_fingerprint) { + context->active_fingerprint->trust = NULL; + cb_write_fingerprints(NULL); + } + + return; +} + +void +otr_end_session(const char * const recipient) +{ + ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", + 0, NULL, NULL, NULL); + + if (context != NULL) { + otrl_message_disconnect(user_state, &ops, NULL, jid, "xmpp", recipient); + } +} + +char * +otr_get_my_fingerprint(void) +{ + char fingerprint[45]; + otrl_privkey_fingerprint(user_state, fingerprint, jid, "xmpp"); + char *result = strdup(fingerprint); + + return result; +} + +char * +otr_get_their_fingerprint(const char * const recipient) +{ + ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", + 0, NULL, NULL, NULL); + + if (context != NULL) { + Fingerprint *fingerprint = context->active_fingerprint; + char readable[45]; + otrl_privkey_hash_to_human(readable, fingerprint->fingerprint); + return strdup(readable); + } else { + return NULL; + } +} + +char * +otr_encrypt_message(const char * const to, const char * const message) +{ + gcry_error_t err; + char *newmessage = NULL; + + err = otrl_message_sending( + user_state, + &ops, + NULL, + jid, + "xmpp", + to, + message, + 0, + &newmessage, + NULL, + NULL); + if (!err == GPG_ERR_NO_ERROR) { + return NULL; + } else { + return newmessage; + } +} + +char * +otr_decrypt_message(const char * const from, const char * const message, gboolean *was_decrypted) +{ + char *decrypted = NULL; + OtrlTLV *tlvs = NULL; + OtrlTLV *tlv = NULL; + int result = otrl_message_receiving(user_state, &ops, NULL, jid, "xmpp", from, message, &decrypted, &tlvs, NULL, NULL); + + // internal libotr message + if (result == 1) { + tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED); + if (tlv) { + ConnContext *context = otrl_context_find(user_state, from, jid, "xmpp", + 0, NULL, NULL, NULL); + + if (context != NULL) { + otrl_context_force_plaintext(context); + ui_gone_insecure(from); + } + } + return NULL; + + // message was decrypted, return to user + } else if (decrypted != NULL) { + *was_decrypted = TRUE; + return decrypted; + + // normal non OTR message + } else { + *was_decrypted = FALSE; + return strdup(message); + } +} + +void +otr_free_message(char *message) +{ + otrl_message_free(message); +} From 26e1fd545c81c9f93464ca0a6308fd40a37a4804 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 9 Feb 2014 02:24:47 +0000 Subject: [PATCH 05/10] Added libotr4 message handlers --- src/otr4.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/src/otr4.c b/src/otr4.c index 9cc4af63..69360d0f 100644 --- a/src/otr4.c +++ b/src/otr4.c @@ -62,12 +62,37 @@ cb_inject_message(void *opdata, const char *accountname, message_send(message, recipient); } -static int -cb_display_otr_message(void *opdata, const char *accountname, - const char *protocol, const char *username, const char *msg) +static const char* +cb_otr_error_message(void *opdata, ConnContext *context, + OtrlErrorCode err_code) { - cons_show_error("%s", msg); - return 0; + switch(err_code) + { + case OTRL_ERRCODE_ENCRYPTION_ERROR: + return strdup("OTR Error: occured while encrypting a message"); + case OTRL_ERRCODE_MSG_NOT_IN_PRIVATE: + return strdup("OTR Error: Sent encrypted message to somebody who is not in a mutual OTR session"); + case OTRL_ERRCODE_MSG_UNREADABLE: + return strdup("OTR Error: sent an unreadable encrypted message"); + case OTRL_ERRCODE_MSG_MALFORMED: + return strdup("OTR Error: message sent is malformed"); + default: + return strdup("OTR Error: unknown"); + } +} + +static void +cb_otr_error_message_free(void *opdata, const char *err_msg) +{ + free(err_msg); +} + +static void +cb_handle_msg_event(void *opdata, OtrlMessageEvent msg_event, + ConnContext *context, const char *message, + gcry_error_t err) +{ + cons_show_error("%s", message); } static void @@ -109,6 +134,9 @@ otr_init(void) ops.policy = cb_policy; ops.is_logged_in = cb_is_logged_in; ops.inject_message = cb_inject_message; + ops.otr_error_message = cb_otr_error_message; + ops.otr_error_message_free = cb_otr_error_message_free; + ops.handle_msg_event = cb_handle_msg_event; ops.display_otr_message = cb_display_otr_message; ops.write_fingerprints = cb_write_fingerprints; ops.gone_secure = cb_gone_secure; From d5ba4dfd38abebb996ff5a87f2236f933d18393e Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 9 Feb 2014 02:53:07 +0000 Subject: [PATCH 06/10] Changed functions for libotr4 compatibility --- src/otr4.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/src/otr4.c b/src/otr4.c index 69360d0f..158ffcc6 100644 --- a/src/otr4.c +++ b/src/otr4.c @@ -84,7 +84,7 @@ cb_otr_error_message(void *opdata, ConnContext *context, static void cb_otr_error_message_free(void *opdata, const char *err_msg) { - free(err_msg); + free((char *)err_msg); } static void @@ -137,7 +137,6 @@ otr_init(void) ops.otr_error_message = cb_otr_error_message; ops.otr_error_message_free = cb_otr_error_message_free; ops.handle_msg_event = cb_handle_msg_event; - ops.display_otr_message = cb_display_otr_message; ops.write_fingerprints = cb_write_fingerprints; ops.gone_secure = cb_gone_secure; @@ -318,7 +317,7 @@ gboolean otr_is_secure(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, NULL, NULL, NULL); + 0, 0, NULL, NULL, NULL); if (context == NULL) { return FALSE; @@ -335,7 +334,7 @@ gboolean otr_is_trusted(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, NULL, NULL, NULL); + 0, 0, NULL, NULL, NULL); if (context == NULL) { return FALSE; @@ -357,7 +356,7 @@ void otr_trust(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, NULL, NULL, NULL); + 0, 0, NULL, NULL, NULL); if (context == NULL) { return; @@ -379,7 +378,7 @@ void otr_untrust(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, NULL, NULL, NULL); + 0, 0, NULL, NULL, NULL); if (context == NULL) { return; @@ -401,10 +400,10 @@ void otr_end_session(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, NULL, NULL, NULL); + 0, 0, NULL, NULL, NULL); if (context != NULL) { - otrl_message_disconnect(user_state, &ops, NULL, jid, "xmpp", recipient); + otrl_message_disconnect(user_state, &ops, NULL, jid, "xmpp", recipient, 0); } } @@ -422,7 +421,7 @@ char * otr_get_their_fingerprint(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, NULL, NULL, NULL); + 0, 0, NULL, NULL, NULL); if (context != NULL) { Fingerprint *fingerprint = context->active_fingerprint; @@ -447,11 +446,15 @@ otr_encrypt_message(const char * const to, const char * const message) jid, "xmpp", to, + 0, message, 0, &newmessage, + OTRL_FRAGMENT_SEND_ALL, + NULL, NULL, NULL); + if (!err == GPG_ERR_NO_ERROR) { return NULL; } else { @@ -465,14 +468,26 @@ otr_decrypt_message(const char * const from, const char * const message, gboolea char *decrypted = NULL; OtrlTLV *tlvs = NULL; OtrlTLV *tlv = NULL; - int result = otrl_message_receiving(user_state, &ops, NULL, jid, "xmpp", from, message, &decrypted, &tlvs, NULL, NULL); + int result = otrl_message_receiving( + user_state, + &ops, + NULL, + jid, + "xmpp", + from, + message, + &decrypted, + &tlvs, + NULL, + NULL, + NULL); // internal libotr message if (result == 1) { tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED); if (tlv) { ConnContext *context = otrl_context_find(user_state, from, jid, "xmpp", - 0, NULL, NULL, NULL); + 0, 0, NULL, NULL, NULL); if (context != NULL) { otrl_context_force_plaintext(context); From 5b260af999a61b1ce9929543dc03fe9c0295fad7 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 10 Feb 2014 23:24:07 +0000 Subject: [PATCH 07/10] Changed OTR policy for otr4.c --- src/otr4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/otr4.c b/src/otr4.c index 158ffcc6..6114d3db 100644 --- a/src/otr4.c +++ b/src/otr4.c @@ -40,7 +40,7 @@ static gboolean data_loaded; static OtrlPolicy cb_policy(void *opdata, ConnContext *context) { - return OTRL_POLICY_DEFAULT ; + return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 ; } static int From e07209ec4952b79ae4b0f7db4f273bc75bc93669 Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 11 Feb 2014 21:21:33 +0000 Subject: [PATCH 08/10] Allow V3, use OTRL_INSTAG_BEST, output error event when no message --- src/otr4.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/otr4.c b/src/otr4.c index 6114d3db..80a0cdcb 100644 --- a/src/otr4.c +++ b/src/otr4.c @@ -40,7 +40,7 @@ static gboolean data_loaded; static OtrlPolicy cb_policy(void *opdata, ConnContext *context) { - return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 ; + return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 | OTRL_POLICY_ALLOW_V3; } static int @@ -92,7 +92,11 @@ cb_handle_msg_event(void *opdata, OtrlMessageEvent msg_event, ConnContext *context, const char *message, gcry_error_t err) { - cons_show_error("%s", message); + if (message != NULL) { + cons_show_error("%s", message); + } else { + cons_show_error("OTR error event with no message."); + } } static void @@ -317,7 +321,7 @@ gboolean otr_is_secure(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, 0, NULL, NULL, NULL); + OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); if (context == NULL) { return FALSE; @@ -334,7 +338,7 @@ gboolean otr_is_trusted(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, 0, NULL, NULL, NULL); + OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); if (context == NULL) { return FALSE; @@ -356,7 +360,7 @@ void otr_trust(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, 0, NULL, NULL, NULL); + OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); if (context == NULL) { return; @@ -378,7 +382,7 @@ void otr_untrust(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, 0, NULL, NULL, NULL); + OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); if (context == NULL) { return; @@ -400,7 +404,7 @@ void otr_end_session(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, 0, NULL, NULL, NULL); + OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); if (context != NULL) { otrl_message_disconnect(user_state, &ops, NULL, jid, "xmpp", recipient, 0); @@ -421,7 +425,7 @@ char * otr_get_their_fingerprint(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - 0, 0, NULL, NULL, NULL); + OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); if (context != NULL) { Fingerprint *fingerprint = context->active_fingerprint; @@ -446,7 +450,7 @@ otr_encrypt_message(const char * const to, const char * const message) jid, "xmpp", to, - 0, + OTRL_INSTAG_BEST, message, 0, &newmessage, @@ -487,7 +491,7 @@ otr_decrypt_message(const char * const from, const char * const message, gboolea tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED); if (tlv) { ConnContext *context = otrl_context_find(user_state, from, jid, "xmpp", - 0, 0, NULL, NULL, NULL); + OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); if (context != NULL) { otrl_context_force_plaintext(context); From 42630139c2db02f430ef06f172201e8bc898dad4 Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 11 Feb 2014 23:03:07 +0000 Subject: [PATCH 09/10] Use instag master, and skip fragmentation --- src/otr4.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/otr4.c b/src/otr4.c index 80a0cdcb..84244dae 100644 --- a/src/otr4.c +++ b/src/otr4.c @@ -321,7 +321,7 @@ gboolean otr_is_secure(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); + OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); if (context == NULL) { return FALSE; @@ -338,7 +338,7 @@ gboolean otr_is_trusted(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); + OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); if (context == NULL) { return FALSE; @@ -360,7 +360,7 @@ void otr_trust(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); + OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); if (context == NULL) { return; @@ -382,7 +382,7 @@ void otr_untrust(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); + OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); if (context == NULL) { return; @@ -404,7 +404,7 @@ void otr_end_session(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); + OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); if (context != NULL) { otrl_message_disconnect(user_state, &ops, NULL, jid, "xmpp", recipient, 0); @@ -425,7 +425,7 @@ char * otr_get_their_fingerprint(const char * const recipient) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); + OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); if (context != NULL) { Fingerprint *fingerprint = context->active_fingerprint; @@ -450,11 +450,11 @@ otr_encrypt_message(const char * const to, const char * const message) jid, "xmpp", to, - OTRL_INSTAG_BEST, + OTRL_INSTAG_MASTER, message, 0, &newmessage, - OTRL_FRAGMENT_SEND_ALL, + OTRL_FRAGMENT_SEND_SKIP, NULL, NULL, NULL); @@ -491,7 +491,7 @@ otr_decrypt_message(const char * const from, const char * const message, gboolea tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED); if (tlv) { ConnContext *context = otrl_context_find(user_state, from, jid, "xmpp", - OTRL_INSTAG_BEST, 0, NULL, NULL, NULL); + OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); if (context != NULL) { otrl_context_force_plaintext(context); From 25131e3f36451e08f40ccd4c5598a197477b754d Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 11 Feb 2014 23:19:09 +0000 Subject: [PATCH 10/10] Added command to show libotr version --- src/command/command.c | 8 +++++--- src/command/commands.c | 4 ++++ src/otr.h | 1 + src/otr3.c | 6 ++++++ src/otr4.c | 6 ++++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/command/command.c b/src/command/command.c index 2393a734..e76027c1 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -593,9 +593,9 @@ static struct cmd_t command_defs[] = { "/otr", cmd_otr, parse_args, 1, 2, NULL, - { "/otr gen|myfp|theirfp|start|end|trust|untrust|log|warn", "Off The Record encryption commands.", - { "/otr gen|myfp|theirfp|start|end|trust|untrust|log|warn", - "------------------------------------------------------", + { "/otr gen|myfp|theirfp|start|end|trust|untrust|log|warn|libver", "Off The Record encryption commands.", + { "/otr gen|myfp|theirfp|start|end|trust|untrust|log|warn|libver", + "-------------------------------------------------------------", "gen - Generate your private key.", "myfp - Show your fingerprint.", "theirfp - Show contacts fingerprint.", @@ -605,6 +605,7 @@ static struct cmd_t command_defs[] = "untrust - Indicate the the contact's fingerprint is not verified,", "log - How to log OTR messages, options are 'on', 'off' and 'redact', with redaction being the default.", "warn - Show when unencrypted messaging is being used in the title bar, options are 'on' and 'off' with 'on' being the default.", + "libver - Show which version of the libotr library is being used.", NULL } } }, { "/outtype", @@ -1056,6 +1057,7 @@ cmd_init(void) autocomplete_add(otr_ac, "untrust"); autocomplete_add(otr_ac, "log"); autocomplete_add(otr_ac, "warn"); + autocomplete_add(otr_ac, "libver"); otr_log_ac = autocomplete_new(); autocomplete_add(otr_log_ac, "on"); diff --git a/src/command/commands.c b/src/command/commands.c index 368a644b..d0dda7ec 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -2593,6 +2593,10 @@ cmd_otr(gchar **args, struct cmd_help_t help) // update the current window ui_switch_win(wins_get_current_num()); return result; + } else if (strcmp(args[0], "libver") == 0) { + char *version = otr_libotr_version(); + cons_show("Using libotr version %s", version); + return TRUE; } if (jabber_get_connection_status() != JABBER_CONNECTED) { diff --git a/src/otr.h b/src/otr.h index 404e7e07..85ae09cc 100644 --- a/src/otr.h +++ b/src/otr.h @@ -26,6 +26,7 @@ #include "config/accounts.h" void otr_init(void); +char* otr_libotr_version(void); void otr_on_connect(ProfAccount *account); void otr_keygen(ProfAccount *account); diff --git a/src/otr3.c b/src/otr3.c index 8e603a00..6d5c9496 100644 --- a/src/otr3.c +++ b/src/otr3.c @@ -100,6 +100,12 @@ cb_gone_secure(void *opdata, ConnContext *context) ui_gone_secure(context->username, otr_is_trusted(context->username)); } +char * +otr_libotr_version(void) +{ + return OTRL_VERSION; +} + void otr_init(void) { diff --git a/src/otr4.c b/src/otr4.c index 84244dae..ddd4aeeb 100644 --- a/src/otr4.c +++ b/src/otr4.c @@ -129,6 +129,12 @@ cb_gone_secure(void *opdata, ConnContext *context) ui_gone_secure(context->username, otr_is_trusted(context->username)); } +char * +otr_libotr_version(void) +{ + return OTRL_VERSION; +} + void otr_init(void) {