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

lint, typo

Browse Source
This commit is contained in:
Theron Spiegl 2020-11-22 14:55:13 -06:00
parent 58216d8ca6
commit b4b58c62a6
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
crypto_secretstream.js
View File

@ -112,15 +112,15 @@ function crypto_secretstream_xchacha20poly1305_init_push (state, out, k) {
// return 0; // return 0;
// } // }
function crypto_secretstream_xchacha20poly1305_init_pull(state, _in, k) { function crypto_secretstream_xchacha20poly1305_init_pull (state, _in, k) {
assert(state instanceof crypto_secretstream_xchacha20poly1305_state, assert(state instanceof crypto_secretstream_xchacha20poly1305_state,
'state not instance of crypto_secretstream_xchacha20poly1305_state') 'state not instance of crypto_secretstream_xchacha20poly1305_state')
assert(_in instanceof Uint8Array && out.length === crypto_secretstream_xchacha20poly1305_HEADERBYTES, assert(_in instanceof Uint8Array && _in.length === crypto_secretstream_xchacha20poly1305_HEADERBYTES,
'_in not byte array of length crypto_secretstream_xchacha20poly1305_HEADERBYTES') '_in not byte array of length crypto_secretstream_xchacha20poly1305_HEADERBYTES')
assert(k instanceof Uint8Array && k.length === crypto_secretstream_xchacha20poly1305_KEYBYTES, assert(k instanceof Uint8Array && k.length === crypto_secretstream_xchacha20poly1305_KEYBYTES,
'k not byte array of length crypto_secretstream_xchacha20poly1305_KEYBYTES') 'k not byte array of length crypto_secretstream_xchacha20poly1305_KEYBYTES')
crypto_core_hchacha20(state.k, _in, k, null); crypto_core_hchacha20(state.k, _in, k, null)
_crypto_secretstream_xchacha20poly1305_counter_reset(state); _crypto_secretstream_xchacha20poly1305_counter_reset(state)
for (let i = 0; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) { for (let i = 0; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
state.nonce[i + crypto_secretstream_xchacha20poly1305_COUNTERBYTES] = _in[i + crypto_core_hchacha20_INPUTBYTES] state.nonce[i + crypto_secretstream_xchacha20poly1305_COUNTERBYTES] = _in[i + crypto_core_hchacha20_INPUTBYTES]
@ -129,7 +129,6 @@ function crypto_secretstream_xchacha20poly1305_init_pull(state, _in, k) {
return 0 return 0
} }
// void // void
// crypto_secretstream_xchacha20poly1305_rekey // crypto_secretstream_xchacha20poly1305_rekey
// (crypto_secretstream_xchacha20poly1305_state *state) // (crypto_secretstream_xchacha20poly1305_state *state)
@ -157,28 +156,28 @@ function crypto_secretstream_xchacha20poly1305_init_pull(state, _in, k) {
// } // }
// _crypto_secretstream_xchacha20poly1305_counter_reset(state); // _crypto_secretstream_xchacha20poly1305_counter_reset(state);
// } // }
function crypto_secretstream_xchacha20poly1305_rekey(state) { function crypto_secretstream_xchacha20poly1305_rekey (state) {
assert(state instanceof crypto_secretstream_xchacha20poly1305_state, assert(state instanceof crypto_secretstream_xchacha20poly1305_state,
'state not instance of crypto_secretstream_xchacha20poly1305_state') 'state not instance of crypto_secretstream_xchacha20poly1305_state')
const new_key_and_inonce = new Uint8Array( const new_key_and_inonce = new Uint8Array(
crypto_stream_chacha20_ietf_KEYBYTES + crypto_secretstream_xchacha20poly1305_INONCEBYTES) crypto_stream_chacha20_ietf_KEYBYTES + crypto_secretstream_xchacha20poly1305_INONCEBYTES)
let i let i
for (i = 0; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) { for (i = 0; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
new_key_and_inonce[i] = state.k[i] new_key_and_inonce[i] = state.k[i]
} }
for (i = 0; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) { for (i = 0; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i] = new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i] =
state.nonce[crypto_secretstream_xchacha20poly1305_COUNTERBYTES + i] state.nonce[crypto_secretstream_xchacha20poly1305_COUNTERBYTES + i]
} }
crypto_stream_chacha20_ietf_xor(new_key_and_inonce, new_key_and_inonce, state.nonce, state.k) crypto_stream_chacha20_ietf_xor(new_key_and_inonce, new_key_and_inonce, state.nonce, state.k)
for (i = 0; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) { for (i = 0; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
state.k[i] = new_key_and_inonce[i]; state.k[i] = new_key_and_inonce[i]
} }
for (i = 0; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) { for (i = 0; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
state.nonce[crypto_secretstream_xchacha20poly1305_COUNTERBYTES + i] = state.nonce[crypto_secretstream_xchacha20poly1305_COUNTERBYTES + i] =
new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i] new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i]
} }
_crypto_secretstream_xchacha20poly1305_counter_reset(state) _crypto_secretstream_xchacha20poly1305_counter_reset(state)
} }
// int // int
@ -388,10 +387,9 @@ function crypto_secretstream_xchacha20poly1305_rekey(state) {
// return crypto_secretstream_xchacha20poly1305_TAG_FINAL; // return crypto_secretstream_xchacha20poly1305_TAG_FINAL;
// } // }
module.exports = { module.exports = {
crypto_secretstream_xchacha20poly1305_keygen, crypto_secretstream_xchacha20poly1305_keygen,
crypto_secretstream_xchacha20poly1305_init_push, crypto_secretstream_xchacha20poly1305_init_push,
crypto_secretstream_xchacha20poly1305_init_pull, crypto_secretstream_xchacha20poly1305_init_pull,
crypto_secretstream_xchacha20poly1305_rekey, crypto_secretstream_xchacha20poly1305_rekey
} }