use xsalsa20 and support crypto_stream_instance
This commit is contained in:
Mathias Buus
parent
0f249a7e8f
commit
6561ff99f1
33
crypto_stream.js
Normal file
33
crypto_stream.js
Normal file
@ -0,0 +1,33 @@
|
||||
var xsalsa20 = require('xsalsa20')
|
||||
|
||||
exports.crypto_stream_KEYBYTES = 32
|
||||
exports.crypto_stream_NONCEBYTES = 24
|
||||
exports.crypto_stream_PRIMITIVE = 'xsalsa20'
|
||||
|
||||
exports.crypto_stream = function (out, nonce, key) {
|
||||
out.fill(0)
|
||||
exports.crypto_stream_xor(out, out, nonce, key)
|
||||
}
|
||||
|
||||
exports.crypto_stream_xor = function (out, inp, nonce, key) {
|
||||
var xor = xsalsa20(nonce, key)
|
||||
xor.update(inp, out)
|
||||
xor.final()
|
||||
}
|
||||
|
||||
exports.crypto_stream_xor_instance = function (nonce, key) {
|
||||
return new XOR(nonce, key)
|
||||
}
|
||||
|
||||
function XOR (nonce, key) {
|
||||
this._instance = xsalsa20(nonce, key)
|
||||
}
|
||||
|
||||
XOR.prototype.update = function (out, inp) {
|
||||
this._instance.update(inp, out)
|
||||
}
|
||||
|
||||
XOR.prototype.final = function () {
|
||||
this._instance.finalize()
|
||||
this._instance = null
|
||||
}
|
||||
472
index.js
472
index.js
@ -3,6 +3,7 @@
|
||||
// Based on https://github.com/dchest/tweetnacl-js/blob/6dcbcaf5f5cbfd313f2dcfe763db35c828c8ff5b/nacl-fast.js.
|
||||
|
||||
var sodium = module.exports
|
||||
var cs = require('./crypto_stream')
|
||||
|
||||
// Ported in 2014 by Dmitry Chestnykh and Devi Mandiri.
|
||||
// Public domain.
|
||||
@ -56,412 +57,6 @@ function crypto_verify_32(x, xi, y, yi) {
|
||||
return vn(x,xi,y,yi,32);
|
||||
}
|
||||
|
||||
function core_salsa20(o, p, k, c) {
|
||||
var j0 = c[ 0] & 0xff | (c[ 1] & 0xff)<<8 | (c[ 2] & 0xff)<<16 | (c[ 3] & 0xff)<<24,
|
||||
j1 = k[ 0] & 0xff | (k[ 1] & 0xff)<<8 | (k[ 2] & 0xff)<<16 | (k[ 3] & 0xff)<<24,
|
||||
j2 = k[ 4] & 0xff | (k[ 5] & 0xff)<<8 | (k[ 6] & 0xff)<<16 | (k[ 7] & 0xff)<<24,
|
||||
j3 = k[ 8] & 0xff | (k[ 9] & 0xff)<<8 | (k[10] & 0xff)<<16 | (k[11] & 0xff)<<24,
|
||||
j4 = k[12] & 0xff | (k[13] & 0xff)<<8 | (k[14] & 0xff)<<16 | (k[15] & 0xff)<<24,
|
||||
j5 = c[ 4] & 0xff | (c[ 5] & 0xff)<<8 | (c[ 6] & 0xff)<<16 | (c[ 7] & 0xff)<<24,
|
||||
j6 = p[ 0] & 0xff | (p[ 1] & 0xff)<<8 | (p[ 2] & 0xff)<<16 | (p[ 3] & 0xff)<<24,
|
||||
j7 = p[ 4] & 0xff | (p[ 5] & 0xff)<<8 | (p[ 6] & 0xff)<<16 | (p[ 7] & 0xff)<<24,
|
||||
j8 = p[ 8] & 0xff | (p[ 9] & 0xff)<<8 | (p[10] & 0xff)<<16 | (p[11] & 0xff)<<24,
|
||||
j9 = p[12] & 0xff | (p[13] & 0xff)<<8 | (p[14] & 0xff)<<16 | (p[15] & 0xff)<<24,
|
||||
j10 = c[ 8] & 0xff | (c[ 9] & 0xff)<<8 | (c[10] & 0xff)<<16 | (c[11] & 0xff)<<24,
|
||||
j11 = k[16] & 0xff | (k[17] & 0xff)<<8 | (k[18] & 0xff)<<16 | (k[19] & 0xff)<<24,
|
||||
j12 = k[20] & 0xff | (k[21] & 0xff)<<8 | (k[22] & 0xff)<<16 | (k[23] & 0xff)<<24,
|
||||
j13 = k[24] & 0xff | (k[25] & 0xff)<<8 | (k[26] & 0xff)<<16 | (k[27] & 0xff)<<24,
|
||||
j14 = k[28] & 0xff | (k[29] & 0xff)<<8 | (k[30] & 0xff)<<16 | (k[31] & 0xff)<<24,
|
||||
j15 = c[12] & 0xff | (c[13] & 0xff)<<8 | (c[14] & 0xff)<<16 | (c[15] & 0xff)<<24;
|
||||
|
||||
var x0 = j0, x1 = j1, x2 = j2, x3 = j3, x4 = j4, x5 = j5, x6 = j6, x7 = j7,
|
||||
x8 = j8, x9 = j9, x10 = j10, x11 = j11, x12 = j12, x13 = j13, x14 = j14,
|
||||
x15 = j15, u;
|
||||
|
||||
for (var i = 0; i < 20; i += 2) {
|
||||
u = x0 + x12 | 0;
|
||||
x4 ^= u<<7 | u>>>(32-7);
|
||||
u = x4 + x0 | 0;
|
||||
x8 ^= u<<9 | u>>>(32-9);
|
||||
u = x8 + x4 | 0;
|
||||
x12 ^= u<<13 | u>>>(32-13);
|
||||
u = x12 + x8 | 0;
|
||||
x0 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x5 + x1 | 0;
|
||||
x9 ^= u<<7 | u>>>(32-7);
|
||||
u = x9 + x5 | 0;
|
||||
x13 ^= u<<9 | u>>>(32-9);
|
||||
u = x13 + x9 | 0;
|
||||
x1 ^= u<<13 | u>>>(32-13);
|
||||
u = x1 + x13 | 0;
|
||||
x5 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x10 + x6 | 0;
|
||||
x14 ^= u<<7 | u>>>(32-7);
|
||||
u = x14 + x10 | 0;
|
||||
x2 ^= u<<9 | u>>>(32-9);
|
||||
u = x2 + x14 | 0;
|
||||
x6 ^= u<<13 | u>>>(32-13);
|
||||
u = x6 + x2 | 0;
|
||||
x10 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x15 + x11 | 0;
|
||||
x3 ^= u<<7 | u>>>(32-7);
|
||||
u = x3 + x15 | 0;
|
||||
x7 ^= u<<9 | u>>>(32-9);
|
||||
u = x7 + x3 | 0;
|
||||
x11 ^= u<<13 | u>>>(32-13);
|
||||
u = x11 + x7 | 0;
|
||||
x15 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x0 + x3 | 0;
|
||||
x1 ^= u<<7 | u>>>(32-7);
|
||||
u = x1 + x0 | 0;
|
||||
x2 ^= u<<9 | u>>>(32-9);
|
||||
u = x2 + x1 | 0;
|
||||
x3 ^= u<<13 | u>>>(32-13);
|
||||
u = x3 + x2 | 0;
|
||||
x0 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x5 + x4 | 0;
|
||||
x6 ^= u<<7 | u>>>(32-7);
|
||||
u = x6 + x5 | 0;
|
||||
x7 ^= u<<9 | u>>>(32-9);
|
||||
u = x7 + x6 | 0;
|
||||
x4 ^= u<<13 | u>>>(32-13);
|
||||
u = x4 + x7 | 0;
|
||||
x5 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x10 + x9 | 0;
|
||||
x11 ^= u<<7 | u>>>(32-7);
|
||||
u = x11 + x10 | 0;
|
||||
x8 ^= u<<9 | u>>>(32-9);
|
||||
u = x8 + x11 | 0;
|
||||
x9 ^= u<<13 | u>>>(32-13);
|
||||
u = x9 + x8 | 0;
|
||||
x10 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x15 + x14 | 0;
|
||||
x12 ^= u<<7 | u>>>(32-7);
|
||||
u = x12 + x15 | 0;
|
||||
x13 ^= u<<9 | u>>>(32-9);
|
||||
u = x13 + x12 | 0;
|
||||
x14 ^= u<<13 | u>>>(32-13);
|
||||
u = x14 + x13 | 0;
|
||||
x15 ^= u<<18 | u>>>(32-18);
|
||||
}
|
||||
x0 = x0 + j0 | 0;
|
||||
x1 = x1 + j1 | 0;
|
||||
x2 = x2 + j2 | 0;
|
||||
x3 = x3 + j3 | 0;
|
||||
x4 = x4 + j4 | 0;
|
||||
x5 = x5 + j5 | 0;
|
||||
x6 = x6 + j6 | 0;
|
||||
x7 = x7 + j7 | 0;
|
||||
x8 = x8 + j8 | 0;
|
||||
x9 = x9 + j9 | 0;
|
||||
x10 = x10 + j10 | 0;
|
||||
x11 = x11 + j11 | 0;
|
||||
x12 = x12 + j12 | 0;
|
||||
x13 = x13 + j13 | 0;
|
||||
x14 = x14 + j14 | 0;
|
||||
x15 = x15 + j15 | 0;
|
||||
|
||||
o[ 0] = x0 >>> 0 & 0xff;
|
||||
o[ 1] = x0 >>> 8 & 0xff;
|
||||
o[ 2] = x0 >>> 16 & 0xff;
|
||||
o[ 3] = x0 >>> 24 & 0xff;
|
||||
|
||||
o[ 4] = x1 >>> 0 & 0xff;
|
||||
o[ 5] = x1 >>> 8 & 0xff;
|
||||
o[ 6] = x1 >>> 16 & 0xff;
|
||||
o[ 7] = x1 >>> 24 & 0xff;
|
||||
|
||||
o[ 8] = x2 >>> 0 & 0xff;
|
||||
o[ 9] = x2 >>> 8 & 0xff;
|
||||
o[10] = x2 >>> 16 & 0xff;
|
||||
o[11] = x2 >>> 24 & 0xff;
|
||||
|
||||
o[12] = x3 >>> 0 & 0xff;
|
||||
o[13] = x3 >>> 8 & 0xff;
|
||||
o[14] = x3 >>> 16 & 0xff;
|
||||
o[15] = x3 >>> 24 & 0xff;
|
||||
|
||||
o[16] = x4 >>> 0 & 0xff;
|
||||
o[17] = x4 >>> 8 & 0xff;
|
||||
o[18] = x4 >>> 16 & 0xff;
|
||||
o[19] = x4 >>> 24 & 0xff;
|
||||
|
||||
o[20] = x5 >>> 0 & 0xff;
|
||||
o[21] = x5 >>> 8 & 0xff;
|
||||
o[22] = x5 >>> 16 & 0xff;
|
||||
o[23] = x5 >>> 24 & 0xff;
|
||||
|
||||
o[24] = x6 >>> 0 & 0xff;
|
||||
o[25] = x6 >>> 8 & 0xff;
|
||||
o[26] = x6 >>> 16 & 0xff;
|
||||
o[27] = x6 >>> 24 & 0xff;
|
||||
|
||||
o[28] = x7 >>> 0 & 0xff;
|
||||
o[29] = x7 >>> 8 & 0xff;
|
||||
o[30] = x7 >>> 16 & 0xff;
|
||||
o[31] = x7 >>> 24 & 0xff;
|
||||
|
||||
o[32] = x8 >>> 0 & 0xff;
|
||||
o[33] = x8 >>> 8 & 0xff;
|
||||
o[34] = x8 >>> 16 & 0xff;
|
||||
o[35] = x8 >>> 24 & 0xff;
|
||||
|
||||
o[36] = x9 >>> 0 & 0xff;
|
||||
o[37] = x9 >>> 8 & 0xff;
|
||||
o[38] = x9 >>> 16 & 0xff;
|
||||
o[39] = x9 >>> 24 & 0xff;
|
||||
|
||||
o[40] = x10 >>> 0 & 0xff;
|
||||
o[41] = x10 >>> 8 & 0xff;
|
||||
o[42] = x10 >>> 16 & 0xff;
|
||||
o[43] = x10 >>> 24 & 0xff;
|
||||
|
||||
o[44] = x11 >>> 0 & 0xff;
|
||||
o[45] = x11 >>> 8 & 0xff;
|
||||
o[46] = x11 >>> 16 & 0xff;
|
||||
o[47] = x11 >>> 24 & 0xff;
|
||||
|
||||
o[48] = x12 >>> 0 & 0xff;
|
||||
o[49] = x12 >>> 8 & 0xff;
|
||||
o[50] = x12 >>> 16 & 0xff;
|
||||
o[51] = x12 >>> 24 & 0xff;
|
||||
|
||||
o[52] = x13 >>> 0 & 0xff;
|
||||
o[53] = x13 >>> 8 & 0xff;
|
||||
o[54] = x13 >>> 16 & 0xff;
|
||||
o[55] = x13 >>> 24 & 0xff;
|
||||
|
||||
o[56] = x14 >>> 0 & 0xff;
|
||||
o[57] = x14 >>> 8 & 0xff;
|
||||
o[58] = x14 >>> 16 & 0xff;
|
||||
o[59] = x14 >>> 24 & 0xff;
|
||||
|
||||
o[60] = x15 >>> 0 & 0xff;
|
||||
o[61] = x15 >>> 8 & 0xff;
|
||||
o[62] = x15 >>> 16 & 0xff;
|
||||
o[63] = x15 >>> 24 & 0xff;
|
||||
}
|
||||
|
||||
function core_hsalsa20(o,p,k,c) {
|
||||
var j0 = c[ 0] & 0xff | (c[ 1] & 0xff)<<8 | (c[ 2] & 0xff)<<16 | (c[ 3] & 0xff)<<24,
|
||||
j1 = k[ 0] & 0xff | (k[ 1] & 0xff)<<8 | (k[ 2] & 0xff)<<16 | (k[ 3] & 0xff)<<24,
|
||||
j2 = k[ 4] & 0xff | (k[ 5] & 0xff)<<8 | (k[ 6] & 0xff)<<16 | (k[ 7] & 0xff)<<24,
|
||||
j3 = k[ 8] & 0xff | (k[ 9] & 0xff)<<8 | (k[10] & 0xff)<<16 | (k[11] & 0xff)<<24,
|
||||
j4 = k[12] & 0xff | (k[13] & 0xff)<<8 | (k[14] & 0xff)<<16 | (k[15] & 0xff)<<24,
|
||||
j5 = c[ 4] & 0xff | (c[ 5] & 0xff)<<8 | (c[ 6] & 0xff)<<16 | (c[ 7] & 0xff)<<24,
|
||||
j6 = p[ 0] & 0xff | (p[ 1] & 0xff)<<8 | (p[ 2] & 0xff)<<16 | (p[ 3] & 0xff)<<24,
|
||||
j7 = p[ 4] & 0xff | (p[ 5] & 0xff)<<8 | (p[ 6] & 0xff)<<16 | (p[ 7] & 0xff)<<24,
|
||||
j8 = p[ 8] & 0xff | (p[ 9] & 0xff)<<8 | (p[10] & 0xff)<<16 | (p[11] & 0xff)<<24,
|
||||
j9 = p[12] & 0xff | (p[13] & 0xff)<<8 | (p[14] & 0xff)<<16 | (p[15] & 0xff)<<24,
|
||||
j10 = c[ 8] & 0xff | (c[ 9] & 0xff)<<8 | (c[10] & 0xff)<<16 | (c[11] & 0xff)<<24,
|
||||
j11 = k[16] & 0xff | (k[17] & 0xff)<<8 | (k[18] & 0xff)<<16 | (k[19] & 0xff)<<24,
|
||||
j12 = k[20] & 0xff | (k[21] & 0xff)<<8 | (k[22] & 0xff)<<16 | (k[23] & 0xff)<<24,
|
||||
j13 = k[24] & 0xff | (k[25] & 0xff)<<8 | (k[26] & 0xff)<<16 | (k[27] & 0xff)<<24,
|
||||
j14 = k[28] & 0xff | (k[29] & 0xff)<<8 | (k[30] & 0xff)<<16 | (k[31] & 0xff)<<24,
|
||||
j15 = c[12] & 0xff | (c[13] & 0xff)<<8 | (c[14] & 0xff)<<16 | (c[15] & 0xff)<<24;
|
||||
|
||||
var x0 = j0, x1 = j1, x2 = j2, x3 = j3, x4 = j4, x5 = j5, x6 = j6, x7 = j7,
|
||||
x8 = j8, x9 = j9, x10 = j10, x11 = j11, x12 = j12, x13 = j13, x14 = j14,
|
||||
x15 = j15, u;
|
||||
|
||||
for (var i = 0; i < 20; i += 2) {
|
||||
u = x0 + x12 | 0;
|
||||
x4 ^= u<<7 | u>>>(32-7);
|
||||
u = x4 + x0 | 0;
|
||||
x8 ^= u<<9 | u>>>(32-9);
|
||||
u = x8 + x4 | 0;
|
||||
x12 ^= u<<13 | u>>>(32-13);
|
||||
u = x12 + x8 | 0;
|
||||
x0 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x5 + x1 | 0;
|
||||
x9 ^= u<<7 | u>>>(32-7);
|
||||
u = x9 + x5 | 0;
|
||||
x13 ^= u<<9 | u>>>(32-9);
|
||||
u = x13 + x9 | 0;
|
||||
x1 ^= u<<13 | u>>>(32-13);
|
||||
u = x1 + x13 | 0;
|
||||
x5 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x10 + x6 | 0;
|
||||
x14 ^= u<<7 | u>>>(32-7);
|
||||
u = x14 + x10 | 0;
|
||||
x2 ^= u<<9 | u>>>(32-9);
|
||||
u = x2 + x14 | 0;
|
||||
x6 ^= u<<13 | u>>>(32-13);
|
||||
u = x6 + x2 | 0;
|
||||
x10 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x15 + x11 | 0;
|
||||
x3 ^= u<<7 | u>>>(32-7);
|
||||
u = x3 + x15 | 0;
|
||||
x7 ^= u<<9 | u>>>(32-9);
|
||||
u = x7 + x3 | 0;
|
||||
x11 ^= u<<13 | u>>>(32-13);
|
||||
u = x11 + x7 | 0;
|
||||
x15 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x0 + x3 | 0;
|
||||
x1 ^= u<<7 | u>>>(32-7);
|
||||
u = x1 + x0 | 0;
|
||||
x2 ^= u<<9 | u>>>(32-9);
|
||||
u = x2 + x1 | 0;
|
||||
x3 ^= u<<13 | u>>>(32-13);
|
||||
u = x3 + x2 | 0;
|
||||
x0 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x5 + x4 | 0;
|
||||
x6 ^= u<<7 | u>>>(32-7);
|
||||
u = x6 + x5 | 0;
|
||||
x7 ^= u<<9 | u>>>(32-9);
|
||||
u = x7 + x6 | 0;
|
||||
x4 ^= u<<13 | u>>>(32-13);
|
||||
u = x4 + x7 | 0;
|
||||
x5 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x10 + x9 | 0;
|
||||
x11 ^= u<<7 | u>>>(32-7);
|
||||
u = x11 + x10 | 0;
|
||||
x8 ^= u<<9 | u>>>(32-9);
|
||||
u = x8 + x11 | 0;
|
||||
x9 ^= u<<13 | u>>>(32-13);
|
||||
u = x9 + x8 | 0;
|
||||
x10 ^= u<<18 | u>>>(32-18);
|
||||
|
||||
u = x15 + x14 | 0;
|
||||
x12 ^= u<<7 | u>>>(32-7);
|
||||
u = x12 + x15 | 0;
|
||||
x13 ^= u<<9 | u>>>(32-9);
|
||||
u = x13 + x12 | 0;
|
||||
x14 ^= u<<13 | u>>>(32-13);
|
||||
u = x14 + x13 | 0;
|
||||
x15 ^= u<<18 | u>>>(32-18);
|
||||
}
|
||||
|
||||
o[ 0] = x0 >>> 0 & 0xff;
|
||||
o[ 1] = x0 >>> 8 & 0xff;
|
||||
o[ 2] = x0 >>> 16 & 0xff;
|
||||
o[ 3] = x0 >>> 24 & 0xff;
|
||||
|
||||
o[ 4] = x5 >>> 0 & 0xff;
|
||||
o[ 5] = x5 >>> 8 & 0xff;
|
||||
o[ 6] = x5 >>> 16 & 0xff;
|
||||
o[ 7] = x5 >>> 24 & 0xff;
|
||||
|
||||
o[ 8] = x10 >>> 0 & 0xff;
|
||||
o[ 9] = x10 >>> 8 & 0xff;
|
||||
o[10] = x10 >>> 16 & 0xff;
|
||||
o[11] = x10 >>> 24 & 0xff;
|
||||
|
||||
o[12] = x15 >>> 0 & 0xff;
|
||||
o[13] = x15 >>> 8 & 0xff;
|
||||
o[14] = x15 >>> 16 & 0xff;
|
||||
o[15] = x15 >>> 24 & 0xff;
|
||||
|
||||
o[16] = x6 >>> 0 & 0xff;
|
||||
o[17] = x6 >>> 8 & 0xff;
|
||||
o[18] = x6 >>> 16 & 0xff;
|
||||
o[19] = x6 >>> 24 & 0xff;
|
||||
|
||||
o[20] = x7 >>> 0 & 0xff;
|
||||
o[21] = x7 >>> 8 & 0xff;
|
||||
o[22] = x7 >>> 16 & 0xff;
|
||||
o[23] = x7 >>> 24 & 0xff;
|
||||
|
||||
o[24] = x8 >>> 0 & 0xff;
|
||||
o[25] = x8 >>> 8 & 0xff;
|
||||
o[26] = x8 >>> 16 & 0xff;
|
||||
o[27] = x8 >>> 24 & 0xff;
|
||||
|
||||
o[28] = x9 >>> 0 & 0xff;
|
||||
o[29] = x9 >>> 8 & 0xff;
|
||||
o[30] = x9 >>> 16 & 0xff;
|
||||
o[31] = x9 >>> 24 & 0xff;
|
||||
}
|
||||
|
||||
function crypto_core_salsa20(out,inp,k,c) {
|
||||
core_salsa20(out,inp,k,c);
|
||||
}
|
||||
|
||||
function crypto_core_hsalsa20(out,inp,k,c) {
|
||||
core_hsalsa20(out,inp,k,c);
|
||||
}
|
||||
|
||||
var sigma = new Uint8Array([101, 120, 112, 97, 110, 100, 32, 51, 50, 45, 98, 121, 116, 101, 32, 107]);
|
||||
// "expand 32-byte k"
|
||||
|
||||
function crypto_stream_salsa20_xor(c,cpos,m,mpos,b,n,k) {
|
||||
var z = new Uint8Array(16), x = new Uint8Array(64);
|
||||
var u, i;
|
||||
for (i = 0; i < 16; i++) z[i] = 0;
|
||||
for (i = 0; i < 8; i++) z[i] = n[i];
|
||||
while (b >= 64) {
|
||||
crypto_core_salsa20(x,z,k,sigma);
|
||||
for (i = 0; i < 64; i++) c[cpos+i] = m[mpos+i] ^ x[i];
|
||||
u = 1;
|
||||
for (i = 8; i < 16; i++) {
|
||||
u = u + (z[i] & 0xff) | 0;
|
||||
z[i] = u & 0xff;
|
||||
u >>>= 8;
|
||||
}
|
||||
b -= 64;
|
||||
cpos += 64;
|
||||
mpos += 64;
|
||||
}
|
||||
if (b > 0) {
|
||||
crypto_core_salsa20(x,z,k,sigma);
|
||||
for (i = 0; i < b; i++) c[cpos+i] = m[mpos+i] ^ x[i];
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
function crypto_stream_salsa20(c,cpos,b,n,k) {
|
||||
var z = new Uint8Array(16), x = new Uint8Array(64);
|
||||
var u, i;
|
||||
for (i = 0; i < 16; i++) z[i] = 0;
|
||||
for (i = 0; i < 8; i++) z[i] = n[i];
|
||||
while (b >= 64) {
|
||||
crypto_core_salsa20(x,z,k,sigma);
|
||||
for (i = 0; i < 64; i++) c[cpos+i] = x[i];
|
||||
u = 1;
|
||||
for (i = 8; i < 16; i++) {
|
||||
u = u + (z[i] & 0xff) | 0;
|
||||
z[i] = u & 0xff;
|
||||
u >>>= 8;
|
||||
}
|
||||
b -= 64;
|
||||
cpos += 64;
|
||||
}
|
||||
if (b > 0) {
|
||||
crypto_core_salsa20(x,z,k,sigma);
|
||||
for (i = 0; i < b; i++) c[cpos+i] = x[i];
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
function crypto_stream(c,cpos,d,n,k) {
|
||||
var s = new Uint8Array(32);
|
||||
crypto_core_hsalsa20(s,n,k,sigma);
|
||||
var sn = new Uint8Array(8);
|
||||
for (var i = 0; i < 8; i++) sn[i] = n[i+16];
|
||||
return crypto_stream_salsa20(c,cpos,d,sn,s);
|
||||
}
|
||||
|
||||
function crypto_stream_xor(c,cpos,m,mpos,d,n,k) {
|
||||
var s = new Uint8Array(32);
|
||||
crypto_core_hsalsa20(s,n,k,sigma);
|
||||
var sn = new Uint8Array(8);
|
||||
for (var i = 0; i < 8; i++) sn[i] = n[i+16];
|
||||
return crypto_stream_salsa20_xor(c,cpos,m,mpos,d,sn,s);
|
||||
}
|
||||
|
||||
/*
|
||||
* Port of Andrew Moon's Poly1305-donna-16. Public domain.
|
||||
* https://github.com/floodyberry/poly1305-donna
|
||||
@ -819,6 +414,14 @@ poly1305.prototype.update = function(m, mpos, bytes) {
|
||||
}
|
||||
};
|
||||
|
||||
function crypto_stream_xor (c, cpos, m, mpos, clen, n, k) {
|
||||
cs.crypto_stream_xor(c, m, n, k)
|
||||
}
|
||||
|
||||
function crypto_stream (c, cpos, clen, n, k) {
|
||||
cs.crypto_stream(c, n, k)
|
||||
}
|
||||
|
||||
function crypto_onetimeauth(out, outpos, m, mpos, n, k) {
|
||||
var s = new poly1305(k);
|
||||
s.update(m, mpos, n);
|
||||
@ -1384,32 +987,6 @@ function crypto_scalarmult_base(q, n) {
|
||||
return crypto_scalarmult(q, n, _9);
|
||||
}
|
||||
|
||||
function crypto_box_keypair(y, x) {
|
||||
randombytes(x, 32);
|
||||
return crypto_scalarmult_base(y, x);
|
||||
}
|
||||
|
||||
function crypto_box_beforenm(k, y, x) {
|
||||
var s = new Uint8Array(32);
|
||||
crypto_scalarmult(s, x, y);
|
||||
return crypto_core_hsalsa20(k, _0, s, sigma);
|
||||
}
|
||||
|
||||
var crypto_box_afternm = crypto_secretbox;
|
||||
var crypto_box_open_afternm = crypto_secretbox_open;
|
||||
|
||||
function crypto_box(c, m, d, n, y, x) {
|
||||
var k = new Uint8Array(32);
|
||||
crypto_box_beforenm(k, y, x);
|
||||
return crypto_box_afternm(c, m, d, n, k);
|
||||
}
|
||||
|
||||
function crypto_box_open(m, c, d, n, y, x) {
|
||||
var k = new Uint8Array(32);
|
||||
crypto_box_beforenm(k, y, x);
|
||||
return crypto_box_open_afternm(m, c, d, n, k);
|
||||
}
|
||||
|
||||
var K = [
|
||||
0x428a2f98, 0xd728ae22, 0x71374491, 0x23ef65cd,
|
||||
0xb5c0fbcf, 0xec4d3b2f, 0xe9b5dba5, 0x8189dbbc,
|
||||
@ -2112,19 +1689,20 @@ function crypto_sign_verify_detached (sig, m, pk) {
|
||||
return crypto_sign_open(sm, m, pk)
|
||||
}
|
||||
|
||||
function crypto_stream_wrap(c, n, k) {
|
||||
check(c, 0)
|
||||
check(n, sodium.crypto_stream_NONCEBYTES)
|
||||
check(k, sodium.crypto_stream_KEYBYTES)
|
||||
crypto_stream(c, 0, c.length, n, k)
|
||||
function crypto_secretbox_detached (o, mac, msg, n, k) {
|
||||
check(mac, sodium.crypto_secretbox_MACBYTES)
|
||||
var tmp = new Uint8Array(msg.length + mac.length)
|
||||
crypto_secretbox_easy(tmp, msg, n, k)
|
||||
o.set(tmp.subarray(0, msg.length))
|
||||
mac.set(tmp.subarray(msg.length))
|
||||
}
|
||||
|
||||
function crypto_stream_xor_wrap(c, m, n, k) {
|
||||
check(m, 0)
|
||||
check(c, m.length)
|
||||
check(n, sodium.crypto_stream_NONCEBYTES)
|
||||
check(k, sodium.crypto_stream_KEYBYTES)
|
||||
crypto_stream_xor(c, 0, m, 0, m.length, n, k)
|
||||
function crypto_secretbox_open_detached (msg, o, mac, n, k) {
|
||||
check(mac, sodium.crypto_secretbox_MACBYTES)
|
||||
var tmp = new Uint8Array(o.length + mac.length)
|
||||
tmp.set(o)
|
||||
tmp.set(mac, msg.length)
|
||||
return crypto_secretbox_open_easy(msg, tmp, n, k)
|
||||
}
|
||||
|
||||
function crypto_secretbox_easy(o, msg, n, k) {
|
||||
@ -2195,11 +1773,7 @@ forward(require('./crypto_generichash'))
|
||||
forward(require('./crypto_kdf'))
|
||||
forward(require('./crypto_shorthash'))
|
||||
forward(require('./randombytes'))
|
||||
|
||||
sodium.crypto_stream_KEYBYTES = 32
|
||||
sodium.crypto_stream_NONCEBYTES = 24
|
||||
sodium.crypto_stream = crypto_stream_wrap
|
||||
sodium.crypto_stream_xor = crypto_stream_xor_wrap
|
||||
forward(require('./crypto_stream'))
|
||||
|
||||
sodium.crypto_scalarmult_BYTES = crypto_scalarmult_BYTES
|
||||
sodium.crypto_scalarmult_SCALARBYTES = crypto_scalarmult_SCALARBYTES
|
||||
@ -2211,6 +1785,8 @@ sodium.crypto_secretbox_NONCEBYTES = crypto_secretbox_NONCEBYTES,
|
||||
sodium.crypto_secretbox_MACBYTES = 16
|
||||
sodium.crypto_secretbox_easy = crypto_secretbox_easy
|
||||
sodium.crypto_secretbox_open_easy = crypto_secretbox_open_easy
|
||||
sodium.crypto_secretbox_detached = crypto_secretbox_detached
|
||||
sodium.crypto_secretbox_open_detached = crypto_secretbox_open_detached
|
||||
|
||||
function cleanup(arr) {
|
||||
for (var i = 0; i < arr.length; i++) arr[i] = 0;
|
||||
|
||||
10
package.json
10
package.json
@ -6,23 +6,19 @@
|
||||
"dependencies": {
|
||||
"blake2b": "^2.1.1",
|
||||
"nanoassert": "^1.0.0",
|
||||
"siphash24": "^1.0.1"
|
||||
"siphash24": "^1.0.1",
|
||||
"xsalsa20": "^1.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"browser-run": "^4.0.2",
|
||||
"browserify": "^14.1.0",
|
||||
"sodium-test": "^0.5.1"
|
||||
"sodium-test": "^0.6.0"
|
||||
},
|
||||
"scripts": {
|
||||
"browser": "browserify test.js | browser-run",
|
||||
"browser-manual": "browserify test.js | browser-run -p 1234",
|
||||
"test": "node test.js"
|
||||
},
|
||||
"browserify": {
|
||||
"transform": [
|
||||
"brfs"
|
||||
]
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mafintosh/sodium-javascript.git"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user