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

argon2: followups to #247 #333

Merged
merged 1 commit into from
Aug 28, 2022
Merged

argon2: followups to #247 #333

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion argon2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "argon2"
version = "0.4.1"
version = "0.5.0-pre"
description = """
Pure Rust implementation of the Argon2 password hashing function with support
for the Argon2d, Argon2i, and Argon2id algorithmic variants
Expand Down
45 changes: 19 additions & 26 deletions argon2/src/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,36 @@ use zeroize::Zeroize;

const TRUNC: u64 = u32::MAX as u64;

macro_rules! permutate_step {
#[rustfmt::skip]
macro_rules! permute_step {
($a:expr, $b:expr, $c:expr, $d:expr) => {
$a =
(Wrapping($a) + Wrapping($b) + (Wrapping(2) * Wrapping(($a & TRUNC) * ($b & TRUNC)))).0;
$a = (Wrapping($a) + Wrapping($b) + (Wrapping(2) * Wrapping(($a & TRUNC) * ($b & TRUNC)))).0;
$d = ($d ^ $a).rotate_right(32);
$c =
(Wrapping($c) + Wrapping($d) + (Wrapping(2) * Wrapping(($c & TRUNC) * ($d & TRUNC)))).0;
$c = (Wrapping($c) + Wrapping($d) + (Wrapping(2) * Wrapping(($c & TRUNC) * ($d & TRUNC)))).0;
$b = ($b ^ $c).rotate_right(24);

$a =
(Wrapping($a) + Wrapping($b) + (Wrapping(2) * Wrapping(($a & TRUNC) * ($b & TRUNC)))).0;
$a = (Wrapping($a) + Wrapping($b) + (Wrapping(2) * Wrapping(($a & TRUNC) * ($b & TRUNC)))).0;
$d = ($d ^ $a).rotate_right(16);
$c =
(Wrapping($c) + Wrapping($d) + (Wrapping(2) * Wrapping(($c & TRUNC) * ($d & TRUNC)))).0;
$c = (Wrapping($c) + Wrapping($d) + (Wrapping(2) * Wrapping(($c & TRUNC) * ($d & TRUNC)))).0;
$b = ($b ^ $c).rotate_right(63);
};
}

macro_rules! permutate {
macro_rules! permute {
(
$v0:expr, $v1:expr, $v2:expr, $v3:expr,
$v4:expr, $v5:expr, $v6:expr, $v7:expr,
$v8:expr, $v9:expr, $v10:expr, $v11:expr,
$v12:expr, $v13:expr, $v14:expr, $v15:expr,
) => {
permutate_step!($v0, $v4, $v8, $v12);
permutate_step!($v1, $v5, $v9, $v13);
permutate_step!($v2, $v6, $v10, $v14);
permutate_step!($v3, $v7, $v11, $v15);
permutate_step!($v0, $v5, $v10, $v15);
permutate_step!($v1, $v6, $v11, $v12);
permutate_step!($v2, $v7, $v8, $v13);
permutate_step!($v3, $v4, $v9, $v14);
permute_step!($v0, $v4, $v8, $v12);
permute_step!($v1, $v5, $v9, $v13);
permute_step!($v2, $v6, $v10, $v14);
permute_step!($v3, $v7, $v11, $v15);
permute_step!($v0, $v5, $v10, $v15);
permute_step!($v1, $v6, $v11, $v12);
permute_step!($v2, $v7, $v8, $v13);
permute_step!($v3, $v4, $v9, $v14);
};
}

Expand All @@ -57,15 +54,11 @@ impl Block {
pub const SIZE: usize = 1024;

pub(crate) fn as_bytes(&self) -> &[u8; Self::SIZE] {
let ptr = self.0.as_ptr() as *const u8;
let slice = unsafe { core::slice::from_raw_parts(ptr, Self::SIZE) };
slice.try_into().unwrap()
unsafe { &*(self.0.as_ptr() as *const [u8; Self::SIZE]) }
}

pub(crate) fn as_mut_bytes(&mut self) -> &mut [u8; Self::SIZE] {
let ptr = self.0.as_mut_ptr() as *mut u8;
let slice = unsafe { core::slice::from_raw_parts_mut(ptr, Self::SIZE) };
slice.try_into().unwrap()
unsafe { &mut *(self.0.as_mut_ptr() as *mut [u8; Self::SIZE]) }
}

pub(crate) fn compress(rhs: &Self, lhs: &Self) -> Self {
Expand All @@ -75,7 +68,7 @@ impl Block {
let mut q = r;
for chunk in q.0.chunks_exact_mut(16) {
#[rustfmt::skip]
permutate!(
permute!(
chunk[0], chunk[1], chunk[2], chunk[3],
chunk[4], chunk[5], chunk[6], chunk[7],
chunk[8], chunk[9], chunk[10], chunk[11],
Expand All @@ -88,7 +81,7 @@ impl Block {
let b = i * 2;

#[rustfmt::skip]
permutate!(
permute!(
q.0[b], q.0[b + 1],
q.0[b + 16], q.0[b + 17],
q.0[b + 32], q.0[b + 33],
Expand Down
2 changes: 0 additions & 2 deletions argon2/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#![no_std]
// TODO(tarcieri): safe parallel implementation
// See: https://github.com/RustCrypto/password-hashes/issues/154
#![cfg_attr(docsrs, feature(doc_cfg))]
#![doc = include_str!("../README.md")]
#![doc(
Expand Down