bump version

Author: arlolra

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "otr",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "main": "build/otr.js",
   "ignore": [
     "**/.*",

build/dsa-webworker.js

@@ -3,11 +3,16 @@
 
   root.OTR = {}
   root.DSA = {}
-  root.crypto = {
-    randomBytes: function () {
-      throw new Error("Haven't seeded yet.")
+
+  var hasCrypto = false
+  if (root.crypto)
+    hasCrypto = true
+  else
+    root.crypto = {
+      randomBytes: function () {
+        throw new Error("Haven't seeded yet.")
+      }
     }
-  }
 
   // default imports
   var imports = [
@@ -30,10 +35,12 @@
     if (data.imports) imports = data.imports
     importScripts.apply(root, imports);
 
-    // use salsa20 since there's no prng in webworkers
-    var state = new root.Salsa20(data.seed.slice(0, 32), data.seed.slice(32))
-    root.crypto.randomBytes = function (n) {
-      return state.getBytes(n)
+    if (!hasCrypto) {
+      // use salsa20 when there's no prng in webworkers
+      var state = new root.Salsa20(data.seed.slice(0, 32), data.seed.slice(32))
+      root.crypto.randomBytes = function (n) {
+        return state.getBytes(n)
+      }
     }
 
     if (data.debug) sendMsg('debug', 'DSA key creation started')

build/otr.js

@@ -1,8 +1,8 @@
 /*!
 
-  otr.js v0.2.15 - 2015-05-04
+  otr.js v0.2.16 - 2015-12-03
   (c) 2015 - Arlo Breault <[email protected]>
-  Freely distributed under the MPL v2.0 license.
+  Freely distributed under the MPL-2.0 license.
 
   This file is concatenated for the browser.
   Please see: https://github.com/arlolra/otr

build/otr.min.js

@@ -2,11 +2,16 @@
   "use strict";
 
   root.OTR = {}
-  root.crypto = {
-    randomBytes: function () {
-      throw new Error("Haven't seeded yet.")
+
+  var hasCrypto = false
+  if (root.crypto)
+    hasCrypto = true
+  else
+    root.crypto = {
+      randomBytes: function () {
+        throw new Error("Haven't seeded yet.")
+      }
     }
-  }
 
   // default imports
   var imports = [
@@ -36,7 +41,10 @@
         if (data.imports) imports = data.imports
         importScripts.apply(root, imports)
 
-        // use salsa20 since there's no prng in webworkers
+        if (hasCrypto)
+          break
+
+        // use salsa20 when there's no prng in webworkers
         var state = new root.Salsa20(
           data.seed.slice(0, 32),
           data.seed.slice(32)

build/sm-webworker.js

@@ -1,4 +1,10 @@
 
+0.2.16 / 2015-12-03
+===================
+
+  * handle already defined crypto object in webworker
+  * cleanup the readme
+
 0.2.15 / 2015-05-04
 ===================
 

changelog.md

@@ -1,6 +1,6 @@
 {
   "name": "otr",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Off-the-Record Messaging Protocol",
   "homepage": "https://github.com/arlolra/otr",
   "main": "index.js",
@@ -38,7 +38,8 @@
     "Nadim Kobeissi <[email protected]>",
     "Klaus Herberth <[email protected]>",
     "JC Brand <[email protected]>",
-    "Mark Vayngrib <[email protected]>"
+    "Mark Vayngrib <[email protected]>",
+    "Jérémie Astori <[email protected]>"
   ],
   "license": "MPL-2.0"
 }