telackey/sodium-javascript
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change function signatures to match crypto_stream module

Browse Source
This commit is contained in:
Christophe Diederichs 2020-06-12 10:57:12 +02:00
parent b0fcb363e8
commit babf8a9440
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crypto_stream_chacha20.js
View File

@ -10,16 +10,12 @@ exports.crypto_stream_chacha20_ietf_KEYBYTES = 32
exports.crypto_stream_chacha20_ietf_NONCEBYTES = 12 exports.crypto_stream_chacha20_ietf_NONCEBYTES = 12
exports.crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX = 2 ** 32 exports.crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX = 2 ** 32
exports.crypto_stream_chacha20 = function (c, clen, n, k) { exports.crypto_stream_chacha20 = function (c, n, k) {
if (clen) return exports.crypto_stream_chacha20(c.subarray(0, clen), null, n, k)
c.fill(0) c.fill(0)
exports.crypto_stream_chacha20_xor(c, 0, c, 0, 0, n, k) exports.crypto_stream_chacha20_xor(c, c, n, k)
} }
exports.crypto_stream_chacha20_xor = function (c, cpos, m, mpos, clen, n, k) { exports.crypto_stream_chacha20_xor = function (c, m, n, k) {
if (clen && clen > 0) return exports.crypto_stream_chacha20_xor(c.subarray(0, clen), null, m.subarray(0, clen), null, null, n, k)
assert(n.byteLength === exports.crypto_stream_chacha20_NONCEBYTES, assert(n.byteLength === exports.crypto_stream_chacha20_NONCEBYTES,
'n should be crypto_stream_chacha20_NONCEBYTES') 'n should be crypto_stream_chacha20_NONCEBYTES')
assert(k.byteLength === exports.crypto_stream_chacha20_KEYBYTES, assert(k.byteLength === exports.crypto_stream_chacha20_KEYBYTES,
@ -30,9 +26,7 @@ exports.crypto_stream_chacha20_xor = function (c, cpos, m, mpos, clen, n, k) {
xor.final() xor.final()
} }
exports.crypto_stream_chacha20_xor_ic = function (c, m, mlen, n, ic, k) { exports.crypto_stream_chacha20_xor_ic = function (c, m, n, ic, k) {
if (mlen) return exports.crypto_stream_chacha20_xor_ic(c, m.subarray(0, mlen), null, n, ic, k)
assert(n.byteLength === exports.crypto_stream_chacha20_NONCEBYTES, assert(n.byteLength === exports.crypto_stream_chacha20_NONCEBYTES,
'n should be crypto_stream_chacha20_NONCEBYTES') 'n should be crypto_stream_chacha20_NONCEBYTES')
assert(k.byteLength === exports.crypto_stream_chacha20_KEYBYTES, assert(k.byteLength === exports.crypto_stream_chacha20_KEYBYTES,
@ -52,16 +46,12 @@ exports.crypto_stream_chacha20_xor_instance = function (n, k) {
return new Chacha20(n, k) return new Chacha20(n, k)
} }
exports.crypto_stream_chacha20_ietf = function (c, clen, n, k) { exports.crypto_stream_chacha20_ietf = function (c, n, k) {
if (clen) return exports.crypto_stream_chacha20_ietf(c.subarray(0, clen), null, n, k)
c.fill(0) c.fill(0)
exports.crypto_stream_chacha20_ietf_xor(c, 0, c, 0, 0, n, k) exports.crypto_stream_chacha20_ietf_xor(c, c, n, k)
} }
exports.crypto_stream_chacha20_ietf_xor = function (c, cpos, m, mpos, clen, n, k) { exports.crypto_stream_chacha20_ietf_xor = function (c, m, n, k) {
if (clen) return exports.crypto_stream_chacha20_ietf_xor(c.subarray(0, clen), null, m.subarray(0, clen), null, null, n, k)
assert(n.byteLength === exports.crypto_stream_chacha20_ietf_NONCEBYTES, assert(n.byteLength === exports.crypto_stream_chacha20_ietf_NONCEBYTES,
'n should be crypto_stream_chacha20_ietf_NONCEBYTES') 'n should be crypto_stream_chacha20_ietf_NONCEBYTES')
assert(k.byteLength === exports.crypto_stream_chacha20_ietf_KEYBYTES, assert(k.byteLength === exports.crypto_stream_chacha20_ietf_KEYBYTES,
@ -72,9 +62,7 @@ exports.crypto_stream_chacha20_ietf_xor = function (c, cpos, m, mpos, clen, n, k
xor.final() xor.final()
} }
exports.crypto_stream_chacha20_ietf_xor_ic = function (c, m, mlen, n, ic, k) { exports.crypto_stream_chacha20_ietf_xor_ic = function (c, m, n, ic, k) {
if (mlen) return exports.crypto_stream_chacha20_ietf_xor_ic(c, m.subarray(0, mlen), null, n, ic, k)
assert(n.byteLength === exports.crypto_stream_chacha20_ietf_NONCEBYTES, assert(n.byteLength === exports.crypto_stream_chacha20_ietf_NONCEBYTES,
'n should be crypto_stream_chacha20_ietf_NONCEBYTES') 'n should be crypto_stream_chacha20_ietf_NONCEBYTES')
assert(k.byteLength === exports.crypto_stream_chacha20_ietf_KEYBYTES, assert(k.byteLength === exports.crypto_stream_chacha20_ietf_KEYBYTES,
@ -136,7 +124,7 @@ Chacha20.prototype.update = function (output, input) {
// input position // input position
let j = 0 let j = 0
let keyStream = chacha20_block(this.state) let keyStream = chacha20Block(this.state)
// try to finsih the current block // try to finsih the current block
while (offset > 0 && len > 0) { while (offset > 0 && len > 0) {
@ -148,7 +136,7 @@ Chacha20.prototype.update = function (output, input) {
// encrypt rest block at a time // encrypt rest block at a time
while (len > 0) { while (len > 0) {
keyStream = chacha20_block(this.state) keyStream = chacha20Block(this.state)
// less than a full block remaining // less than a full block remaining
if (len < 64) { if (len < 64) {
@ -174,7 +162,7 @@ Chacha20.prototype.final = function () {
this.finalized = true this.finalized = true
} }
function chacha20_block (state) { function chacha20Block (state) {
// working state // working state
const ws = new Uint32Array(16) const ws = new Uint32Array(16)
for (let i = 16; i--;) ws[i] = state[i] for (let i = 16; i--;) ws[i] = state[i]