Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
arlolra committed Jan 21, 2014
1 parent d75d9a7 commit 784d12f
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "otr",
"version": "0.2.8",
"version": "0.2.9",
"main": "build/otr.js",
"ignore": [
"**/.*",
Expand Down
7 changes: 0 additions & 7 deletions build/dep/bigint.js
Original file line number Diff line number Diff line change
Expand Up @@ -1680,25 +1680,18 @@
, equalsInt : equalsInt
, sub : sub
, mod : mod
, mod_ : mod_
, modInt : modInt
, mult : mult
, divInt_ : divInt_
, rightShift_ : rightShift_
, leftShift_ : leftShift_
, dup : dup
, greater : greater
, add : add
, addInt : addInt
, addInt_ : addInt_
, isZero : isZero
, bitSize : bitSize
, randTruePrime : randTruePrime
, millerRabin : millerRabin
, divide_ : divide_
, trim : trim
, expand : expand
, bpe : bpe
, primes : primes
, findPrimes : findPrimes
, getSeed : getSeed
Expand Down
20 changes: 11 additions & 9 deletions build/otr.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
otr.js v0.2.8 - 2013-11-11
(c) 2013 - Arlo Breault <[email protected]>
otr.js v0.2.9 - 2014-01-21
(c) 2014 - Arlo Breault <[email protected]>
Freely distributed under the MPL v2.0 license.
This file is concatenated for the browser.
Expand Down Expand Up @@ -1163,17 +1163,19 @@
if (BigInt.equals(this.their_y, this.our_dh.publicKey))
return this.otr.error('equal keys - we have a problem.', true)

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

// our keys
this.otr.our_old_dh = this.our_dh
if (!(
(this.their_keyid === this.otr.their_keyid &&
BigInt.equals(this.their_y, this.otr.their_y)) ||
(this.their_keyid === (this.otr.their_keyid - 1) &&
BigInt.equals(this.their_y, this.otr.their_old_y))
)) {

// their keys
this.otr.their_y = this.their_y
this.otr.their_old_y = null
this.otr.their_keyid = this.their_keyid
this.otr.their_priv_pk = this.their_priv_pk

// rotate keys
this.otr.sessKeys[0] = [ new this.otr.DHSession(
Expand Down Expand Up @@ -2486,7 +2488,7 @@
this.doAKE(msg)
}

if (msg.msg) this.trigger('ui', [msg.msg, msg.encrypted])
if (msg.msg) this.trigger('ui', [msg.msg, !!msg.encrypted])
}

OTR.prototype.checkInstanceTags = function (it) {
Expand Down
8 changes: 4 additions & 4 deletions build/otr.min.js

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@

0.2.9 / 2014-01-21
==================

* coerce "is encrypted" var to boolean
* check DH pubkey equality before skipping key replacement
* remove unused exports from bigint

0.2.8 / 2013-11-11
==================

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "otr",
"version": "0.2.8",
"version": "0.2.9",
"description": "Off-the-Record Messaging Protocol",
"homepage": "https://github.com/arlolra/otr",
"main": "index.js",
Expand Down

0 comments on commit 784d12f

Please sign in to comment.