0.5.5

react-native doesn't want crypto set to an empty module (#14 )
React-Native is sort of like a browser, sort of a native environment. On react-native we don't have the browser's crypto implementation, so we need to require react-native-crypto. We can rewrite the module requirement to do that using the extraNodeModules feature in rn-cli.config.js, but the metro packager assumes that if there's a "browser" field in package.json that it's relevant to react-native libraries unless there's also a "react-native" field. Hurray. Anyway, this silly little patch tells metro not to replace crypto with an empty module but actually to use whatever you currently have crypto set to (which is not solved here, so you'll still have to do that.)
2018-03-19 19:03:43 +01:00 · 2018-03-19 18:58:24 +01:00 · 2018-03-03 17:24:12 +00:00 · 2018-03-03 17:24:12 +00:00 · 2017-11-19 13:16:51 +01:00 · 2017-11-19 13:16:35 +01:00
4 changed files with 10 additions and 9 deletions
@@ -6,7 +6,7 @@ module.exports.crypto_kdf_PRIMITIVE = 'blake2b'
 module.exports.crypto_kdf_BYTES_MIN = 16
 module.exports.crypto_kdf_BYTES_MAX = 64
 module.exports.crypto_kdf_CONTEXTBYTES = 8
-module.exports.crypto_kdf_KEYBYTES = 64
+module.exports.crypto_kdf_KEYBYTES = 32

 function STORE64_LE(dest, int) {
  var mul = 1
@@ -29,7 +29,7 @@ module.exports.crypto_kdf_derive_from_key = function crypto_kdf_derive_from_key
  STORE64_LE(salt, subkey_id)

  var outlen = Math.min(subkey.length, module.exports.crypto_kdf_BYTES_MAX)
-  blake2b(outlen, key, salt, ctx_padded, true)
+  blake2b(outlen, key.subarray(0, module.exports.crypto_kdf_KEYBYTES), salt, ctx_padded, true)
    .final(subkey)
 }

@@ -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)
 }
@@ -1,6 +1,6 @@
 {
  "name": "sodium-javascript",
-  "version": "0.5.2",
+  "version": "0.5.5",
  "description": "WIP - a pure javascript version of sodium-native",
  "main": "index.js",
  "dependencies": {
@@ -14,6 +14,12 @@
    "browserify": "^14.1.0",
    "sodium-test": "^0.7.0"
  },
+  "browser": {
+    "crypto": false
+  },
+  "react-native": {
+    "crypto": "crypto"
+  },
  "scripts": {
    "browser": "browserify test.js | browser-run",
    "browser-manual": "browserify test.js | browser-run -p 1234",
@@ -21,7 +21,7 @@ var randombytes = (function () {
    return browserBytes
  } else if (typeof require !== 'undefined') {
    // Node.js.
-    crypto = require('cry' + 'pto');
+    crypto = require('crypto')
    if (crypto && crypto.randomBytes) {
      return nodeBytes
    }
Author	SHA1	Message	Date
Mathias Buus	e1ca83f1bd	0.5.5	2018-03-19 19:03:43 +01:00
Peter van Hardenberg	c81ef709d1	react-native doesn't want crypto set to an empty module (#14 ) React-Native is sort of like a browser, sort of a native environment. On react-native we don't have the browser's crypto implementation, so we need to require react-native-crypto. We can rewrite the module requirement to do that using the extraNodeModules feature in rn-cli.config.js, but the metro packager assumes that if there's a "browser" field in package.json that it's relevant to react-native libraries unless there's also a "react-native" field. Hurray. Anyway, this silly little patch tells metro not to replace crypto with an empty module but actually to use whatever you currently have crypto set to (which is not solved here, so you'll still have to do that.)	2018-03-19 18:58:24 +01:00
Jim Pick	4e1c69ba13	Change crypto_kdf_KEYBYTES to be 32 and use subarray instead of slice Thanks to Emil Bayes for the advice.	2018-03-03 17:24:12 +00:00
Jim Pick	5159d68fa9	In kdf, truncate key before passing to blake to match sodium-native behaviour Currently, sodium-native and sodium-javascript are returning different hashes. The code in hyperdrive passes a 64 byte secret key to the kdf, but only 32 bytes are used by the native version, but all 64 bytes are used in the javascript version. As a result, hyperdrive secret keys can't be imported/exported across the two sodium implementations. https://gist.github.com/jimpick/3e869522eddaad77ac1bc9e64f36e1a7	2018-03-03 17:24:12 +00:00
Mathias Buus	5ccdcdee17	0.5.4	2017-11-19 13:16:51 +01:00
Mathias Buus	48081c6896	ignore crypto in the browser	2017-11-19 13:16:35 +01:00
Mathias Buus	b1741bfdae	0.5.3	2017-11-17 12:09:34 +01:00
Mathias Buus	f7de366eec	fix shorthash_ready being deprecated	2017-11-17 12:07:52 +01:00
Mathias Buus	51e11143e5	fix siphash24 not having ready	2017-11-17 10:43:01 +01:00