From 32fa85636a237aa442d01a7ae8d0ff39b9a01133 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 28 Jun 2023 01:44:03 -0400 Subject: [PATCH] WIP: Fix msg_buffer --- umskt/src/bink1998.rs | 16 ++++++++-------- umskt/src/bink2002.rs | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/umskt/src/bink1998.rs b/umskt/src/bink1998.rs index c00fb30..95c51c4 100644 --- a/umskt/src/bink1998.rs +++ b/umskt/src/bink1998.rs @@ -118,18 +118,18 @@ impl ProductKey { let mut msg_buffer: [u8; SHA_MSG_LENGTH] = [0; SHA_MSG_LENGTH]; - let x_bin = x.to_signed_bytes_le(); + let x_bin = x.to_bytes_le().1; let x_bin = match x_bin.len().cmp(&FIELD_BYTES) { - Ordering::Less => (0..FIELD_BYTES - x_bin.len() - 1) + Ordering::Less => (0..FIELD_BYTES - x_bin.len()) .map(|_| 0) .chain(x_bin.into_iter()) .collect(), Ordering::Greater => continue, Ordering::Equal => x_bin, }; - let y_bin = y.to_signed_bytes_le(); + let y_bin = y.to_bytes_le().1; let y_bin = match y_bin.len().cmp(&FIELD_BYTES) { - Ordering::Less => (0..FIELD_BYTES - y_bin.len() - 1) + Ordering::Less => (0..FIELD_BYTES - y_bin.len()) .map(|_| 0) .chain(y_bin.into_iter()) .collect(), @@ -192,18 +192,18 @@ impl ProductKey { let mut msg_buffer: [u8; SHA_MSG_LENGTH] = [0; SHA_MSG_LENGTH]; - let x_bin = x.to_signed_bytes_le(); + let x_bin = x.to_bytes_le().1; let x_bin = if x_bin.len() < FIELD_BYTES { - (0..FIELD_BYTES - x_bin.len() - 1) + (0..FIELD_BYTES - x_bin.len()) .map(|_| 0) .chain(x_bin.into_iter()) .collect() } else { x_bin }; - let y_bin = y.to_signed_bytes_le(); + let y_bin = y.to_bytes_le().1; let y_bin = if y_bin.len() < FIELD_BYTES { - (0..FIELD_BYTES - y_bin.len() - 1) + (0..FIELD_BYTES - y_bin.len()) .map(|_| 0) .chain(y_bin.into_iter()) .collect() diff --git a/umskt/src/bink2002.rs b/umskt/src/bink2002.rs index 32425f1..4e49f03 100644 --- a/umskt/src/bink2002.rs +++ b/umskt/src/bink2002.rs @@ -118,18 +118,18 @@ impl ProductKey { let mut msg_buffer: [u8; SHA_MSG_LENGTH] = [0; SHA_MSG_LENGTH]; - let x_bin = x.to_signed_bytes_le(); + let x_bin = x.to_bytes_le().1; let x_bin = match x_bin.len().cmp(&FIELD_BYTES) { - Ordering::Less => (0..FIELD_BYTES - x_bin.len() - 1) + Ordering::Less => (0..FIELD_BYTES - x_bin.len()) .map(|_| 0) .chain(x_bin.into_iter()) .collect(), Ordering::Greater => continue, Ordering::Equal => x_bin, }; - let y_bin = y.to_signed_bytes_le(); + let y_bin = y.to_bytes_le().1; let y_bin = match y_bin.len().cmp(&FIELD_BYTES) { - Ordering::Less => (0..FIELD_BYTES - y_bin.len() - 1) + Ordering::Less => (0..FIELD_BYTES - y_bin.len()) .map(|_| 0) .chain(y_bin.into_iter()) .collect(), @@ -262,18 +262,18 @@ impl ProductKey { Point::Infinity => bail!("Point at infinity!"), }; - let x_bin = x.to_signed_bytes_le(); + let x_bin = x.to_bytes_le().1; let x_bin = if x_bin.len() < FIELD_BYTES { - (0..FIELD_BYTES - x_bin.len() - 1) + (0..FIELD_BYTES - x_bin.len()) .map(|_| 0) .chain(x_bin.into_iter()) .collect() } else { x_bin }; - let y_bin = y.to_signed_bytes_le(); + let y_bin = y.to_bytes_le().1; let y_bin = if y_bin.len() < FIELD_BYTES { - (0..FIELD_BYTES - y_bin.len() - 1) + (0..FIELD_BYTES - y_bin.len()) .map(|_| 0) .chain(y_bin.into_iter()) .collect()