-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update more of the Kyber spec to FIPS 203 standard. (#82)
* Updated serialization functions and CCA KEM functions * Removed almost all of the BitVector helper code and replaced it by 2 type aliases
- Loading branch information
Showing
11 changed files
with
897 additions
and
854 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,150 +1,2 @@ | ||
| pub struct BitVector { | ||
| bits: Vec<u8>, | ||
| } | ||
|
|
||
| pub struct BitVectorChunks<'a> { | ||
| chunk_iterator: std::slice::Chunks<'a, u8>, | ||
| } | ||
|
|
||
| impl BitVectorChunks<'_> { | ||
| pub fn next(&mut self) -> Option<BitVector> { | ||
| self.chunk_iterator.next().map(|bits| BitVector { | ||
| bits: bits.to_vec(), | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| impl IntoIterator for BitVector { | ||
| type Item = u8; | ||
| type IntoIter = <Vec<u8> as IntoIterator>::IntoIter; | ||
|
|
||
| fn into_iter(self) -> Self::IntoIter { | ||
| self.bits.into_iter() | ||
| } | ||
| } | ||
|
|
||
| impl From<&[u8]> for BitVector { | ||
| fn from(bytes: &[u8]) -> Self { | ||
| let mut out = Vec::with_capacity(bytes.len() * 8); | ||
|
|
||
| for byte in bytes { | ||
| for j in 0..u8::BITS { | ||
| out.push((byte >> j) & 1); | ||
| } | ||
| } | ||
|
|
||
| Self { bits: out } | ||
| } | ||
| } | ||
|
|
||
| impl BitVector { | ||
| pub fn new(bits: Vec<u8>) -> Self { | ||
| for bit in &bits { | ||
| assert!(*bit == 0 || *bit == 1); | ||
| } | ||
|
|
||
| Self { bits } | ||
| } | ||
| pub fn chunks(&self, chunk_size: usize) -> BitVectorChunks { | ||
| BitVectorChunks { | ||
| chunk_iterator: self.bits.chunks(chunk_size), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub trait LittleEndianBitStream { | ||
| fn nth_bit(&self, n: usize) -> u8; | ||
| fn iter(&self) -> LittleEndianBitStreamIter<'_>; | ||
| } | ||
|
|
||
| pub struct LittleEndianBitStreamIter<'a> { | ||
| bytes: &'a [u8], | ||
| bit: usize, | ||
| } | ||
|
|
||
| impl Iterator for LittleEndianBitStreamIter<'_> { | ||
| type Item = u8; | ||
|
|
||
| fn next(&mut self) -> Option<Self::Item> { | ||
| let byte_index = self.bit / 8; | ||
| if byte_index >= self.bytes.len() { | ||
| return None; | ||
| } | ||
|
|
||
| let out = self.bytes.nth_bit(self.bit); | ||
| self.bit += 1; | ||
|
|
||
| Some(out) | ||
| } | ||
| } | ||
|
|
||
| impl LittleEndianBitStream for &[u8] { | ||
| fn nth_bit(&self, n: usize) -> u8 { | ||
| let byte = n / 8; | ||
| let byte_bit = n % 8; | ||
| (self[byte] >> byte_bit) & 1 | ||
| } | ||
|
|
||
| fn iter(&self) -> LittleEndianBitStreamIter<'_> { | ||
| LittleEndianBitStreamIter { | ||
| bytes: self, | ||
| bit: 0, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl LittleEndianBitStream for Vec<u8> { | ||
| fn nth_bit(&self, n: usize) -> u8 { | ||
| self.as_slice().nth_bit(n) | ||
| } | ||
|
|
||
| fn iter(&self) -> LittleEndianBitStreamIter<'_> { | ||
| LittleEndianBitStreamIter { | ||
| bytes: self, | ||
| bit: 0, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use crate::bit_vector::LittleEndianBitStream; | ||
|
|
||
| #[test] | ||
| fn bits() { | ||
| // 00000001 00000010 00000011 00000100 00000101 00000110 ... | ||
| // 1 2 3 4 5 6 | ||
| let v = vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]; | ||
|
|
||
| let mut n = 0; | ||
|
|
||
| assert_eq!(v.nth_bit(n), 1); | ||
| n += 1; | ||
|
|
||
| for n_ in n..8 { | ||
| assert_eq!(v.nth_bit(n_), 0); | ||
| } | ||
| n = 8; | ||
|
|
||
| assert_eq!(v.nth_bit(n), 0); | ||
| n += 1; | ||
|
|
||
| assert_eq!(v.nth_bit(n), 1); | ||
| n += 1; | ||
|
|
||
| for n_ in n..16 { | ||
| assert_eq!(v.nth_bit(n_), 0); | ||
| } | ||
| n = 16; | ||
|
|
||
| assert_eq!(v.nth_bit(n), 1); | ||
| n += 1; | ||
|
|
||
| assert_eq!(v.nth_bit(n), 1); | ||
|
|
||
| for n in v.iter() { | ||
| eprint!("{n}"); | ||
| } | ||
| eprintln!(); | ||
| } | ||
| } | ||
| pub type BitVector = Vec<u8>; | ||
| pub type BitSlice<'a> = &'a [u8]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.