Changeset 88de0c9

Timestamp:

2010-10-02T05:28:43Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3ad8036, 8e9e2b7

Parents:

560129a (diff), faa75c0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging some more fixes (dealing with incoming smpq stuff).

File:

• otr.c (modified) (9 diffs)

otr.c

@@ -8 +8 @@
   OTR support (cf. http://www.cypherpunks.ca/otr/)
   
-  2008, Sven Moritz Hallberg <pesco@khjk.org>
-  (c) and funded by stonedcoder.org
+  (c) 2008-2010 Sven Moritz Hallberg <pesco@khjk.org>
+  (c) 2008 funded by stonedcoder.org
     
   files used to store OTR data:
@@ -158 +158 @@
 
 /* combined handler for the 'otr smp' and 'otr smpq' commands */
-void otr_initiate_smp(irc_t *irc, const char *nick, const char *question,
+void otr_smp_or_smpq(irc_t *irc, const char *nick, const char *question,
                 const char *secret);
 
@@ -738 +738 @@
 void cmd_otr_smp(irc_t *irc, char **args)
 {
-        otr_initiate_smp(irc, args[1], NULL, args[2]);  /* no question */
+        otr_smp_or_smpq(irc, args[1], NULL, args[2]);   /* no question */
 }
 
 void cmd_otr_smpq(irc_t *irc, char **args)
 {
-        otr_initiate_smp(irc, args[1], args[2], args[3]);
+        otr_smp_or_smpq(irc, args[1], args[2], args[3]);
 }
 
@@ -1074 +1074 @@
         nextMsg = context->smstate->nextExpected;
 
+        if (context->smstate->sm_prog_state == OTRL_SMP_PROG_CHEATED) {
+                irc_usermsg(irc, "smp %s: opponent violated protocol, aborting",
+                        u->nick);
+                otrl_message_abort_smp(us, ops, u->bu->ic, context);
+                otrl_sm_state_free(context->smstate);
+                return;
+        }
+
         tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP1Q);
         if (tlv) {
@@ -1082 +1090 @@
                 } else {
                         char *question = g_strndup((char *)tlv->data, tlv->len);
-                        irc_usermsg(irc, "smp: initiated by %s with question: \"%s\"", u->nick,
+                        irc_usermsg(irc, "smp: initiated by %s with question: \x02\"%s\"\x02", u->nick,
                                 question);
                         irc_usermsg(irc, "smp: respond with \x02otr smp %s <answer>\x02",
@@ -1122 +1130 @@
                 } 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",
+                        /* as noted above, fp trust SHOULD have been set by libotr.
+                         * however at least version 3.2.0 seems to forget it when
+                         * responding to an smp session that was initiated with SMP1Q
+                         * (question and answer); other cases appear to work fine.
+                         * as a workaround, we explicitly set it below.
+                         */ 
+                        if(context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
+                                otrl_context_set_trust(context->active_fingerprint, "smp");
+                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
                                         u->nick);
                         } else {
-                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                otrl_context_set_trust(context->active_fingerprint, "");
+                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
                                         u->nick);
                         }
@@ -1142 +1157 @@
                 } 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",
+                        if(context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
+                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
                                         u->nick);
                         } else {
-                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
                                         u->nick);
                         }
@@ -1163 +1177 @@
 
 /* combined handler for the 'otr smp' and 'otr smpq' commands */
-void otr_initiate_smp(irc_t *irc, const char *nick, const char *question,
+void otr_smp_or_smpq(irc_t *irc, const char *nick, const char *question,
                 const char *secret)
 {
@@ -1194 +1208 @@
                 otrl_sm_state_free(ctx->smstate);
         }
-        
+
         if(question) {
                 /* this was 'otr smpq', just initiate */