Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
extend-exclude = [
"*.json",
"*.lock",
"*.bin",
"*.elf",
"*.pdf",
"*.png",
"*.text",
"*.bak",
"*.svg",
".git/",
"SECURITY.md"
Expand All @@ -16,4 +22,10 @@ sie = "sie"
Sie = "Sie"
tou = "tou"
leafs = "leafs"
LEAFS = "LEAFS"
LEAFS = "LEAFS"
INOT = "INOT"
inot = "inot"

[type.asm.extend-words]
Wich = "Wich"
TRE = "TRE"
6 changes: 3 additions & 3 deletions blake2s_u32/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub const CONFIGURED_IV: [u32; 8] = const {
result
};

pub const EXNTENDED_CONFIGURED_IV: [u32; BLAKE2S_EXTENDED_STATE_WIDTH_IN_U32_WORDS] = const {
pub const EXTENDED_CONFIGURED_IV: [u32; BLAKE2S_EXTENDED_STATE_WIDTH_IN_U32_WORDS] = const {
let mut result = [0u32; BLAKE2S_EXTENDED_STATE_WIDTH_IN_U32_WORDS];
let mut i = 0;
while i < 8 {
Expand All @@ -78,7 +78,7 @@ pub use self::state_with_extended_control::Blake2RoundFunctionEvaluator as Deleg

pub mod state_with_extended_control_flags {
use crate::BLAKE2S_BLOCK_SIZE_BYTES;
use crate::EXNTENDED_CONFIGURED_IV;
use crate::EXTENDED_CONFIGURED_IV;

pub const REDUCE_ROUNDS_BIT_IDX: usize = 0;
pub const INPUT_IS_RIGHT_NODE_BIT_IDX: usize = 1;
Expand All @@ -89,7 +89,7 @@ pub mod state_with_extended_control_flags {
pub const TEST_IF_COMPRESSION_MODE_MASK: u32 = 1 << COMPRESSION_MODE_BIT_IDX;

pub const COMPRESSION_MODE_EXTENDED_CONFIGURED_IV: [u32; 16] = const {
let mut result = EXNTENDED_CONFIGURED_IV;
let mut result = EXTENDED_CONFIGURED_IV;
result[12] ^= BLAKE2S_BLOCK_SIZE_BYTES as u32;
result[14] ^= 0xffffffff;

Expand Down
16 changes: 8 additions & 8 deletions blake2s_u32/src/vectorized_impls/arm_neon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,25 +128,25 @@ impl State {
use core::arch::aarch64::vld1q_u32;

Self([
vld1q_u32(&EXNTENDED_CONFIGURED_IV[0] as *const u32),
vld1q_u32(&EXNTENDED_CONFIGURED_IV[4] as *const u32),
vld1q_u32(&EXNTENDED_CONFIGURED_IV[8] as *const u32),
vld1q_u32(&EXNTENDED_CONFIGURED_IV[12] as *const u32),
vld1q_u32(&EXTENDED_CONFIGURED_IV[0] as *const u32),
vld1q_u32(&EXTENDED_CONFIGURED_IV[4] as *const u32),
vld1q_u32(&EXTENDED_CONFIGURED_IV[8] as *const u32),
vld1q_u32(&EXTENDED_CONFIGURED_IV[12] as *const u32),
])
}

#[inline(always)]
unsafe fn partial_reset(&mut self) {
use core::arch::aarch64::vld1q_u32;
self.0[0] = vld1q_u32(&EXNTENDED_CONFIGURED_IV[0] as *const u32);
self.0[1] = vld1q_u32(&EXNTENDED_CONFIGURED_IV[4] as *const u32);
self.0[0] = vld1q_u32(&EXTENDED_CONFIGURED_IV[0] as *const u32);
self.0[1] = vld1q_u32(&EXTENDED_CONFIGURED_IV[4] as *const u32);
}

#[inline(always)]
unsafe fn reset_for_round(&mut self, t: u32, is_last_round: bool) {
use core::arch::aarch64::vld1q_u32;
self.0[2] = vld1q_u32(&EXNTENDED_CONFIGURED_IV[8] as *const u32);
let el = vld1q_u32(&EXNTENDED_CONFIGURED_IV[12] as *const u32);
self.0[2] = vld1q_u32(&EXTENDED_CONFIGURED_IV[8] as *const u32);
let el = vld1q_u32(&EXTENDED_CONFIGURED_IV[12] as *const u32);
let xor_in = vld1q_u32(&[t, 0, (is_last_round as u32) * 0xffffffff, 0] as *const u32);
use core::arch::aarch64::veorq_u32;
let el = veorq_u32(el, xor_in);
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/bigint_with_control/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/blake2_with_compression/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/keccak_special5/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/reduced_risc_v_machine/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/risc_v_cycles/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/unrolled_circuits/mul_div/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Loading