Changeset 5d62040

Timestamp:

2008-02-10T21:12:13Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

5bf5edf

Parents:

94e7eb3

Message:

remove cleartext fallbacks during keygen

File:

• otr.c (modified) (2 diffs)

otr.c

@@ -257 +257 @@
         
     if(!g_mutex_trylock(ic->irc->otr_mutex)) {
-        user_t *u = user_findhandle(ic, handle);
-        
-        /* fallback for non-otr clients */
-        if(u && !u->encrypted) {
-                return g_strdup(msg);
-        }
-        
-        /* TODO: queue msgs received during keygen for later? */
-                irc_usermsg(ic->irc, "otr msg from %s during keygen - dropped",
+                irc_usermsg(ic->irc, "otr keygen in progress - msg from %s dropped",
                         peernick(ic->irc, handle, ic->acc->prpl->name));
                 return NULL;
@@ -313 +305 @@
         
     if(!g_mutex_trylock(ic->irc->otr_mutex)) {
-                user_t *u = user_findhandle(ic, handle);
-        
-                /* Fallback for non-otr clients.
-                   Yes, we must be very sure this doesn't send stuff in the clear where it
-                   shouldn't... */
-                if(u && !u->encrypted) {
-                        return ic->acc->prpl->buddy_msg(ic, (char *)handle, (char *)msg, flags);
-                }
-                
-                /* otherwise refuse to send */
-                irc_usermsg(ic->irc, "otr msg to %s not sent during keygen",
+                irc_usermsg(ic->irc, "otr keygen in progress - msg to %s not sent",
                         peernick(ic->irc, handle, ic->acc->prpl->name));
                 return 1;