Fix protocol version check

Fixes #392 // FREEBIE
10 years ago · 596188a630
parent 16dc7abe69
commit 596188a630
2 changed files with 8 additions and 4 deletions
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@ -37873,8 +37873,10 @@ axolotlInternal.RecipientRecord = function() {
        },
        handlePreKeyWhisperMessage: function(from, blob) {
            blob.mark();
-            if (blob.readUint8() != ((3 << 4) | 3)) {
-                throw new Error("Bad version byte");
+            var version = blob.readUint8();
+            if ((version & 0xF) > 3 || (version >> 4) < 3) {
+                // min version > 3 or max version < 3
+                throw new Error("Incompatible version byte");
            }
            return axolotlInstance.handlePreKeyWhisperMessage(from, blob).catch(function(e) {
                if (e.message === 'Unknown identity key') {
--- a/libtextsecure/axolotl_wrapper.js
+++ b/libtextsecure/axolotl_wrapper.js
@ -37,8 +37,10 @@
        },
        handlePreKeyWhisperMessage: function(from, blob) {
            blob.mark();
-            if (blob.readUint8() != ((3 << 4) | 3)) {
-                throw new Error("Bad version byte");
+            var version = blob.readUint8();
+            if ((version & 0xF) > 3 || (version >> 4) < 3) {
+                // min version > 3 or max version < 3
+                throw new Error("Incompatible version byte");
            }
            return axolotlInstance.handlePreKeyWhisperMessage(from, blob).catch(function(e) {
                if (e.message === 'Unknown identity key') {