From ccca2aa616871b33c7bbd08c5274b97af2862756 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra@gmail.com>
Date: Thu, 1 Oct 2015 11:16:42 +0200
Subject: [PATCH] otr: smpFailureError processing tlvTypeSMP3 prevents sending
 tlvTypeSMP4

 * The other side is left hanging, waiting for their chance to do the
   comparison.

Change-Id: I186933ebb53a30e190414c5572206851681e0a37
Reviewed-on: https://go-review.googlesource.com/15260
Reviewed-by: Adam Langley <agl@golang.org>
---
 otr/otr.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/otr/otr.go b/otr/otr.go
index 0d18a60..f872a9d 100644
--- a/otr/otr.go
+++ b/otr/otr.go
@@ -417,12 +417,11 @@ func (c *Conversation) Receive(in []byte) (out []byte, encrypted bool, change Se
 					change = SMPSecretNeeded
 					c.smp.saved = &inTLV
 					return
-				} else if err == smpFailureError {
+				}
+				if err == smpFailureError {
 					err = nil
 					change = SMPFailed
-					return
-				}
-				if complete {
+				} else if complete {
 					change = SMPComplete
 				}
 				if reply.typ != 0 {