Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
arlolra committed Feb 4, 2014
1 parent 4a75529 commit c4126e9
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "otr",
"version": "0.2.9",
"version": "0.2.10",
"main": "build/otr.js",
"ignore": [
"**/.*",
Expand Down
14 changes: 12 additions & 2 deletions build/otr.js
@@ -1,6 +1,6 @@
/*!
otr.js v0.2.9 - 2014-01-21
otr.js v0.2.10 - 2014-02-04
(c) 2014 - Arlo Breault <arlolra@gmail.com>
Freely distributed under the MPL v2.0 license.
Expand Down Expand Up @@ -1501,7 +1501,7 @@
sha256.update(CryptoJS.enc.Hex.parse(our ? this.our_fp : this.their_fp))
sha256.update(CryptoJS.enc.Hex.parse(our ? this.their_fp : this.our_fp))
sha256.update(CryptoJS.enc.Latin1.parse(this.ssid))
sha256.update(CryptoJS.enc.Latin1.parse(secret)) // utf8?
sha256.update(CryptoJS.enc.Latin1.parse(secret))
var hash = sha256.finalize()
this.secret = HLP.bits2bigInt(hash.toString(CryptoJS.enc.Latin1))
}
Expand Down Expand Up @@ -1610,6 +1610,11 @@

this.smpstate = CONST.SMPSTATE_EXPECT0

// assume utf8 question
question = CryptoJS.enc.Latin1
.parse(question)
.toString(CryptoJS.enc.Utf8)

// invoke question
this.trigger('question', [question])
return
Expand Down Expand Up @@ -2381,6 +2386,11 @@
return this.error('Secret is required.')

if (!this.sm) this._smInit()

// utf8 inputs
secret = CryptoJS.enc.Utf8.parse(secret).toString(CryptoJS.enc.Latin1)
question = CryptoJS.enc.Utf8.parse(question).toString(CryptoJS.enc.Latin1)

this.sm.rcvSecret(secret, question)
}

Expand Down
6 changes: 3 additions & 3 deletions build/otr.min.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions changelog.md
@@ -1,4 +1,9 @@

0.2.10 / 2014-02-04
==================

* assume utf8 inputs for smp

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

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

0 comments on commit c4126e9

Please sign in to comment.