Skip to content

Commit

Permalink
Merge pull request #15 from zkemail/feat/interstiail-hash-var-length
Browse files Browse the repository at this point in the history 
make variable length interstitial partial hash
  • Loading branch information
@jp4g
jp4g authored Oct 28, 2024
2 parents 14f3faf + 26d9070 commit 61a6661
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 36 deletions.
80 changes: 44 additions & 36 deletions lib/src/partial_hash.nr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,11 @@ pub fn partial_sha256_var_start<let N: u32>(msg: [u8; N]) -> [u32; 8] {
* @param N - the maximum length of the message to hash
* @param h - the intermediate hash state
* @param msg - the preimage to hash
* @param message_size - the actual length of the preimage to hash
* @return the intermediate hash state after compressing in msg to h
*/
pub fn partial_sha256_var_interstitial<let N: u32>(mut h: [u32; 8], msg: [u8; N]) -> [u32; 8] {
pub fn partial_sha256_var_interstitial<let N: u32>(mut h: [u32; 8], msg: [u8; N], message_size: u32) -> [u32; 8] {
assert(message_size % BLOCK_SIZE == 0, "Message size must be a multiple of the block size");
let num_blocks = N / BLOCK_SIZE;
let mut msg_block: [u8; BLOCK_SIZE] = [0; BLOCK_SIZE];
let mut msg_byte_ptr = 0; // Pointer into msg_block
Expand All @@ -145,7 +147,7 @@ pub fn partial_sha256_var_interstitial<let N: u32>(mut h: [u32; 8], msg: [u8; N]

// If the block is filled, compress it.
// An un-filled block is handled after this loop.
if (msg_start < N) & (msg_byte_ptr == BLOCK_SIZE) {
if (msg_start < N) & (msg_byte_ptr == BLOCK_SIZE) & (msg_start < message_size){
h = sha256_compression(msg_u8_to_u32(msg_block), h);
}
}
Expand Down Expand Up @@ -341,59 +343,65 @@ fn hash_final_block(msg_block: [u8; BLOCK_SIZE], mut state: [u32; 8]) -> [u8; 32
out_h
}

global DATA: [u8; 192] = [
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
185, 186, 187, 188, 189, 190, 191
];

#[test]
fn test_partial_hash() {
let data = [
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
185, 186, 187, 188, 189, 190, 191
];
let mut data0 = [0; 128];
for i in 0..data0.len() {
data0[i] = data[i];
data0[i] = DATA[i];
}
let mut data1 = [0; 64];
for i in 0..data1.len() {
data1[i] = data[data0.len() + i];
data1[i] = DATA[data0.len() + i];
}
let state = partial_sha256_var_start(data0);
let hash = partial_sha256_var_end(state, data1, data1.len() as u64, data.len() as u64);
let correct_hash = std::hash::sha256_var(data, data.len() as u64);
let hash = partial_sha256_var_end(state, data1, data1.len() as u64, DATA.len() as u64);
let correct_hash = std::hash::sha256_var(DATA, DATA.len() as u64);
assert_eq(hash, correct_hash);
}

#[test]
fn test_partial_hash_interstitial() {
let data = [
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
185, 186, 187, 188, 189, 190, 191
];
let mut data0 = [0; 64];
let mut data1 = [0; 64];
let mut data2 = [0; 64];
for i in 0..data0.len() {
data0[i] = data[i];
data1[i] = data[64 + i];
data2[i] = data[128 + i];
data0[i] = DATA[i];
data1[i] = DATA[64 + i];
data2[i] = DATA[128 + i];
}
let pre_hash = partial_sha256_var_start(data0);
let interstitial_hash = partial_sha256_var_interstitial(pre_hash, data1, data1.len());
let hash = partial_sha256_var_end(interstitial_hash, data2, data2.len() as u64, DATA.len() as u64);
let correct_hash = std::hash::sha256_var(DATA, DATA.len() as u64);
assert_eq(hash, correct_hash);
}

#[test]
fn test_partial_hash_interstitial_var() {
let mut data0 = [0; 64];
let mut data1 = [0; 128]; // second block not used
let mut data2 = [0; 64];
for i in 0..data0.len() {
data0[i] = DATA[i];
data1[i] = DATA[64 + i];
data2[i] = DATA[128 + i];
}
let pre_hash = partial_sha256_var_start(data0);
let interstitial_hash = partial_sha256_var_interstitial(pre_hash, data1);
let hash = partial_sha256_var_end(interstitial_hash, data2, data2.len() as u64, data.len() as u64);
let correct_hash = std::hash::sha256_var(data, data.len() as u64);
let interstitial_hash = partial_sha256_var_interstitial(pre_hash, data1, 64);
let hash = partial_sha256_var_end(interstitial_hash, data2, data2.len() as u64, DATA.len() as u64);
let correct_hash = std::hash::sha256_var(DATA, DATA.len() as u64);
assert_eq(hash, correct_hash);
}
13 changes: 13 additions & 0 deletions lib/src/remove_soft_line_breaks.nr
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Remove soft line breaks from the given text
*
* @param text The text to remove soft line breaks from
*/
pub fn remove_soft_line_breaks<let LENGTH: u32>(text: BoundedVec<u8, LENGTH>) -> BoundedVec<u8, LENGTH> {
let mut result = BoundedVec::new();
for i in 0..LENGTH {
if i < text.len() {
// check if
}
}
}

0 comments on commit 61a6661

Please sign in to comment.