Skip to content

Commit 784d12f

Browse files
committed
bump version
1 parent d75d9a7 commit 784d12f

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "otr",
3-
"version": "0.2.8",
3+
"version": "0.2.9",
44
"main": "build/otr.js",
55
"ignore": [
66
"**/.*",

build/dep/bigint.js

-7
Original file line numberDiff line numberDiff line change
@@ -1680,25 +1680,18 @@
16801680
, equalsInt : equalsInt
16811681
, sub : sub
16821682
, mod : mod
1683-
, mod_ : mod_
16841683
, modInt : modInt
16851684
, mult : mult
16861685
, divInt_ : divInt_
16871686
, rightShift_ : rightShift_
1688-
, leftShift_ : leftShift_
16891687
, dup : dup
16901688
, greater : greater
16911689
, add : add
1692-
, addInt : addInt
1693-
, addInt_ : addInt_
16941690
, isZero : isZero
16951691
, bitSize : bitSize
1696-
, randTruePrime : randTruePrime
16971692
, millerRabin : millerRabin
16981693
, divide_ : divide_
16991694
, trim : trim
1700-
, expand : expand
1701-
, bpe : bpe
17021695
, primes : primes
17031696
, findPrimes : findPrimes
17041697
, getSeed : getSeed

build/otr.js

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
3-
otr.js v0.2.8 - 2013-11-11
4-
(c) 2013 - Arlo Breault <[email protected]>
3+
otr.js v0.2.9 - 2014-01-21
4+
(c) 2014 - Arlo Breault <[email protected]>
55
Freely distributed under the MPL v2.0 license.
66
77
This file is concatenated for the browser.
@@ -1163,17 +1163,19 @@
11631163
if (BigInt.equals(this.their_y, this.our_dh.publicKey))
11641164
return this.otr.error('equal keys - we have a problem.', true)
11651165

1166-
if ( this.their_keyid !== this.otr.their_keyid &&
1167-
this.their_keyid !== (this.otr.their_keyid - 1) ) {
1166+
this.otr.our_old_dh = this.our_dh
1167+
this.otr.their_priv_pk = this.their_priv_pk
11681168

1169-
// our keys
1170-
this.otr.our_old_dh = this.our_dh
1169+
if (!(
1170+
(this.their_keyid === this.otr.their_keyid &&
1171+
BigInt.equals(this.their_y, this.otr.their_y)) ||
1172+
(this.their_keyid === (this.otr.their_keyid - 1) &&
1173+
BigInt.equals(this.their_y, this.otr.their_old_y))
1174+
)) {
11711175

1172-
// their keys
11731176
this.otr.their_y = this.their_y
11741177
this.otr.their_old_y = null
11751178
this.otr.their_keyid = this.their_keyid
1176-
this.otr.their_priv_pk = this.their_priv_pk
11771179

11781180
// rotate keys
11791181
this.otr.sessKeys[0] = [ new this.otr.DHSession(
@@ -2486,7 +2488,7 @@
24862488
this.doAKE(msg)
24872489
}
24882490

2489-
if (msg.msg) this.trigger('ui', [msg.msg, msg.encrypted])
2491+
if (msg.msg) this.trigger('ui', [msg.msg, !!msg.encrypted])
24902492
}
24912493

24922494
OTR.prototype.checkInstanceTags = function (it) {

build/otr.min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

changelog.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
0.2.9 / 2014-01-21
3+
==================
4+
5+
* coerce "is encrypted" var to boolean
6+
* check DH pubkey equality before skipping key replacement
7+
* remove unused exports from bigint
8+
29
0.2.8 / 2013-11-11
310
==================
411

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "otr",
3-
"version": "0.2.8",
3+
"version": "0.2.9",
44
"description": "Off-the-Record Messaging Protocol",
55
"homepage": "https://github.com/arlolra/otr",
66
"main": "index.js",

0 commit comments

Comments
 (0)