TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-23 20:37:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

x.crypto.chacha20: adds some missing bits into stream reset (#25321)

Browse Source
This commit is contained in:
blackshirt 2025-09-16 19:04:54 +07:00 committed by GitHub
parent 95e1b7c14c
commit ace3eb2ddb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/x/crypto/chacha20/chacha.v
View File

@ -40,6 +40,7 @@ pub fn encrypt(key []u8, nonce []u8, plaintext []u8) ![]u8 {
mut stream := new_stream(key, nonce)!
mut dst := []u8{len: plaintext.len}
stream.keystream_full(mut dst, plaintext)
unsafe { stream.reset() }
return dst
}
@ -49,6 +50,7 @@ pub fn decrypt(key []u8, nonce []u8, ciphertext []u8) ![]u8 {
mut stream := new_stream(key, nonce)!
mut dst := []u8{len: ciphertext.len}
stream.keystream_full(mut dst, ciphertext)
unsafe { stream.reset() }
return dst
}

11
vlib/x/crypto/chacha20/stream.v
View File

@ -9,7 +9,7 @@ import encoding.binary
// max_64bit_counter is a 64-bit maximum internal counter of original ChaCha20 variant.
const max_64bit_counter = max_u64
// max_64bit_counter is a 32-bit maximum internal counter of standard IETF ChaCha20 variant.
// max_32bit_counter is a 32-bit maximum internal counter of standard IETF ChaCha20 variant.
const max_32bit_counter = u64(max_u32)
// default chacha20 quarter round number
@ -107,11 +107,16 @@ fn new_stream(key []u8, nonce []u8) !Stream {
// reset resets internal stream
@[unsafe]
fn (mut s Stream) reset() {
s.mode = .standard
s.extended = false
unsafe {
_ := vmemset(&s.key, 0, 32)
_ := vmemset(&s.nonce, 0, 16)
}
s.precomp = false
s.p1, s.p5, s.p9, s.p13 = u32(0), u32(0), u32(0), u32(0)
s.p2, s.p6, s.p10, s.p14 = u32(0), u32(0), u32(0), u32(0)
s.p3, s.p7, s.p11, s.p15 = u32(0), u32(0), u32(0), u32(0)
}
// new_curr_state creates a new State from current stream
@ -372,6 +377,8 @@ fn clone_state(s State) State {
return sc
}
// qround_on_state_with_quartet run qround_on_state by previously set up state values in offset
// (a,b,c,d) with values from quartet (q0, q1, q2, q3)
@[direct_array_access]
fn qround_on_state_with_quartet(mut s State, q0 u32, q1 u32, q2 u32, q3 u32, a int, b int, c int, d int) {
s[a] = q0
@ -414,7 +421,7 @@ mut:
e3 u32
}
// chacha20 quarter round run on Quartet and stored into res
// qround_on_quartet runs chacha20 quarter round run on Quartet q.
fn qround_on_quartet(mut q Quartet) {
// a += b; d ^= a; d <<<= 16;
q.e0 += q.e1