Changeset 5d62040 for otr.c


Ignore:
Timestamp:
2008-02-10T21:12:13Z (13 years ago)
Author:
Sven Moritz Hallberg <sm@…>
Branches:
master
Children:
5bf5edf
Parents:
94e7eb3
Message:

remove cleartext fallbacks during keygen

File:
1 edited

Legend:

Unmodified
Added
Removed
  • otr.c

    r94e7eb3 r5d62040  
    257257       
    258258    if(!g_mutex_trylock(ic->irc->otr_mutex)) {
    259         user_t *u = user_findhandle(ic, handle);
    260        
    261         /* fallback for non-otr clients */
    262         if(u && !u->encrypted) {
    263                 return g_strdup(msg);
    264         }
    265        
    266         /* TODO: queue msgs received during keygen for later? */
    267                 irc_usermsg(ic->irc, "otr msg from %s during keygen - dropped",
     259                irc_usermsg(ic->irc, "otr keygen in progress - msg from %s dropped",
    268260                        peernick(ic->irc, handle, ic->acc->prpl->name));
    269261                return NULL;
     
    313305       
    314306    if(!g_mutex_trylock(ic->irc->otr_mutex)) {
    315                 user_t *u = user_findhandle(ic, handle);
    316        
    317                 /* Fallback for non-otr clients.
    318                    Yes, we must be very sure this doesn't send stuff in the clear where it
    319                    shouldn't... */
    320                 if(u && !u->encrypted) {
    321                         return ic->acc->prpl->buddy_msg(ic, (char *)handle, (char *)msg, flags);
    322                 }
    323                
    324                 /* otherwise refuse to send */
    325                 irc_usermsg(ic->irc, "otr msg to %s not sent during keygen",
     307                irc_usermsg(ic->irc, "otr keygen in progress - msg to %s not sent",
    326308                        peernick(ic->irc, handle, ic->acc->prpl->name));
    327309                return 1;
Note: See TracChangeset for help on using the changeset viewer.