Changeset 508588a for otr.c

Timestamp:

2010-10-07T06:32:06Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

27b407f

Parents:

25b5a4a (diff), 3ad8036 (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 smpq fix from pesco.

File:

• otr.c (modified) (1 diff)

otr.c

@@ -1129 +1129 @@
                         otrl_sm_state_free(context->smstate);
                 } else {
-                        /* SMP3 received, otrl_message_receiving will have sent SMP4 and set fp trust */
-                        /* 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.
-                         */ 
+                        /* SMP3 received, otrl_message_receiving will have sent SMP4 */
                         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);
+                                if(context->smstate->received_question) {
+                                        irc_usermsg(irc, "smp %s: correct answer, you are trusted",
+                                                u->nick);
+                                } else {
+                                        irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                                u->nick);
+                                }
                         } else {
-                                otrl_context_set_trust(context->active_fingerprint, "");
-                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
-                                        u->nick);
+                                if(context->smstate->received_question) {
+                                        irc_usermsg(irc, "smp %s: wrong answer, you are not trusted",
+                                                u->nick);
+                                } else {
+                                        irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+                                                u->nick);
+                                }
                         }
                         otrl_sm_state_free(context->smstate);