-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
::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); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch! |
||
} | ||
} | ||
|
||
|
@@ -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(); | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why remove this comment?