ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 22:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

core/crypto/chacha20: Change API terminology to be consistent with AES

Browse Source
This commit is contained in:
Yawning Angel
2024-08-10 18:32:37 +09:00
parent 14ceb0b19d
commit b381791f42
10 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/crypto/chacha20/chacha20.odin
+13 -13
View File
@@ -13,10 +13,10 @@ import "core:mem"
// KEY_SIZE is the (X)ChaCha20 key size in bytes.
KEY_SIZE :: _chacha20.KEY_SIZE
// NONCE_SIZE is the ChaCha20 nonce size in bytes.
NONCE_SIZE :: _chacha20.NONCE_SIZE
// XNONCE_SIZE is the XChaCha20 nonce size in bytes.
XNONCE_SIZE :: _chacha20.XNONCE_SIZE
// IV_SIZE is the ChaCha20 IV size in bytes.
IV_SIZE :: _chacha20.IV_SIZE
// XIV_SIZE is the XChaCha20 IV size in bytes.
XIV_SIZE :: _chacha20.XIV_SIZE
// Context is a ChaCha20 or XChaCha20 instance.
Context :: struct {
@@ -25,27 +25,27 @@ Context :: struct {
}
// init inititializes a Context for ChaCha20 or XChaCha20 with the provided
// key and nonce.
init :: proc(ctx: ^Context, key, nonce: []byte, impl := Implementation.Simd256) {
// key and iv.
init :: proc(ctx: ^Context, key, iv: []byte, impl := Implementation.Simd256) {
if len(key) != KEY_SIZE {
panic("crypto/chacha20: invalid (X)ChaCha20 key size")
}
if l := len(nonce); l != NONCE_SIZE && l != XNONCE_SIZE {
panic("crypto/chacha20: invalid (X)ChaCha20 nonce size")
if l := len(iv); l != IV_SIZE && l != XIV_SIZE {
panic("crypto/chacha20: invalid (X)ChaCha20 IV size")
}
k, n := key, nonce
k, n := key, iv
init_impl(ctx, impl)
is_xchacha := len(nonce) == XNONCE_SIZE
is_xchacha := len(iv) == XIV_SIZE
if is_xchacha {
sub_nonce: [NONCE_SIZE]byte
sub_iv: [IV_SIZE]byte
sub_key := ctx._state._buffer[:KEY_SIZE]
hchacha20(sub_key, k, n, ctx._impl)
k = sub_key
copy(sub_nonce[4:], n[16:])
n = sub_nonce[:]
copy(sub_iv[4:], n[16:])
n = sub_iv[:]
}
_chacha20.init(&ctx._state, k, n, is_xchacha)
core/crypto/chacha20/chacha20_impl.odin
+4 -4
View File
@@ -40,13 +40,13 @@ stream_blocks :: proc(ctx: ^Context, dst, src: []byte, nr_blocks: int) {
}
@(private)
hchacha20 :: proc "contextless" (dst, key, nonce: []byte, impl: Implementation) {
hchacha20 :: proc "contextless" (dst, key, iv: []byte, impl: Implementation) {
switch impl {
case .Simd256:
simd256.hchacha20(dst, key, nonce)
simd256.hchacha20(dst, key, iv)
case .Simd128:
simd128.hchacha20(dst, key, nonce)
simd128.hchacha20(dst, key, iv)
case .Portable:
ref.hchacha20(dst, key, nonce)
ref.hchacha20(dst, key, iv)
}
}