Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump hybrid-array to v0.2.0-rc.9 #1616

Merged
merged 1 commit into from
Jul 26, 2024
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
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions aead/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,15 @@ pub trait AeadMut: AeadCore {
/// postfix authentication tag will need to define their own implementation.
macro_rules! impl_decrypt_in_place {
($aead:expr, $nonce:expr, $aad:expr, $buffer:expr) => {{
if $buffer.len() < Self::TagSize::to_usize() {
return Err(Error);
}
let tag_pos = $buffer
.len()
.checked_sub(Self::TagSize::to_usize())
.ok_or(Error)?;

let tag_pos = $buffer.len() - Self::TagSize::to_usize();
let (msg, tag) = $buffer.as_mut().split_at_mut(tag_pos);
$aead.decrypt_in_place_detached($nonce, $aad, msg, Tag::<Self>::from_slice(tag))?;
let tag = Tag::<Self>::try_from(&*tag).expect("tag length mismatch");

$aead.decrypt_in_place_detached($nonce, $aad, msg, &tag)?;
$buffer.truncate(tag_pos);
Ok(())
}};
Expand Down
2 changes: 1 addition & 1 deletion digest/src/core_api/ct_variable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ where

fn serialize(&self) -> SerializedState<Self> {
let serialized_inner = self.inner.serialize();
let serialized_outsize = Array::<u8, U1>::clone_from_slice(&[OutSize::U8]);
let serialized_outsize = Array([OutSize::U8]);

serialized_inner.concat(serialized_outsize)
}
Expand Down
5 changes: 2 additions & 3 deletions digest/src/core_api/rt_variable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,9 @@ where

fn serialize(&self) -> SerializedState<Self> {
let serialized_core = self.core.serialize();
let serialized_pos =
Array::<u8, U1>::clone_from_slice(&[self.buffer.get_pos().try_into().unwrap()]);
let serialized_pos = Array([self.buffer.get_pos().try_into().unwrap()]);
let serialized_data = self.buffer.clone().pad_with_zeros();
let serialized_output_size = Array::<u8, U1>::clone_from_slice(&[self.output_size]);
let serialized_output_size = Array([self.output_size]);

serialized_core
.concat(serialized_pos)
Expand Down
3 changes: 1 addition & 2 deletions digest/src/core_api/wrapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,7 @@ where

fn serialize(&self) -> SerializedState<Self> {
let serialized_core = self.core.serialize();
let serialized_pos =
Array::<u8, U1>::clone_from_slice(&[self.buffer.get_pos().try_into().unwrap()]);
let serialized_pos = Array([self.buffer.get_pos().try_into().unwrap()]);
let serialized_data = self.buffer.clone().pad_with_zeros();

serialized_core
Expand Down
6 changes: 5 additions & 1 deletion elliptic-curve/src/public_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,11 @@ where
FieldBytesSize<C>: ModulusSize,
{
fn from(public_key: &PublicKey<C>) -> CompressedPoint<C> {
CompressedPoint::<C>::clone_from_slice(public_key.to_encoded_point(true).as_bytes())
public_key
.to_encoded_point(true)
.as_bytes()
.try_into()
.expect("wrong compressed point size")
}
}

Expand Down
4 changes: 2 additions & 2 deletions elliptic-curve/src/secret_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ where
/// NOTE: this function is variable-time with respect to the input length. To avoid a timing
/// sidechannel, always ensure that the input has been pre-padded to `C::FieldBytesSize`.
pub fn from_slice(slice: &[u8]) -> Result<Self> {
if slice.len() == C::FieldBytesSize::USIZE {
Self::from_bytes(FieldBytes::<C>::from_slice(slice))
if let Ok(field_bytes) = <&FieldBytes<C>>::try_from(slice) {
Self::from_bytes(field_bytes)
} else if (Self::MIN_SIZE..C::FieldBytesSize::USIZE).contains(&slice.len()) {
let mut bytes = Zeroizing::new(FieldBytes::<C>::default());
let offset = C::FieldBytesSize::USIZE.saturating_sub(slice.len());
Expand Down
5 changes: 4 additions & 1 deletion signature/tests/derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ impl TryFrom<&[u8]> for DummySignature {
type Error = Error;

fn try_from(bytes: &[u8]) -> Result<Self, Error> {
Ok(DummySignature(Array::clone_from_slice(bytes)))
bytes
.try_into()
.map(DummySignature)
.map_err(|_| Error::new())
}
}

Expand Down
Loading