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.

Sign up for GitHub

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

slh-dsa: fix multiple AsBytes definitions #846

Closed
wants to merge 1 commit into from
Closed

slh-dsa: fix multiple AsBytes definitions #846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions slh-dsa/src/address.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use typenum::U22;

use zerocopy::byteorder::big_endian::{U32, U64};
use zerocopy::AsBytes;
use zerocopy_derive::AsBytes;

/// `Address` represents a hash address as defined by FIPS-205 section 4.2
pub trait Address: AsRef<[u8]> {
Expand All @@ -40,7 +39,7 @@ pub trait Address: AsRef<[u8]> {
}
}

#[derive(Clone, AsBytes)]
#[derive(Clone, zerocopy_derive::AsBytes)]
#[repr(C)]
pub struct WotsHash {
pub layer_adrs: U32,
Expand All @@ -52,7 +51,7 @@ pub struct WotsHash {
pub hash_adrs: U32,
}

#[derive(Clone, AsBytes)]
#[derive(Clone, zerocopy_derive::AsBytes)]
#[repr(C)]
pub struct WotsPk {
pub layer_adrs: U32,
Expand All @@ -63,7 +62,7 @@ pub struct WotsPk {
padding: U64, // 0
}

#[derive(Clone, AsBytes)]
#[derive(Clone, zerocopy_derive::AsBytes)]
#[repr(C)]
pub struct HashTree {
pub layer_adrs: U32,
Expand All @@ -75,7 +74,7 @@ pub struct HashTree {
pub tree_index: U32,
}

#[derive(Clone, AsBytes)]
#[derive(Clone, zerocopy_derive::AsBytes)]
#[repr(C)]
pub struct ForsTree {
layer_adrs: U32, // 0
Expand All @@ -87,7 +86,7 @@ pub struct ForsTree {
pub tree_index: U32,
}

#[derive(Clone, AsBytes)]
#[derive(Clone, zerocopy_derive::AsBytes)]
#[repr(C)]
pub struct ForsRoots {
layer_adrs: U32, // 0
Expand All @@ -98,7 +97,7 @@ pub struct ForsRoots {
padding: U64, // 0
}

#[derive(Clone, AsBytes)]
#[derive(Clone, zerocopy_derive::AsBytes)]
#[repr(C)]
pub struct WotsPrf {
pub layer_adrs: U32,
Expand All @@ -110,7 +109,7 @@ pub struct WotsPrf {
hash_adrs: U32, // 0
}

#[derive(Clone, AsBytes)]
#[derive(Clone, zerocopy_derive::AsBytes)]
#[repr(C)]
pub struct ForsPrf {
layer_adrs: U32, // 0
Expand Down