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

Use little-endian encoding for Blake2 hashing on all architectures #38960

Merged
merged 1 commit into from
Jan 11, 2017
Merged
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
16 changes: 10 additions & 6 deletions src/librustc_data_structures/blake2b.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,20 @@ fn blake2b_compress(ctx: &mut Blake2bCtx, last: bool) {
}

{
// Re-interpret the input buffer in the state as u64s
// Re-interpret the input buffer in the state as an array
// of little-endian u64s, converting them to machine
// endianness. It's OK to modify the buffer in place
// since this is the last time this data will be accessed
// before it's overwritten.

let m: &mut [u64; 16] = unsafe {
let b: &mut [u8; 128] = &mut ctx.b;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove this comment?

::std::mem::transmute(b)
};

// It's OK to modify the buffer in place since this is the last time
// this data will be accessed before it's overwritten
if cfg!(target_endian = "big") {
for word in &mut m[..] {
*word = word.to_be();
*word = u64::from_le(*word);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

}
}

Expand Down Expand Up @@ -209,9 +212,10 @@ fn blake2b_final(ctx: &mut Blake2bCtx)

blake2b_compress(ctx, true);

// Modify our buffer to little-endian format as it will be read
// as a byte array. It's OK to modify the buffer in place since
// this is the last time this data will be accessed.
if cfg!(target_endian = "big") {
// Make sure that the data is in memory in little endian format, as is
// demanded by BLAKE2
for word in &mut ctx.h {
*word = word.to_le();
}
Expand Down