Send type 2 TLV when no question is supplied

* Closes #58
arlolra · Oct 15, 2014 · 64c635f · 64c635f
1 parent be50ec3
commit 64c635f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/lib/otr.js b/lib/otr.js
@@ -526,7 +526,8 @@
 
     // utf8 inputs
     secret = CryptoJS.enc.Utf8.parse(secret).toString(CryptoJS.enc.Latin1)
-    question = CryptoJS.enc.Utf8.parse(question).toString(CryptoJS.enc.Latin1)
+    if (question)
+      question = CryptoJS.enc.Utf8.parse(question).toString(CryptoJS.enc.Latin1)
 
     this.sm.rcvSecret(secret, question)
   }

diff --git a/lib/sm.js b/lib/sm.js
@@ -170,10 +170,12 @@
 
         this.smpstate = CONST.SMPSTATE_EXPECT0
 
-        // assume utf8 question
-        question = CryptoJS.enc.Latin1
-          .parse(question)
-          .toString(CryptoJS.enc.Utf8)
+        if (question) {
+          // assume utf8 question
+          question = CryptoJS.enc.Latin1
+            .parse(question)
+            .toString(CryptoJS.enc.Utf8)
+        }
 
         // invoke question
         this.trigger('question', [question])

diff --git a/test/spec/unit/otr.js b/test/spec/unit/otr.js
@@ -693,6 +693,7 @@ describe('OTR', function () {
   })
 
   it('should check for DH pubkey equality before skipping key replacement', function (done) {
+    this.timeout(5000)
     // issue #47
 
     var err = function (err) { assert.ifError(err) }