cerc-io/sodium-javascript
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing bugs

Browse Source
This commit is contained in:
Theron 2020-11-24 22:36:09 -06:00
parent 6511bdff34
commit 55f831d826
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto_secretstream.js
View File

@ -117,7 +117,6 @@ function crypto_secretstream_xchacha20poly1305_rekey (state) {
} }
function crypto_secretstream_xchacha20poly1305_push (state, out, m, ad, tag, outputs) { function crypto_secretstream_xchacha20poly1305_push (state, out, m, ad, tag, outputs) {
console.log('pushin')
const block = new Uint8Array(64) const block = new Uint8Array(64)
const slen = new Uint8Array(8) const slen = new Uint8Array(8)
@ -170,13 +169,11 @@ function crypto_secretstream_xchacha20poly1305_push (state, out, m, ad, tag, out
} }
function crypto_secretstream_xchacha20poly1305_pull (state, m, _in, ad, outputs) { function crypto_secretstream_xchacha20poly1305_pull (state, m, _in, ad, outputs) {
console.log('pullin')
const block = new Uint8Array(64) const block = new Uint8Array(64)
const slen = new Uint8Array(8) const slen = new Uint8Array(8)
const mac = new Uint8Array(crypto_onetimeauth_poly1305_BYTES) const mac = new Uint8Array(crypto_onetimeauth_poly1305_BYTES)
if (_in.byteLength < crypto_secretstream_xchacha20poly1305_ABYTES) { if (_in.byteLength < crypto_secretstream_xchacha20poly1305_ABYTES) {
console.log('bailing at _in.byteLength < crypto_secretstream_xchacha20poly1305_ABYTES')
return -1 return -1
} }
@ -210,16 +207,15 @@ function crypto_secretstream_xchacha20poly1305_pull (state, m, _in, ad, outputs)
poly.update(slen, slen.byteLength) poly.update(slen, slen.byteLength)
poly.finish(mac, 0) poly.finish(mac, 0)
const stored_mac = _in.subarray(c + mlen, _in.length) const stored_mac = _in.subarray(1 + mlen, _in.length)
for (let i = 0; i < mac.length; i++) { for (let i = 0; i < mac.length; i++) {
if (mac[i] !== stored_mac[i]) { if (mac[i] !== stored_mac[i]) {
console.log(`mac length: ${mac.length}\nmac: ${mac}\nstored_mac: ${stored_mac}`)
mac.fill(0) mac.fill(0)
return -1 return -1
} }
} }
crypto_stream_chacha20_ietf_xor_ic(m, c, state.nonce, 2, state.k) crypto_stream_chacha20_ietf_xor_ic(m, c.subarray(m.length), state.nonce, 2, state.k)
xor_buf(state.nonce.subarray(crypto_secretstream_xchacha20poly1305_COUNTERBYTES, state.nonce.length), xor_buf(state.nonce.subarray(crypto_secretstream_xchacha20poly1305_COUNTERBYTES, state.nonce.length),
mac, crypto_secretstream_xchacha20poly1305_INONCEBYTES) mac, crypto_secretstream_xchacha20poly1305_INONCEBYTES)
sodium_increment(state.nonce) sodium_increment(state.nonce)
@ -367,6 +363,7 @@ function test_secretstream () {
ret = crypto_secretstream_xchacha20poly1305_pull(state, m1, c1, 0, outputs) ret = crypto_secretstream_xchacha20poly1305_pull(state, m1, c1, 0, outputs)
assert(ret === 0, 'first pull failed') assert(ret === 0, 'first pull failed')
assert(outputs.tag === 0, 'tag pull failed') assert(outputs.tag === 0, 'tag pull failed')
console.log(`m1: ${m1}\n\nm1_: ${m1_}`)
assert(sodium_memcmp(m1, m1_), 'failed m1 memcmp') assert(sodium_memcmp(m1, m1_), 'failed m1 memcmp')
assert(outputs.res_len === m1_len) assert(outputs.res_len === m1_len)
} }

1
crypto_stream_chacha20.js
View File

@ -70,7 +70,6 @@ exports.crypto_stream_chacha20_ietf_xor_ic = function (c, m, n, ic, k) {
'k should be crypto_stream_chacha20_ietf_KEYBYTES') 'k should be crypto_stream_chacha20_ietf_KEYBYTES')
const xor = new Chacha20(n, k, ic) const xor = new Chacha20(n, k, ic)
console.log(`c len: ${c.length}, m len: ${m.length}`)
xor.update(c, m) xor.update(c, m)
xor.final() xor.final()
} }