Changeset 944d7a5

Timestamp:

2010-10-01T21:36:44Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

faa75c0e

Parents:

f26db4a8

Message:

libotr forgets to set trust when responding to smpq

File:

• otr.c (modified) (3 diffs)

otr.c

@@ -1130 +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);
                         }
@@ -1150 +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);
                         }
@@ -1202 +1208 @@
                 otrl_sm_state_free(ctx->smstate);
         }
-        
+
         if(question) {
                 /* this was 'otr smpq', just initiate */