NEKO v0.2.1 spec, 192 bit mode, const type asserts #4

.tangled/workflows/miri.yml

reviewed

This file has not been changed.

src/handshake.rs

reviewed

This file has not been changed.

src/lib.rs

reviewed

This file has not been changed.

wharrgarbl-neko/SPEC.md

reviewed

This file has not been changed.

wharrgarbl-neko/src/kats.rs

reviewed

This file has not been changed.

+9 -3

wharrgarbl-neko/src/lib.rs

reviewed

··· 121 121 122 122 #[inline(always)] 123 123 #[must_use] 124 124 - pub(crate) fn block(&self) -> usize { 124 124 + fn block(&self) -> usize { 125 125 let block = usize::from(self.raw_position()).div_ceil(U64_CHUNK); 126 126 debug_assert!(block <= Sec::BLOCK_RATE); 127 127 if block <= Sec::BLOCK_RATE { ··· 146 146 } 147 147 148 148 #[inline(always)] 149 149 - pub(crate) fn advance_position(&mut self, advance: usize) { 149 149 + fn advance_position(&mut self, advance: usize) { 150 150 let updated = self.position + advance; 151 151 assert!(updated <= Sec::POS_RATE); 152 152 self.position = updated; 153 153 - } 153 153 + } 154 154 + 155 155 + #[inline(always)] 156 156 + #[must_use] 157 157 + fn should_permute(&self) -> bool { 158 158 + self.raw_position() == Sec::POS_RATE as u8 159 159 + } 154 160 155 161 #[inline] 156 162 #[track_caller]

+7 -9

wharrgarbl-neko/src/operators.rs

reviewed

··· 21 21 }; 22 22 23 23 while !self.data.is_empty() { 24 24 - let mut block = self.neko.block(); 25 25 - 26 26 - if block == S::BLOCK_RATE { 24 24 + if self.neko.should_permute() { 27 25 self.neko.permutation_p12(ops::CONT); 28 28 - block = 0; 29 26 } 30 27 28 28 + let block = self.neko.block(); 29 29 + 31 30 // Trans the neko 32 31 let transed_bytes = self.neko.state[block..S::BLOCK_RATE].as_mut_bytes(); 33 32 ··· 92 91 }; 93 92 94 93 while !self.data.is_empty() { 95 95 - let mut block = self.neko.block(); 96 96 - 97 97 - if block == S::BLOCK_RATE { 94 94 + if self.neko.should_permute() { 98 95 self.neko.permutation_p12(ops::CONT); 99 99 - block = 0; 100 96 } 101 97 98 98 + let block = self.neko.block(); 99 99 + 102 100 // Trans the neko 103 101 let transed_bytes = self.neko.state[block..S::BLOCK_RATE].as_mut_bytes(); 104 102 ··· 110 108 111 109 self.data = &self.data[advanced..]; 112 110 113 113 - self.neko.position += advanced; 111 111 + self.neko.advance_position(advanced); 114 112 } 115 113 } 116 114

wharrgarbl-neko/src/traits.rs

reviewed

This file has not been changed.