0.3.1

crypto_generichash.js

@@ -1,4 +1,3 @@
-var assert = require('assert')
 var blake2b = require('blake2b')
 
 module.exports.crypto_generichash_PRIMITIVE = 'blake2b'
@@ -8,13 +7,17 @@ module.exports.crypto_generichash_BYTES = blake2b.BYTES
 module.exports.crypto_generichash_KEYBYTES_MIN = blake2b.KEYBYTES_MIN
 module.exports.crypto_generichash_KEYBYTES_MAX = blake2b.KEYBYTES_MAX
 module.exports.crypto_generichash_KEYBYTES = blake2b.KEYBYTES
+module.exports.crypto_generichash_WASM_SUPPORTED = blake2b.WASM_SUPPORTED
+module.exports.crypto_generichash_WASM_LOADED = false
 
 module.exports.crypto_generichash = function (output, input, key) {
-  blake2b(output, input, key)
+  blake2b(output.length, key).update(input).final(output)
 }
 
+module.exports.crypto_generichash_ready = blake2b.ready
+
 module.exports.crypto_generichash_batch = function (output, inputArray, key) {
-  var ctx = blake2b.instance(output.length, key)
+  var ctx = blake2b(output.length, key)
   for (var i = 0; i < inputArray.length; i++) {
     ctx.update(inputArray[i])
   }
@@ -23,5 +26,9 @@ module.exports.crypto_generichash_batch = function (output, inputArray, key) {
 
 module.exports.crypto_generichash_instance = function (key, outlen) {
   if (outlen == null) outlen = module.exports.crypto_generichash_BYTES
-  return blake2b.instance(outlen, key)
+  return blake2b(outlen, key)
 }
+
+blake2b.ready(function (err) {
+  module.exports.crypto_generichash_WASM_LOADED = blake2b.WASM_LOADED
+})

crypto_kdf.js

@@ -1,4 +1,4 @@
-var assert = require('assert')
+var assert = require('nanoassert')
 var randombytes_buf = require('.').randombytes_buf
 var blake2b = require('blake2b')
 
@@ -18,20 +18,22 @@ function STORE64_LE(dest, int) {
 }
 
 module.exports.crypto_kdf_derive_from_key = function crypto_kdf_derive_from_key (subkey, subkey_id, ctx, key) {
-  assert(subkey.length >= module.exports.crypto_kdf_BYTES_MIN, 'subkey must be')
-  assert(ctx.length >= module.exports.crypto_kdf_CONTEXTBYTES, 'context must be')
+  assert(subkey.length >= module.exports.crypto_kdf_BYTES_MIN, 'subkey must be at least crypto_kdf_BYTES_MIN')
+  assert(subkey_id >= 0 && subkey_id <= 0x1fffffffffffff, 'subkey_id must be safe integer')
+  assert(ctx.length >= module.exports.crypto_kdf_CONTEXTBYTES, 'context must be at least crypto_kdf_CONTEXTBYTES')
 
   var ctx_padded = new Uint8Array(blake2b.PERSONALBYTES)
   var salt = new Uint8Array(blake2b.SALTBYTES)
 
   ctx_padded.set(ctx, 0, module.exports.crypto_kdf_CONTEXTBYTES)
-
   STORE64_LE(salt, subkey_id)
 
-  blake2b(subkey.slice(0, Math.min(subkey.length, module.exports.crypto_kdf_BYTES_MAX)), [], key, salt, ctx_padded, true)
+  var outlen = Math.min(subkey.length, module.exports.crypto_kdf_BYTES_MAX)
+  blake2b(outlen, key, salt, ctx_padded, true)
+    .final(subkey)
 }
 
 module.exports.crypto_kdf_keygen = function crypto_kdf_keygen (out) {
-  assert(out.length >= module.exports.crypto_kdf_KEYBYTES)
-  randombytes_buf(out, module.exports.crypto_kdf_KEYBYTES)
+  assert(out.length >= module.exports.crypto_kdf_KEYBYTES, 'out.length must be crypto_kdf_KEYBYTES')
+  randombytes_buf(out.subarray(0, module.exports.crypto_kdf_KEYBYTES))
 }

crypto_shorthash.js

@@ -0,0 +1,17 @@
+var siphash = require('siphash24')
+
+exports.crypto_shorthash_PRIMITIVE = 'siphash24'
+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

@@ -2199,6 +2199,7 @@ sodium.crypto_sign_verify_detached = crypto_sign_verify_detached
 
 forward(require('./crypto_generichash'))
 forward(require('./crypto_kdf'))
+forward(require('./crypto_shorthash'))
 
 sodium.crypto_stream_KEYBYTES = 32
 sodium.crypto_stream_NONCEBYTES = 24

package.json

@@ -1,13 +1,23 @@
 {
   "name": "sodium-javascript",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "WIP - a pure javascript version of sodium-native",
   "main": "index.js",
   "dependencies": {
-    "blake2b": "^1.2.0"
+    "blake2b": "^2.1.1",
+    "nanoassert": "^1.0.0",
+    "siphash24": "^1.0.1"
   },
   "devDependencies": {
-    "sodium-test": "^0.3.0"
+    "sodium-test": "^0.4.0"
+  },
+  "scripts": {
+    "test": " node test.js"
+  },
+  "browserify": {
+    "transform": [
+      "brfs"
+    ]
   },
   "repository": {
     "type": "git",