From 5702d48833c510f46150b4b9366a08a3196b0fe6 Mon Sep 17 00:00:00 2001 From: Sachymetsu Date: Mon, 27 Apr 2026 17:21:35 +0200 Subject: [PATCH] Upgrade to NEKO --- Cargo.lock | 42 +++++++++++++++++++++------------------- striker-proto/src/lib.rs | 20 +++++++++---------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfedd71..e33dc67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -763,9 +763,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.60" +version = "1.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" dependencies = [ "find-msvc-tools", "jobserver", @@ -1476,9 +1476,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hybrid-array" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" +checksum = "08d46837a0ed51fe95bd3b05de33cd64a1ee88fc797477ca48446872504507c5" dependencies = [ "ctutils", "typenum", @@ -1569,9 +1569,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jiff" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" +checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -1584,9 +1584,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" +checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7" dependencies = [ "proc-macro2", "quote", @@ -1707,7 +1707,6 @@ checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "hybrid-array", ] [[package]] @@ -1740,9 +1739,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libm" @@ -3130,7 +3129,7 @@ dependencies = [ "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 1.0.1", + "winnow 1.0.2", ] [[package]] @@ -3139,7 +3138,7 @@ version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow 1.0.1", + "winnow 1.0.2", ] [[package]] @@ -3591,37 +3590,40 @@ dependencies = [ [[package]] name = "wharrgarbl" version = "0.1.0" -source = "git+https://tangled.org/sachy.dev/wharrgarbl#f10abbd1e303519f7d154cbe6f8074512495d5f2" +source = "git+https://tangled.org/sachy.dev/wharrgarbl#671f1df226f306aa04890735116911cea9e3b6b1" dependencies = [ "aead", "ctutils", "hybrid-array", "ml-kem", "rand_core 0.10.1", - "wharrgarbl-strobe", + "wharrgarbl-neko", "wharrgarbl-utils", "zeroize", ] [[package]] -name = "wharrgarbl-strobe" +name = "wharrgarbl-neko" version = "0.1.0" -source = "git+https://tangled.org/sachy.dev/wharrgarbl#f10abbd1e303519f7d154cbe6f8074512495d5f2" +source = "git+https://tangled.org/sachy.dev/wharrgarbl#671f1df226f306aa04890735116911cea9e3b6b1" dependencies = [ "aead", "ctutils", "hybrid-array", "keccak", "wharrgarbl-utils", + "zerocopy", "zeroize", ] [[package]] name = "wharrgarbl-utils" version = "0.1.0" -source = "git+https://tangled.org/sachy.dev/wharrgarbl#f10abbd1e303519f7d154cbe6f8074512495d5f2" +source = "git+https://tangled.org/sachy.dev/wharrgarbl#671f1df226f306aa04890735116911cea9e3b6b1" dependencies = [ "aead", + "ctutils", + "zeroize", ] [[package]] @@ -3681,9 +3683,9 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" dependencies = [ "memchr", ] diff --git a/striker-proto/src/lib.rs b/striker-proto/src/lib.rs index 92720f2..5c6c8cd 100644 --- a/striker-proto/src/lib.rs +++ b/striker-proto/src/lib.rs @@ -4,9 +4,9 @@ use aead::Buffer; use alloc::{string::String, vec::Vec}; use rand_core::CryptoRng; use wharrgarbl::{ - ClientHandshake128, Sec128, ServerHandshake128, + NekoClientHandshake128, Neko128, NekoServerHandshake128, handshake::{ClientHandshake, ServerHandshake}, - transport::{AeadState, RecvState, SendState}, + transport::{AeadTranport, RecvState, SendState}, }; extern crate alloc; @@ -62,7 +62,7 @@ pub enum Update { } pub struct ClientBuilder { - handshake: ClientHandshake128, + handshake: NekoClientHandshake128, } impl ClientBuilder { @@ -88,7 +88,7 @@ impl ClientBuilder { } pub struct ServerBuilder { - handshake: ServerHandshake128, + handshake: NekoServerHandshake128, } impl ServerBuilder { @@ -107,7 +107,7 @@ impl ServerBuilder { } } -pub struct Client(AeadState); +pub struct Client(AeadTranport); impl Client { pub fn split(&self) -> (ClientSender<'_>, ClientReceiver<'_>) { @@ -117,7 +117,7 @@ impl Client { } } -pub struct ClientSender<'a>(SendState<'a, Sec128>); +pub struct ClientSender<'a>(SendState<'a, Neko128>); impl ClientSender<'_> { pub fn encode_request( @@ -135,7 +135,7 @@ impl ClientSender<'_> { } } -pub struct ClientReceiver<'a>(RecvState<'a, Sec128>); +pub struct ClientReceiver<'a>(RecvState<'a, Neko128>); impl ClientReceiver<'_> { pub fn decode_response(&mut self, msg: &mut dyn Buffer) -> aead::Result { @@ -145,7 +145,7 @@ impl ClientReceiver<'_> { } } -pub struct Server(AeadState); +pub struct Server(AeadTranport); impl Server { pub fn split(&self) -> (ServerSender<'_>, ServerReceiver<'_>) { @@ -155,7 +155,7 @@ impl Server { } } -pub struct ServerSender<'a>(SendState<'a, Sec128>); +pub struct ServerSender<'a>(SendState<'a, Neko128>); impl ServerSender<'_> { pub fn encode_response( @@ -173,7 +173,7 @@ impl ServerSender<'_> { } } -pub struct ServerReceiver<'a>(RecvState<'a, Sec128>); +pub struct ServerReceiver<'a>(RecvState<'a, Neko128>); impl ServerReceiver<'_> { pub fn decode_request(&mut self, msg: &mut dyn Buffer) -> aead::Result { -- 2.51.2