0.5.4

Fixes #8

crypto_shorthash.js

@@ -5,13 +5,8 @@ exports.crypto_shorthash_BYTES = siphash.BYTES
 exports.crypto_shorthash_KEYBYTES = siphash.KEYBYTES
 exports.crypto_shorthash_WASM_SUPPORTED = siphash.WASM_SUPPORTED
 exports.crypto_shorthash_WASM_LOADED = siphash.WASM_LOADED
-exports.crypto_shorthash_ready = siphash.ready
 exports.crypto_shorthash = shorthash
 
-siphash.ready(function () {
-  exports.crypto_shorthash_WASM_LOADED = siphash.WASM_LOADED
-})
-
 function shorthash (out, data, key, noAssert) {
   siphash(data, key, out, noAssert)
 }

index.js

@@ -1601,7 +1601,7 @@ function crypto_sign(sm, m, sk) {
 function crypto_sign_detached(sig, m, sk) {
   var sm = new Uint8Array(m.length + crypto_sign_BYTES)
   crypto_sign(sm, m, sk)
-  for (var i = 0; i < 32; i++) sig[i] = sm[i]
+  for (var i = 0; i < crypto_sign_BYTES; i++) sig[i] = sm[i]
 }
 
 function unpackneg(r, p) {
@@ -1682,11 +1682,11 @@ function crypto_sign_open(msg, sm, pk) {
 
 function crypto_sign_verify_detached (sig, m, pk) {
   check(sig, crypto_sign_BYTES)
-  var sm = new Uint8Array(m.length + sig.length)
+  var sm = new Uint8Array(m.length + crypto_sign_BYTES)
   var i = 0
-  for (i = 0; i < 64; i++) sm[i] = m[i]
+  for (i = 0; i < crypto_sign_BYTES; i++) sm[i] = sig[i]
-  for (i = 0; i < m.length; i++) sm[i + 64] = m[i]
+  for (i = 0; i < m.length; i++) sm[i + crypto_sign_BYTES] = m[i]
-  return crypto_sign_open(sm, m, pk)
+  return crypto_sign_open(m, sm, pk)
 }
 
 function crypto_secretbox_detached (o, mac, msg, n, k) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sodium-javascript",
-  "version": "0.5.0",
+  "version": "0.5.4",
   "description": "WIP - a pure javascript version of sodium-native",
   "main": "index.js",
   "dependencies": {
@@ -12,7 +12,10 @@
   "devDependencies": {
     "browser-run": "^4.0.2",
     "browserify": "^14.1.0",
-    "sodium-test": "^0.6.0"
+    "sodium-test": "^0.7.0"
+  },
+  "browser": {
+    "crypto": false
   },
   "scripts": {
     "browser": "browserify test.js | browser-run",

randombytes.js

@@ -1,9 +1,9 @@
 var assert = require('nanoassert')
 var randombytes = (function () {
   var QUOTA = 65536 // limit for QuotaExceededException
-  var crypto = typeof window !== 'undefined' ? (window.crypto || window.msCrypto) : null
+  var crypto = typeof global !== 'undefined' ? crypto = (global.crypto || global.msCrypto) : null
 
-  function windowBytes (out, n) {
+  function browserBytes (out, n) {
     for (var i = 0; i < n; i += QUOTA) {
       crypto.getRandomValues(out.subarray(i, i + Math.min(n - i, QUOTA)))
     }
@@ -18,10 +18,10 @@ var randombytes = (function () {
   }
 
   if (crypto && crypto.getRandomValues) {
-    return windowBytes
+    return browserBytes
   } else if (typeof require !== 'undefined') {
     // Node.js.
-    crypto = require('cry' + 'pto');
+    crypto = require('crypto')
     if (crypto && crypto.randomBytes) {
       return nodeBytes
     }