OTR support, first checkin

16 files changed, 1121 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index 0a988feb..c0d7aad9 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@
 -include Makefile.settings
 
 # Program variables
-objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
+objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o otr.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o
+headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h otr.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
 
 # Expansion of variables
diff --git a/bitlbee.c b/bitlbee.c
index c4b5abb3..8785ecf0 100644
--- a/bitlbee.c
+++ b/bitlbee.c
@@ -138,6 +138,9 @@ int bitlbee_inetd_init()
 	
 	log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
 	log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
+    /* TODO: Remove debugging log_link's */
+	log_link( LOGLVL_INFO, LOGOUTPUT_IRC );
+	log_link( LOGLVL_DEBUG, LOGOUTPUT_IRC );
 	
 	return( 0 );
 }
diff --git a/bitlbee.h b/bitlbee.h
index 23ec64b1..b60d4b90 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -132,6 +132,7 @@ extern char *CONF_FILE;
 #include "sock.h"
 #include "misc.h"
 #include "proxy.h"
+#include "otr.h"
 
 typedef struct global {
 	/* In forked mode, child processes store the fd of the IPC socket here. */
@@ -142,6 +143,7 @@ typedef struct global {
 	GList *storage; /* The first backend in the list will be used for saving */
 	char *helpfile;
 	int restart;
+	OtrlMessageAppOps otr_ops;   /* collects interface functions required by OTR */
 } global_t;
 
 int bitlbee_daemon_init( void );
diff --git a/configure b/configure
index 22989f60..c0a9bdb4 100755
--- a/configure
+++ b/configure
@@ -29,6 +29,7 @@ debug=0
 strip=1
 gcov=0
 plugins=1
+otr=auto
 
 events=glib
 ldap=0
@@ -69,6 +70,7 @@ Option		Description				Default
 --strip=0/1	Disable/enable binary stripping		$strip
 --gcov=0/1	Disable/enable test coverage reporting	$gcov
 --plugins=0/1	Disable/enable plugins support		$plugins
+--otr=0/1/auto	Disable/enable OTR encryption support	$otr
 
 --events=...	Event handler (glib, libevent)		$events
 --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
@@ -173,8 +175,8 @@ fi
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
 	if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
 		cat<<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
-CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
+EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0 gthread-2.0`
+CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0 gthread-2.0`
 EOF
 	else
 		echo
@@ -384,6 +386,21 @@ else
 	echo '#define WITH_PLUGINS' >> config.h
 fi
 
+if [ "$otr" = "auto" ]; then
+	for i in /lib /usr/lib /usr/local/lib; do
+		if [ -f $i/libotr.a ]; then
+			otr=1
+			break
+		fi
+	done
+fi
+if [ "$otr" = 0 ]; then
+	echo '#undef WITH_OTR' >> config.h
+else
+	echo '#define WITH_OTR' >> config.h
+	echo "EFLAGS+=-lotr" >> Makefile.settings
+fi
+
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
 	nick=`bzr nick`
@@ -503,6 +520,12 @@ else
 	echo '  Binary stripping disabled.'
 fi
 
+if [ "$otr" = "1" ]; then
+	echo '  Off-the-Record (OTR) Messaging enabled.'
+else
+	echo '  Off-the-Record (OTR) Messaging disabled.'
+fi
+
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl
 echo '  Building with these storage backends: '$STORAGES
diff --git a/irc.c b/irc.c
index 972e030e..db681175 100644
--- a/irc.c
+++ b/irc.c
@@ -125,6 +125,9 @@ irc_t *irc_new( int fd )
 	set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
 	
 	conf_loaddefaults( irc );
+
+	irc->otr_us = otrl_userstate_create();
+	irc->otr_mutex = g_mutex_new();
 	
 	return( irc );
 }
@@ -275,6 +278,10 @@ void irc_free(irc_t * irc)
 			g_free(helpnodetmp);
 		}
 	}
+	
+	otrl_userstate_free(irc->otr_us);
+	g_mutex_free(irc->otr_mutex);
+	
 	g_free(irc);
 	
 	if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )
diff --git a/irc.h b/irc.h
index 8be3579e..318e263e 100644
--- a/irc.h
+++ b/irc.h
@@ -26,6 +26,8 @@
 #ifndef _IRC_H
 #define _IRC_H
 
+#include "otr.h"
+
 #define IRC_MAX_LINE 512
 #define IRC_MAX_ARGS 8
 
@@ -94,6 +96,9 @@ typedef struct irc
 	gint r_watch_source_id;
 	gint w_watch_source_id;
 	gint ping_source_id;
+	
+	OtrlUserState otr_us;
+	GMutex *otr_mutex;      /* for locking otr during keygen */
 } irc_t;
 
 #include "user.h"
diff --git a/log.c b/log.c
index 4606fb88..bea046d3 100644
--- a/log.c
+++ b/log.c
@@ -29,10 +29,10 @@
 
 static log_t logoutput;
 
-static void log_null(int level, char *logmessage);
-static void log_irc(int level, char *logmessage);
-static void log_syslog(int level, char *logmessage);
-static void log_console(int level, char *logmessage);
+static void log_null(int level, const char *logmessage);
+static void log_irc(int level, const char *logmessage);
+static void log_syslog(int level, const char *logmessage);
+static void log_console(int level, const char *logmessage);
 
 void log_init(void) {
 	openlog("bitlbee", LOG_PID, LOG_DAEMON);	
@@ -96,7 +96,7 @@ void log_link(int level, int output) {
 
 }
 
-void log_message(int level, char *message, ... ) {
+void log_message(int level, const char *message, ... ) {
 
 	va_list ap;
 	char *msgstring;
@@ -121,17 +121,17 @@ void log_message(int level, char *message, ... ) {
 	return;
 }
 
-void log_error(char *functionname) {
+void log_error(const char *functionname) {
 	log_message(LOGLVL_ERROR, "%s: %s", functionname, strerror(errno));
 	
 	return;
 }
 
-static void log_null(int level, char *message) {
+static void log_null(int level, const char *message) {
 	return;
 }
 
-static void log_irc(int level, char *message) {
+static void log_irc(int level, const char *message) {
 	if(level == LOGLVL_ERROR)
 		irc_write_all(1, "ERROR :Error: %s", message);
 	if(level == LOGLVL_WARNING)
@@ -146,7 +146,7 @@ static void log_irc(int level, char *message) {
 	return;
 }
 
-static void log_syslog(int level, char *message) {
+static void log_syslog(int level, const char *message) {
 	if(level == LOGLVL_ERROR)
 		syslog(LOG_ERR, "%s", message);
 	if(level == LOGLVL_WARNING)
@@ -160,7 +160,7 @@ static void log_syslog(int level, char *message) {
 	return;
 }
 
-static void log_console(int level, char *message) {
+static void log_console(int level, const char *message) {
 	if(level == LOGLVL_ERROR)
 		fprintf(stderr, "Error: %s\n", message);
 	if(level == LOGLVL_WARNING)
diff --git a/log.h b/log.h
index f574ae07..b651416b 100644
--- a/log.h
+++ b/log.h
@@ -43,17 +43,17 @@ typedef enum {
 } logoutput_t;
 
 typedef struct log_t {
-	void (*error)(int level, char *logmessage);
-	void (*warning)(int level, char *logmessage); 
-	void (*informational)(int level, char *logmessage);
+	void (*error)(int level, const char *logmessage);
+	void (*warning)(int level, const char *logmessage); 
+	void (*informational)(int level, const char *logmessage);
 #ifdef DEBUG
-	void (*debug)(int level, char *logmessage);
+	void (*debug)(int level, const char *logmessage);
 #endif
 } log_t;
 
 void log_init(void);
 void log_link(int level, int output);
-void log_message(int level, char *message, ...) G_GNUC_PRINTF( 2, 3 );
-void log_error(char *functionname);
+void log_message(int level, const char *message, ...) G_GNUC_PRINTF( 2, 3 );
+void log_error(const char *functionname);
 
 #endif
diff --git a/otr.c b/otr.c
new file mode 100644
index 00000000..2b920f4b
--- /dev/null
+++ b/otr.c
@@ -0,0 +1,953 @@
+#include "bitlbee.h"
+#ifdef WITH_OTR
+#include "irc.h"
+#include "otr.h"
+#include <sys/types.h>
+#include <unistd.h>
+
+/**
+files used to store OTR data:
+  $configdir/$nick.otr_keys
+  $configdir/$nick.otr_fprints
+ **/
+
+
+/** OTR interface routines for the OtrlMessageAppOps struct: **/
+
+OtrlPolicy op_policy(void *opdata, ConnContext *context);
+
+void op_create_privkey(void *opdata, const char *accountname, const char *protocol);
+
+int op_is_logged_in(void *opdata, const char *accountname, const char *protocol,
+	const char *recipient);
+
+void op_inject_message(void *opdata, const char *accountname, const char *protocol,
+	const char *recipient, const char *message);
+
+int op_display_otr_message(void *opdata, const char *accountname, const char *protocol,
+	const char *username, const char *msg);
+
+void op_new_fingerprint(void *opdata, OtrlUserState us, const char *accountname,
+	const char *protocol, const char *username, unsigned char fingerprint[20]);
+
+void op_write_fingerprints(void *opdata);
+
+void op_gone_secure(void *opdata, ConnContext *context);
+
+void op_gone_secure(void *opdata, ConnContext *context);
+
+void op_gone_insecure(void *opdata, ConnContext *context);
+
+void op_still_secure(void *opdata, ConnContext *context, int is_reply);
+
+void op_log_message(void *opdata, const char *message);
+
+/* TODO: int op_max_message_size(void *opdata, ConnContext *context); */
+
+/* TODO: const char *op_account_name(void *opdata, const char *account,
+	const char *protocol); */
+
+
+/** otr sub-command handlers: **/
+
+/* TODO: void cmd_otr_keygen(irc_t *irc, char **args); */
+void cmd_otr_abort(irc_t *irc, char **args); /* TODO: does this cmd even make sense? */
+void cmd_otr_request(irc_t *irc, char **args); /* TODO: do we even need this? */
+void cmd_otr_auth(irc_t *irc, char **args);
+/* TODO: void cmd_otr_affirm(irc_t *irc, char **args); */
+void cmd_otr_fprints(irc_t *irc, char **args);
+void cmd_otr_info(irc_t *irc, char **args);
+void cmd_otr_policy(irc_t *irc, char **args);
+
+const command_t otr_commands[] = {
+	{ "abort",    1, &cmd_otr_abort,    0 },
+	{ "request",  1, &cmd_otr_request,  0 },
+	{ "auth",     2, &cmd_otr_auth,     0 },
+	{ "fprints",  0, &cmd_otr_fprints,  0 },
+	{ "info",     1, &cmd_otr_info,     0 },
+	{ "policy",   0, &cmd_otr_policy,   0 },
+	{ NULL }
+};
+
+
+/** misc. helpers/subroutines: **/
+
+/* start background thread to generate a (new) key for a given account */
+void otr_keygen(irc_t *irc, const char *handle, const char *protocol);
+/* keygen thread main func */
+gpointer otr_keygen_thread_func(gpointer data);
+/* mainloop handler for when keygen thread finishes */
+gboolean keygen_finish_handler(gpointer data, gint fd, b_input_condition cond);
+/* data to be passed to otr_keygen_thread_func */
+struct kgdata {
+	irc_t *irc;            /* access to OTR userstate */
+	char *keyfile;         /* free me! */
+	const char *handle;      /* don't free! */
+	const char *protocol;    /* don't free! */
+	GMutex *mutex;         /* lock for the 'done' flag, free me! */
+	int done;              /* is the thread done? */
+	gcry_error_t result;   /* return value of otrl_privkey_generate */
+};
+
+/* yes/no handlers for "generate key now?" */
+void yes_keygen(gpointer w, void *data);
+void no_keygen(gpointer w, void *data);
+
+/* helper to make sure accountname and protocol match the incoming "opdata" */
+struct im_connection *check_imc(void *opdata, const char *accountname,
+	const char *protocol);
+
+/* determine the nick for a given handle/protocol pair */
+const char *peernick(irc_t *irc, const char *handle, const char *protocol);
+
+/* handle SMP TLVs from a received message */
+void otr_handle_smp(struct im_connection *ic, const char *handle, OtrlTLV *tlvs);
+
+/* show the list of fingerprints associated with a given context */
+void show_fingerprints(irc_t *irc, ConnContext *ctx);
+
+
+
+/*** routines declared in otr.h: ***/
+
+void otr_init(void)
+{
+	if(!g_thread_supported()) g_thread_init(NULL);
+	OTRL_INIT;
+	
+	/* fill global OtrlMessageAppOps */
+	global.otr_ops.policy = &op_policy;
+	global.otr_ops.create_privkey = &op_create_privkey;
+	global.otr_ops.is_logged_in = &op_is_logged_in;
+	global.otr_ops.inject_message = &op_inject_message;
+	global.otr_ops.notify = NULL;
+	global.otr_ops.display_otr_message = &op_display_otr_message;
+	global.otr_ops.update_context_list = NULL;
+	global.otr_ops.protocol_name = NULL;
+	global.otr_ops.protocol_name_free = NULL;
+	global.otr_ops.new_fingerprint = &op_new_fingerprint;
+	global.otr_ops.write_fingerprints = &op_write_fingerprints;
+	global.otr_ops.gone_secure = &op_gone_secure;
+	global.otr_ops.gone_insecure = &op_gone_insecure;
+	global.otr_ops.still_secure = &op_still_secure;
+	global.otr_ops.log_message = &op_log_message;
+	global.otr_ops.max_message_size = NULL;
+	global.otr_ops.account_name = NULL;
+	global.otr_ops.account_name_free = NULL;
+}
+
+/* Notice on the otr_mutex:
+
+   The incoming/outgoing message handlers try to lock the otr_mutex. If they succeed,
+   this will prevent a concurrent keygen (possibly spawned by that very command)
+   from messing up the userstate. If the lock fails, that means there already is
+   a keygen in progress. Instead of blocking for an unknown time, they
+   will bail out gracefully, informing the user of this temporary "coma".
+   TODO: Hold back incoming/outgoing messages and process them when keygen completes?
+
+   The other routines do not lock the otr_mutex themselves, it is done as a
+   catch-all in the root command handler. Rationale:
+     a) it's easy to code
+     b) it makes it obvious that no command can get its userstate corrupted
+     c) the "irc" struct is readily available there for feedback to the user
+ */
+
+void otr_load(irc_t *irc)
+{
+	char s[512];
+	account_t *a;
+	gcry_error_t e;
+
+	log_message(LOGLVL_DEBUG, "otr_load '%s'", irc->nick);
+
+	g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, irc->nick);
+	e = otrl_privkey_read(irc->otr_us, s);
+	if(e && e!=ENOENT) {
+		log_message(LOGLVL_ERROR, "%s: %s", s, strerror(e));
+	}
+	g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->nick);
+	e = otrl_privkey_read_fingerprints(irc->otr_us, s, NULL, NULL);
+	if(e && e!=ENOENT) {
+		log_message(LOGLVL_ERROR, "%s: %s", s, strerror(e));
+	}
+	
+	/* check for otr keys on all accounts */
+	for(a=irc->accounts; a; a=a->next) {
+		otr_check_for_key(a);
+	}
+}
+
+void otr_save(irc_t *irc)
+{
+	char s[512];
+
+	log_message(LOGLVL_DEBUG, "otr_save '%s'", irc->nick);
+
+	g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->nick);
+	otrl_privkey_write_fingerprints(irc->otr_us, s);
+}
+
+void otr_remove(const char *nick)
+{
+	char s[512];
+	
+	log_message(LOGLVL_DEBUG, "otr_remove '%s'", nick);
+
+	g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, nick);
+	unlink(s);
+	g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, nick);
+	unlink(s);
+}
+
+void otr_rename(const char *onick, const char *nnick)
+{
+	char s[512], t[512];
+	
+	log_message(LOGLVL_DEBUG, "otr_rename '%s' -> '%s'", onick, nnick);
+
+	g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, onick);
+	g_snprintf(t, 511, "%s%s.otr_keys", global.conf->configdir, nnick);
+	rename(s,t);
+	g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, onick);
+	g_snprintf(t, 511, "%s%s.otr_fprints", global.conf->configdir, nnick);
+	rename(s,t);
+}
+
+void otr_check_for_key(account_t *a)
+{
+	irc_t *irc = a->irc;
+	char buf[45];
+	char *fp;
+	
+	fp = otrl_privkey_fingerprint(irc->otr_us, buf, a->user, a->prpl->name);
+	if(fp) {
+		irc_usermsg(irc, "otr: %s/%s ready with f'print %s",
+			a->user, a->prpl->name, fp);
+	} else {
+		otr_keygen(irc, a->user, a->prpl->name);
+	}
+}
+
+char *otr_handle_message(struct im_connection *ic, const char *handle, const char *msg)
+{
+	int ignore_msg;
+	char *newmsg = NULL;
+	OtrlTLV *tlvs = NULL;
+	char *colormsg;
+	
+    if(!g_mutex_trylock(ic->irc->otr_mutex)) {
+    	/* TODO: queue msgs received during keygen for later */
+		irc_usermsg(ic->irc, "msg from %s/%s during keygen - dropped",
+			handle, ic->acc->prpl->name);
+		return NULL;
+	}
+
+	ignore_msg = otrl_message_receiving(ic->irc->otr_us, &global.otr_ops, ic,
+		ic->acc->user, ic->acc->prpl->name, handle, msg, &newmsg,
+		&tlvs, NULL, NULL);
+
+	otr_handle_smp(ic, handle, tlvs);
+	
+	if(ignore_msg) {
+		/* this was an internal OTR protocol message */
+		g_mutex_unlock(ic->irc->otr_mutex);
+		return NULL;
+	} else if(!newmsg) {
+		/* this was a non-OTR message */
+		g_mutex_unlock(ic->irc->otr_mutex);
+		return g_strdup(msg);
+	} else {
+		/* OTR has processed this message */
+		ConnContext *context = otrl_context_find(ic->irc->otr_us, handle,
+			ic->acc->user, ic->acc->prpl->name, 0, NULL, NULL, NULL);
+		if(context && context->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
+			/* color according to f'print trust */
+			char color;
+			const char *trust = context->active_fingerprint->trust;
+			if(trust && trust[0] != '\0')
+				color='3';   /* green */
+			else
+				color='5';   /* red */
+			colormsg = g_strdup_printf("\x03%c%s\x0F", color, newmsg);
+		} else {
+			colormsg = g_strdup(newmsg);
+		}
+		otrl_message_free(newmsg);
+		g_mutex_unlock(ic->irc->otr_mutex);
+		return colormsg;
+	}
+}
+
+int otr_send_message(struct im_connection *ic, const char *handle, const char *msg, int flags)
+{	
+    int st;
+    char *otrmsg = NULL;
+    ConnContext *ctx = NULL;
+    
+    if(!g_mutex_trylock(ic->irc->otr_mutex)) {
+    	irc_usermsg(ic->irc, "msg to %s/%s during keygen - not sent",
+    		handle, ic->acc->prpl->name);
+    	return 1;
+    }
+    
+	st = otrl_message_sending(ic->irc->otr_us, &global.otr_ops, ic,
+		ic->acc->user, ic->acc->prpl->name, handle,
+		msg, NULL, &otrmsg, NULL, NULL);
+	if(st) {
+		g_mutex_unlock(ic->irc->otr_mutex);
+		return st;
+	}
+
+	ctx = otrl_context_find(ic->irc->otr_us,
+			handle, ic->acc->user, ic->acc->prpl->name,
+			1, NULL, NULL, NULL);
+
+	if(otrmsg) {
+		if(!ctx) {
+			otrl_message_free(otrmsg);
+			g_mutex_unlock(ic->irc->otr_mutex);
+			return 1;
+		}
+		st = otrl_message_fragment_and_send(&global.otr_ops, ic, ctx,
+			otrmsg, OTRL_FRAGMENT_SEND_ALL, NULL);
+		otrl_message_free(otrmsg);
+	} else {
+		/* yeah, well, some const casts as usual... ;-) */
+		st = ic->acc->prpl->buddy_msg( ic, (char *)handle, (char *)msg, flags );
+	}
+	
+	g_mutex_unlock(ic->irc->otr_mutex);
+	return st;
+}
+
+void cmd_otr(irc_t *irc, char **args)
+{
+	const command_t *cmd;
+	
+	if(!args[0])
+		return;
+	
+	if(!args[1])
+		return;
+	
+	for(cmd=otr_commands; cmd->command; cmd++) {
+		if(strcmp(cmd->command, args[1]) == 0)
+			break;
+	}
+	
+	if(!cmd->command) {
+		irc_usermsg(irc, "%s %s: unknown subcommand, see \x02help otr\x02",
+			args[0], args[1]);
+		return;
+	}
+	
+	if(!args[cmd->required_parameters+1]) {
+		irc_usermsg(irc, "%s %s: not enough arguments (%d req.)",
+			args[0], args[1], cmd->required_parameters);
+		return;
+	}
+	
+	cmd->execute(irc, args+1);
+}
+
+
+/*** OTR "MessageAppOps" callbacks for global.otr_ui: ***/
+
+OtrlPolicy op_policy(void *opdata, ConnContext *context)
+{
+	/* TODO: OTR policy configurable */
+	return OTRL_POLICY_OPPORTUNISTIC;
+}
+
+void op_create_privkey(void *opdata, const char *accountname,
+	const char *protocol)
+{
+	struct im_connection *ic = check_imc(opdata, accountname, protocol);
+	char *s;
+	
+	log_message(LOGLVL_DEBUG, "op_create_privkey '%s' '%s'", accountname, protocol);
+
+	s = g_strdup_printf("oops, no otr privkey for %s/%s - generate one now?",
+		accountname, protocol);
+	query_add(ic->irc, ic, s, yes_keygen, no_keygen, ic->acc);
+}
+
+int op_is_logged_in(void *opdata, const char *accountname,
+	const char *protocol, const char *recipient)
+{
+	struct im_connection *ic = check_imc(opdata, accountname, protocol);
+	user_t *u;
+
+	log_message(LOGLVL_DEBUG, "op_is_logged_in '%s' '%s' '%s'", accountname, protocol, recipient);
+	
+	/* lookup the user_t for the given recipient */
+	u = user_findhandle(ic, recipient);
+	if(u) {
+		if(u->online)
+			return 1;
+		else
+			return 0;
+	} else {
+		return -1;
+	}
+}
+
+void op_inject_message(void *opdata, const char *accountname,
+	const char *protocol, const char *recipient, const char *message)
+{
+	struct im_connection *ic = check_imc(opdata, accountname, protocol);
+
+	log_message(LOGLVL_DEBUG, "op_inject_message '%s' '%s' '%s' '%s'", accountname, protocol, recipient, message);
+
+	if (strcmp(accountname, recipient) == 0) {
+		/* huh? injecting messages to myself? */
+		irc_usermsg(ic->irc, "note to self: %s", message);
+	} else {
+		/* need to drop some consts here :-( */
+		/* TODO: get flags into op_inject_message?! */
+		ic->acc->prpl->buddy_msg(ic, (char *)recipient, (char *)message, 0);
+		/* ignoring return value :-/ */
+	}
+}
+
+int op_display_otr_message(void *opdata, const char *accountname,
+	const char *protocol, const char *username, const char *msg)
+{
+	struct im_connection *ic = check_imc(opdata, accountname, protocol);
+
+	log_message(LOGLVL_DEBUG, "op_display_otr_message '%s' '%s' '%s' '%s'", accountname, protocol, username, msg);
+
+	irc_usermsg(ic->irc, "%s", msg);
+
+	return 0;
+}
+
+void op_new_fingerprint(void *opdata, OtrlUserState us,
+	const char *accountname, const char *protocol,
+	const char *username, unsigned char fingerprint[20])
+{
+	struct im_connection *ic = check_imc(opdata, accountname, protocol);
+	char hunam[45];		/* anybody looking? ;-) */
+	
+	otrl_privkey_hash_to_human(hunam, fingerprint);
+	log_message(LOGLVL_DEBUG, "op_new_fingerprint '%s' '%s' '%s' '%s'", accountname, protocol, username, hunam);
+
+	irc_usermsg(ic->irc, "new fingerprint for %s: %s",
+		peernick(ic->irc, username, protocol), hunam);
+}
+
+void op_write_fingerprints(void *opdata)
+{
+	struct im_connection *ic = (struct im_connection *)opdata;
+
+	log_message(LOGLVL_DEBUG, "op_write_fingerprints");
+
+	otr_save(ic->irc);
+}
+
+void op_gone_secure(void *opdata, ConnContext *context)
+{
+	struct im_connection *ic =
+		check_imc(opdata, context->accountname, context->protocol);
+
+	log_message(LOGLVL_DEBUG, "op_gone_secure '%s' '%s' '%s'", context->accountname, context->protocol, context->username);
+
+	irc_usermsg(ic->irc, "conversation with %s is now off the record",
+		peernick(ic->irc, context->username, context->protocol));
+}
+
+void op_gone_insecure(void *opdata, ConnContext *context)
+{
+	struct im_connection *ic =
+		check_imc(opdata, context->accountname, context->protocol);
+
+	log_message(LOGLVL_DEBUG, "op_gone_insecure '%s' '%s' '%s'", context->accountname, context->protocol, context->username);
+
+	irc_usermsg(ic->irc, "conversation with %s is now in the clear",
+		peernick(ic->irc, context->username, context->protocol));
+}
+
+void op_still_secure(void *opdata, ConnContext *context, int is_reply)
+{
+	struct im_connection *ic =
+		check_imc(opdata, context->accountname, context->protocol);
+
+	log_message(LOGLVL_DEBUG, "op_still_secure '%s' '%s' '%s' is_reply=%d",
+		context->accountname, context->protocol, context->username, is_reply);
+
+	irc_usermsg(ic->irc, "otr connection with %s has been refreshed",
+		peernick(ic->irc, context->username, context->protocol));
+}
+
+void op_log_message(void *opdata, const char *message)
+{
+	log_message(LOGLVL_INFO, "%s", message);
+}
+
+
+/*** OTR sub-command handlers ***/
+
+void cmd_otr_abort(irc_t *irc, char **args)
+{
+	user_t *u;
+
+	u = user_find(irc, args[1]);
+	if(!u || !u->ic) {
+		irc_usermsg(irc, "%s: unknown user", args[1]);
+		return;
+	}
+	
+	otrl_message_disconnect(irc->otr_us, &global.otr_ops,
+		u->ic, u->ic->acc->user, u->ic->acc->prpl->name, u->handle);
+}
+
+void cmd_otr_request(irc_t *irc, char **args)
+{
+	user_t *u;
+
+	u = user_find(irc, args[1]);
+	if(!u || !u->ic) {
+		irc_usermsg(irc, "%s: unknown user", args[1]);
+		return;
+	}
+	if(!u->online) {
+		irc_usermsg(irc, "%s is offline", args[1]);
+		return;
+	}
+	
+	imc_buddy_msg(u->ic, u->handle, "?OTR?", 0);
+}
+
+void cmd_otr_auth(irc_t *irc, char **args)
+{
+	user_t *u;
+	ConnContext *ctx;
+	
+	u = user_find(irc, args[1]);
+	if(!u || !u->ic) {
+		irc_usermsg(irc, "%s: unknown user", args[1]);
+		return;
+	}
+	if(!u->online) {
+		irc_usermsg(irc, "%s is offline", args[1]);
+		return;
+	}
+	
+	ctx = otrl_context_find(irc->otr_us, u->handle,
+		u->ic->acc->user, u->ic->acc->prpl->name, 1, NULL, NULL, NULL);
+	if(!ctx) {
+		return;
+	}
+
+	if(ctx->smstate->nextExpected != OTRL_SMP_EXPECT1) {
+		log_message(LOGLVL_INFO,
+			"SMP already in phase %d, sending abort before reinitiating",
+			ctx->smstate->nextExpected+1);
+		otrl_message_abort_smp(irc->otr_us, &global.otr_ops, u->ic, ctx);
+		otrl_sm_state_free(ctx->smstate);
+	}
+	
+	/* warning: the following assumes that smstates are cleared whenever an SMP
+	   is completed or aborted! */ 
+	if(ctx->smstate->secret == NULL) {
+		irc_usermsg(irc, "smp: initiating with %s...", u->nick);
+		otrl_message_initiate_smp(irc->otr_us, &global.otr_ops,
+			u->ic, ctx, (unsigned char *)args[2], strlen(args[2]));
+		/* smp is now in EXPECT2 */
+	} else {
+		/* if we're still in EXPECT1 but smstate is initialized, we must have
+		   received the SMP1, so let's issue a response */
+		irc_usermsg(irc, "smp: responding to %s...", u->nick);
+		otrl_message_respond_smp(irc->otr_us, &global.otr_ops,
+			u->ic, ctx, (unsigned char *)args[2], strlen(args[2]));
+		/* smp is now in EXPECT3 */
+	}
+}
+
+void cmd_otr_fprints(irc_t *irc, char **args)
+{
+	if(args[1]) {
+		/* list given buddy's fingerprints */
+		user_t *u;
+		ConnContext *ctx;
+	
+		u = user_find(irc, args[1]);
+		if(!u || !u->ic) {
+			irc_usermsg(irc, "%s: unknown user", args[1]);
+			return;
+		}
+	
+		ctx = otrl_context_find(irc->otr_us, u->handle,
+			u->ic->acc->user, u->ic->acc->prpl->name, 0, NULL, NULL, NULL);
+		if(!ctx) {
+			irc_usermsg(irc, "no fingerprints");
+		} else {
+			show_fingerprints(irc, ctx);
+		}
+	} else {
+		/* list all known fingerprints */
+		ConnContext *ctx;
+		for(ctx=irc->otr_us->context_root; ctx; ctx=ctx->next) {
+			irc_usermsg(irc, "[%s]", peernick(irc, ctx->username, ctx->protocol));
+			show_fingerprints(irc, ctx);
+		}
+		if(!irc->otr_us->context_root) {
+			irc_usermsg(irc, "no fingerprints");
+		}
+	}
+}
+
+void cmd_otr_info(irc_t *irc, char **args)
+{
+	user_t *u;
+	ConnContext *ctx;
+	Fingerprint *fp;
+	char human[45];
+	const char *offer_status;
+	const char *message_state;
+	const char *trust;
+
+	if(!args) {
+		irc_usermsg(irc, "no args?!");
+		return;
+	}
+	if(!args[1]) {
+		irc_usermsg(irc, "no args[1]?!");
+		return;
+	}
+	u = user_find(irc, args[1]);
+	if(!u || !u->ic) {
+		irc_usermsg(irc, "%s: unknown user", args[1]);
+		return;
+	}
+	
+	ctx = otrl_context_find(irc->otr_us, u->handle,
+		u->ic->acc->user, u->ic->acc->prpl->name, 0, NULL, NULL, NULL);
+	if(!ctx) {
+		irc_usermsg(irc, "no otr info on %s", args[1]);
+		return;
+	}
+
+	switch(ctx->otr_offer) {
+	case OFFER_NOT:       offer_status="none sent";          break;
+	case OFFER_SENT:      offer_status="awaiting reply";     break;
+	case OFFER_ACCEPTED:  offer_status="accepted our offer"; break;
+	case OFFER_REJECTED:  offer_status="ignored our offer";  break;
+	default:              offer_status="?";
+	}
+
+	switch(ctx->msgstate) {
+	case OTRL_MSGSTATE_PLAINTEXT: message_state="cleartext"; break;
+	case OTRL_MSGSTATE_ENCRYPTED: message_state="encrypted"; break;
+	case OTRL_MSGSTATE_FINISHED:  message_state="shut down"; break;
+	default:                      message_state="?";
+	}
+
+	irc_usermsg(irc, "%s is %s/%s; we are %s/%s to them", args[1],
+		ctx->username, ctx->protocol, ctx->accountname, ctx->protocol);
+	irc_usermsg(irc, "  otr offer status: %s", offer_status);
+	irc_usermsg(irc, "  connection state: %s", message_state);
+	irc_usermsg(irc, "  protocol version: %d", ctx->protocol_version);
+	fp = ctx->active_fingerprint;
+	if(!fp) {
+		irc_usermsg(irc, "  active f'print:   none");
+	} else {
+		otrl_privkey_hash_to_human(human, fp->fingerprint);
+		if(!fp->trust || fp->trust[0] == '\0') {
+			trust="untrusted";
+		} else {
+			trust=fp->trust;
+		}
+		irc_usermsg(irc, "  active f'print:   %s (%s)", human, trust);
+	}
+}
+
+void cmd_otr_policy(irc_t *irc, char **args)
+{
+	irc_usermsg(irc, "n/a: not implemented");
+}
+
+
+/*** local helpers / subroutines: ***/
+
+/* Socialist Millionaires' Protocol */
+void otr_handle_smp(struct im_connection *ic, const char *handle, OtrlTLV *tlvs)
+{
+	irc_t *irc = ic->irc;
+	OtrlUserState us = irc->otr_us;
+	OtrlMessageAppOps *ops = &global.otr_ops;
+	OtrlTLV *tlv = NULL;
+	ConnContext *context;
+	NextExpectedSMP nextMsg;
+	user_t *u;
+
+	u = user_findhandle(ic, handle);
+	if(!u) return;
+	context = otrl_context_find(us, handle,
+		ic->acc->user, ic->acc->prpl->name, 1, NULL, NULL, NULL);
+	if(!context) return;
+	nextMsg = context->smstate->nextExpected;
+
+	tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP1);
+	if (tlv) {
+		if (nextMsg != OTRL_SMP_EXPECT1) {
+			irc_usermsg(irc, "smp %s: spurious SMP1 received, aborting", u->nick);
+			otrl_message_abort_smp(us, ops, u->ic, context);
+			otrl_sm_state_free(context->smstate);
+		} else {
+			irc_usermsg(irc, "smp: initiated by %s"
+				" - respond with \x02otr smp %s <secret>\x02",
+				u->nick, u->nick);
+			/* smp stays in EXPECT1 until user responds */
+		}
+	}
+	tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP2);
+	if (tlv) {
+		if (nextMsg != OTRL_SMP_EXPECT2) {
+			irc_usermsg(irc, "smp %s: spurious SMP2 received, aborting", u->nick);
+			otrl_message_abort_smp(us, ops, u->ic, context);
+			otrl_sm_state_free(context->smstate);
+		} else {
+			/* SMP2 received, otrl_message_receiving will have sent SMP3 */
+			context->smstate->nextExpected = OTRL_SMP_EXPECT4;
+		}
+	}
+	tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP3);
+	if (tlv) {
+		if (nextMsg != OTRL_SMP_EXPECT3) {
+			irc_usermsg(irc, "smp %s: spurious SMP3 received, aborting", u->nick);
+			otrl_message_abort_smp(us, ops, u->ic, context);
+			otrl_sm_state_free(context->smstate);
+		} else {
+			/* SMP3 received, otrl_message_receiving will have sent SMP4 and set fp trust */
+			const char *trust = context->active_fingerprint->trust;
+			if(!trust || trust[0]=='\0') {
+				irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+					u->nick);
+			} else {
+				irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+					u->nick);
+			}
+			otrl_sm_state_free(context->smstate);
+			/* smp is in back in EXPECT1 */
+		}
+	}
+	tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP4);
+	if (tlv) {
+		if (nextMsg != OTRL_SMP_EXPECT4) {
+			irc_usermsg(irc, "smp %s: spurious SMP4 received, aborting", u->nick);
+			otrl_message_abort_smp(us, ops, u->ic, context);
+			otrl_sm_state_free(context->smstate);
+		} else {
+			/* SMP4 received, otrl_message_receiving will have set fp trust */
+			const char *trust = context->active_fingerprint->trust;
+			if(!trust || trust[0]=='\0') {
+				irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+					u->nick);
+			} else {
+				irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+					u->nick);
+			}
+			otrl_sm_state_free(context->smstate);
+			/* smp is in back in EXPECT1 */
+		}
+	}
+	tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP_ABORT);
+	if (tlv) {
+	 	irc_usermsg(irc, "smp: received abort from %s", u->nick);
+		otrl_sm_state_free(context->smstate);
+		/* smp is in back in EXPECT1 */
+	}
+}
+
+/* helper to assert that account and protocol names given to ops below always
+   match the im_connection passed through as opdata */
+struct im_connection *check_imc(void *opdata, const char *accountname,
+	const char *protocol)
+{
+	struct im_connection *ic = (struct im_connection *)opdata;
+
+	if (strcmp(accountname, ic->acc->user) != 0) {
+		log_message(LOGLVL_WARNING,
+			"otr: internal account name mismatch: '%s' vs '%s'",
+			accountname, ic->acc->user);
+	}
+	if (strcmp(protocol, ic->acc->prpl->name) != 0) {
+		log_message(LOGLVL_WARNING,
+			"otr: internal protocol name mismatch: '%s' vs '%s'",
+			protocol, ic->acc->prpl->name);
+	}
+	
+	return ic;
+}
+
+const char *peernick(irc_t *irc, const char *handle, const char *protocol)
+{
+	user_t *u;
+	static char fallback[512];
+	
+	g_snprintf(fallback, 511, "%s/%s", handle, protocol);
+	for(u=irc->users; u; u=u->next) {
+		struct prpl *prpl;
+		if(!u->ic || !u->handle)
+			break;
+		prpl = u->ic->acc->prpl;
+		if(strcmp(prpl->name, protocol) == 0
+			&& prpl->handle_cmp(u->handle, handle) == 0) {
+			return u->nick;
+		}
+	}
+	
+	return fallback;
+}
+
+void show_fingerprints(irc_t *irc, ConnContext *ctx)
+{
+	char human[45];
+	Fingerprint *fp;
+	const char *trust;
+	int count=0;
+	
+	for(fp=&ctx->fingerprint_root; fp; fp=fp->next) {
+		if(!fp->fingerprint)
+			continue;
+		count++;
+		otrl_privkey_hash_to_human(human, fp->fingerprint);
+		if(!fp->trust || fp->trust[0] == '\0') {
+			trust="untrusted";
+		} else {
+			trust=fp->trust;
+		}
+		if(fp == ctx->active_fingerprint) {
+			irc_usermsg(irc, "\x02%s (%s)\x02", human, trust);
+		} else {
+			irc_usermsg(irc, "%s (%s)", human, trust);
+		}
+	}
+	if(count==0)
+		irc_usermsg(irc, "no fingerprints");
+}
+
+void otr_keygen(irc_t *irc, const char *handle, const char *protocol)
+{
+	GError *err;
+	GThread *thr;
+	struct kgdata *kg;
+	gint ev;
+	
+	irc_usermsg(irc, "generating new otr privkey for %s/%s...",
+		handle, protocol);
+	
+	kg = g_new0(struct kgdata, 1);
+	if(!kg) {
+		irc_usermsg(irc, "otr keygen failed: out of memory");
+		return;
+	}
+
+	/* Assemble the job description to be passed to thread and handler */
+	kg->irc = irc;
+	kg->keyfile = g_strdup_printf("%s%s.otr_keys", global.conf->configdir, kg->irc->nick);
+	if(!kg->keyfile) {
+		irc_usermsg(irc, "otr keygen failed: out of memory");
+		g_free(kg);
+		return;
+	}
+	kg->handle = handle;
+	kg->protocol = protocol;
+	kg->mutex = g_mutex_new();
+	if(!kg->mutex) {
+		irc_usermsg(irc, "otr keygen failed: couldn't create mutex");
+		g_free(kg->keyfile);
+		g_free(kg);
+		return;
+	}
+	kg->done = FALSE;
+
+	/* Poll for completion of the thread periodically. I would have preferred
+	   to just wait on a pipe but this way it's portable to Windows. *sigh*
+	*/
+	ev = b_timeout_add(1000, &keygen_finish_handler, kg);
+	if(!ev) {
+		irc_usermsg(irc, "otr keygen failed: couldn't register timeout");
+		g_free(kg->keyfile);
+		g_mutex_free(kg->mutex);
+		g_free(kg);
+		return;
+	}
+
+	thr = g_thread_create(&otr_keygen_thread_func, kg, FALSE, &err);
+	if(!thr) {
+		irc_usermsg(irc, "otr keygen failed: %s", err->message);
+		g_free(kg->keyfile);
+		g_mutex_free(kg->mutex);
+		g_free(kg);
+		b_event_remove(ev);
+	}
+}
+
+gpointer otr_keygen_thread_func(gpointer data)
+{
+	struct kgdata *kg = (struct kgdata *)data;
+	
+	/* lock OTR subsystem and do the work */
+	g_mutex_lock(kg->irc->otr_mutex);
+	kg->result = otrl_privkey_generate(kg->irc->otr_us, kg->keyfile, kg->handle,
+		kg->protocol);
+	g_mutex_unlock(kg->irc->otr_mutex);
+	/* OTR enabled again */
+	
+	/* notify mainloop */
+	g_mutex_lock(kg->mutex);
+	kg->done = TRUE;
+	g_mutex_unlock(kg->mutex);
+	
+	return NULL;
+}
+
+gboolean keygen_finish_handler(gpointer data, gint fd, b_input_condition cond)
+{
+	struct kgdata *kg = (struct kgdata *)data;
+	int done;
+	
+	g_mutex_lock(kg->mutex);
+	done = kg->done;
+	g_mutex_unlock(kg->mutex);
+	if(kg->done) {
+		if(kg->result) {
+			irc_usermsg(kg->irc, "otr keygen failed: libgcrypt error"); /* TODO: diagnostics */
+		} else {
+			irc_usermsg(kg->irc, "otr keygen for %s/%s complete", kg->handle, kg->protocol);
+		}
+		g_free(kg->keyfile);
+		g_mutex_free(kg->mutex);
+		g_free(kg);
+		return FALSE; /* unregister timeout */
+	}
+
+	return TRUE;  /* still working, continue checking */
+}
+
+void yes_keygen(gpointer w, void *data)
+{
+	account_t *acc = (account_t *)data;
+	
+	otr_keygen(acc->irc, acc->user, acc->prpl->name);
+}
+
+void no_keygen(gpointer w, void *data)
+{
+	account_t *acc = (account_t *)data;
+	
+	irc_usermsg(acc->irc, "proceeding without key, otr inoperable on %s/%s",
+		acc->user, acc->prpl->name);
+}
+
+
+#else /* WITH_OTR undefined */
+
+void cmd_otr(irc_t *irc, char **args)
+{
+	irc_usermsg(irc, "otr: n/a, compiled without OTR support");
+}
+
+#endif
diff --git a/otr.h b/otr.h
new file mode 100644
index 00000000..ef5453ef
--- /dev/null
+++ b/otr.h
@@ -0,0 +1,61 @@
+#ifndef BITLBEE_PROTOCOLS_OTR_H
+#define BITLBEE_PROTOCOLS_OTR_H
+
+#include "bitlbee.h"
+
+
+// forward decls to avoid mutual dependencies
+struct irc;
+struct im_connection;
+struct account;
+
+// 'otr' root command, hooked up in root_commands.c
+void cmd_otr(struct irc *, char **args);
+
+
+#ifdef WITH_OTR
+#include <libotr/proto.h>
+#include <libotr/message.h>
+#include <libotr/privkey.h>
+
+/* called from main() */
+void otr_init(void);
+
+/* called by storage_* functions */
+void otr_load(struct irc *irc);
+void otr_save(struct irc *irc);
+void otr_remove(const char *nick);
+void otr_rename(const char *onick, const char *nnick);
+
+/* called from account_add() */
+void otr_check_for_key(struct account *a);
+
+/* called from imcb_buddy_msg() */
+char *otr_handle_message(struct im_connection *ic, const char *handle,
+	const char *msg);
+	
+/* called from imc_buddy_msg() */
+int otr_send_message(struct im_connection *ic, const char *handle, const char *msg,
+	int flags);
+
+#else
+
+typedef void *OtrlUserState;
+typedef void *OtrlMessageAppOps;
+
+#define otrl_userstate_create() (NULL)
+#define otrl_userstate_free(us) {}
+
+#define otr_init() {}
+#define otr_load(irc) {}
+#define otr_save(irc) {}
+#define otr_remove(nick) {}
+#define otr_rename(onick,nnick) {}
+#define otr_check_for_key(acc) {}
+#define otr_handle_msg(ic,handle,msg) (g_strdup(msg))
+#define otr_send_message(ic,h,m,f) (ic->acc->prpl->buddy_msg(ic,h,m,f))
+
+void cmd_otr_nosupport(void *, char **);
+
+#endif
+#endif
diff --git a/protocols/nogaim.c b/protocols/nogaim.c
index 3ce15166..d8bfad14 100644
--- a/protocols/nogaim.c
+++ b/protocols/nogaim.c
@@ -629,9 +629,15 @@ void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t
 	irc_t *irc = ic->irc;
 	char *wrapped;
 	user_t *u;
-	
+
+	/* pass the message through OTR */
+	msg = otr_handle_message(ic, handle, msg);
+	if(!msg) {
+		/* this was an internal OTR protocol message */
+		return;
+	}
+
 	u = user_findhandle( ic, handle );
-	
 	if( !u )
 	{
 		char *h = set_getstr( &irc->set, "handle_unknown" );
@@ -641,6 +647,7 @@ void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t
 			if( set_getbool( &irc->set, "debug" ) )
 				imcb_log( ic, "Ignoring message from unknown handle %s", handle );
 			
+			g_free(msg);
 			return;
 		}
 		else if( g_strncasecmp( h, "add", 3 ) == 0 )
@@ -673,6 +680,7 @@ void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t
 	wrapped = word_wrap( msg, 425 );
 	irc_msgfrom( irc, u->nick, wrapped );
 	g_free( wrapped );
+	g_free( msg );
 }
 
 void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
@@ -990,10 +998,11 @@ int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags
 		buf = escape_html( msg );
 		msg = buf;
 	}
+
+	/* if compiled without otr support, this just calls the prpl buddy_msg */
+	st = otr_send_message(ic, handle, msg, flags);
 	
-	st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
-	g_free( buf );
-	
+	g_free(buf);
 	return st;
 }
 
diff --git a/root_commands.c b/root_commands.c
index 26a42a25..61bb5da9 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -28,6 +28,7 @@
 #include "crypting.h"
 #include "bitlbee.h"
 #include "help.h"
+#include "otr.h"
 
 #include <string.h>
 
@@ -84,19 +85,27 @@ void root_command( irc_t *irc, char *cmd[] )
 	if( !cmd[0] )
 		return;
 	
+	if(!g_mutex_trylock(irc->otr_mutex)) {
+		irc_usermsg(irc, "keygen in progress, bitlbee comatose - please wait");
+		return;
+	}
+	
 	for( i = 0; commands[i].command; i++ )
 		if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
 		{
 			if( !cmd[commands[i].required_parameters] )
 			{
 				irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
+				g_mutex_unlock(irc->otr_mutex);
 				return;
 			}
 			commands[i].execute( irc, cmd );
+			g_mutex_unlock(irc->otr_mutex);
 			return;
 		}
 	
 	irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
+	g_mutex_unlock(irc->otr_mutex);
 }
 
 static void cmd_help( irc_t *irc, char **cmd )
@@ -240,6 +249,8 @@ static void cmd_account( irc_t *irc, char **cmd )
 		}
 		
 		irc_usermsg( irc, "Account successfully added" );
+		
+		otr_check_for_key(a);
 	}
 	else if( g_strcasecmp( cmd[1], "del" ) == 0 )
 	{
@@ -990,5 +1001,6 @@ const command_t commands[] = {
 	{ "nick",           1, cmd_nick,           0 },
 	{ "qlist",          0, cmd_qlist,          0 },
 	{ "join_chat",      2, cmd_join_chat,      0 },
+	{ "otr",            1, cmd_otr,            0 },	
 	{ NULL }
 };
diff --git a/storage.c b/storage.c
index 06044f80..6a62af83 100644
--- a/storage.c
+++ b/storage.c
@@ -28,6 +28,7 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
 #include "crypting.h"
+#include "otr.h"
 
 extern storage_t storage_text;
 extern storage_t storage_xml;
@@ -114,11 +115,13 @@ storage_status_t storage_load (const char *nick, const char *password, irc_t * i
 		status = st->load(nick, password, irc);
 		if (status == STORAGE_OK) {
 			irc_setpass(irc, password);
+			otr_load(irc);		/* load our OTR userstate */
 			return status;
 		}
 		
-		if (status != STORAGE_NO_SUCH_USER) 
+		if (status != STORAGE_NO_SUCH_USER) {
 			return status;
+		}
 	}
 	
 	return STORAGE_NO_SUCH_USER;
@@ -126,7 +129,11 @@ storage_status_t storage_load (const char *nick, const char *password, irc_t * i
 
 storage_status_t storage_save (irc_t *irc, int overwrite)
 {
-	return ((storage_t *)global.storage->data)->save(irc, overwrite);
+	storage_status_t st;
+	
+	otr_save(irc);
+	st = ((storage_t *)global.storage->data)->save(irc, overwrite);
+	return st;
 }
 
 storage_status_t storage_remove (const char *nick, const char *password)
@@ -146,6 +153,9 @@ storage_status_t storage_remove (const char *nick, const char *password)
 			status != STORAGE_OK)
 			ret = status;
 	}
+	if (ret == STORAGE_OK) {
+		otr_remove(nick);
+	}
 	
 	return ret;
 }
@@ -156,12 +166,14 @@ storage_status_t storage_rename (const char *onick, const char *nnick, const cha
 	GList *gl = global.storage;
 	storage_t *primary_storage = gl->data;
 	irc_t *irc;
-
+	
 	/* First, try to rename in the current write backend, assuming onick 
 	 * is stored there */
 	status = primary_storage->rename(onick, nnick, password);
-	if (status != STORAGE_NO_SUCH_USER)
+	if (status != STORAGE_NO_SUCH_USER) {
+		otr_rename(onick, nnick);
 		return status;
+	}
 
 	/* Try to load from a migration backend and save to the current backend. 
 	 * Explicitly remove the account from the migration backend as otherwise 
@@ -185,6 +197,7 @@ storage_status_t storage_rename (const char *onick, const char *nnick, const cha
 	irc_free(irc);
 
 	storage_remove(onick, password);
+	otr_rename(onick, nnick);
 
 	return STORAGE_OK;
 }
diff --git a/unix.c b/unix.c
index 0aaf505a..63ef7fae 100644
--- a/unix.c
+++ b/unix.c
@@ -26,6 +26,7 @@
 #include "bitlbee.h"
 #include "commands.h"
 #include "crypting.h"
+#include "otr.h"
 #include "protocols/nogaim.h"
 #include "help.h"
 #include "ipc.h"
@@ -53,6 +54,7 @@ int main( int argc, char *argv[], char **envp )
 	
 	b_main_init();
 	nogaim_init();
+	otr_init();
 	
 	srand( time( NULL ) ^ getpid() );
 	global.helpfile = g_strdup( HELP_FILE );
diff --git a/user.c b/user.c
index 26676dd4..4d58f56b 100644
--- a/user.c
+++ b/user.c
@@ -140,7 +140,7 @@ user_t *user_find( irc_t *irc, char *nick )
 		return( NULL );
 }
 
-user_t *user_findhandle( struct im_connection *ic, char *handle )
+user_t *user_findhandle( struct im_connection *ic, const char *handle )
 {
 	user_t *u;
 	char *nick;
diff --git a/user.h b/user.h
index c6b933bc..9d8a41a0 100644
--- a/user.h
+++ b/user.h
@@ -55,7 +55,7 @@ typedef struct __USER
 user_t *user_add( struct irc *irc, char *nick );
 int user_del( irc_t *irc, char *nick );
 G_MODULE_EXPORT user_t *user_find( irc_t *irc, char *nick );
-G_MODULE_EXPORT user_t *user_findhandle( struct im_connection *ic, char *handle );
+G_MODULE_EXPORT user_t *user_findhandle( struct im_connection *ic, const char *handle );
 void user_rename( irc_t *irc, char *oldnick, char *newnick );
 
 #endif /* __USER_H__ */