Skip to content

Enable xof_squeeze on AWS-LC #2471

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable xof_squeeze on AWS-LC #2471

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 openssl-sys/src/handwritten/evp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ extern "C" {
pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
#[cfg(ossl111)]
pub fn EVP_DigestFinalXOF(ctx: *mut EVP_MD_CTX, res: *mut u8, len: usize) -> c_int;
#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
pub fn EVP_DigestSqueeze(ctx: *mut EVP_MD_CTX, res: *mut u8, len: usize) -> c_int;

#[cfg(ossl300)]
Expand Down
28 changes: 16 additions & 12 deletions openssl/src/hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ unsafe impl Send for MessageDigest {}
enum State {
Reset,
Updated,
#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
Squeeze,
Finalized,
}
Expand Down Expand Up @@ -262,7 +262,7 @@ impl Hasher {
Updated => {
self.finish()?;
}
#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
Squeeze => (),
Finalized => (),
}
Expand All @@ -278,7 +278,7 @@ impl Hasher {
if self.state == Finalized {
self.init()?;
}
#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
if self.state == Squeeze {
// [`EVP_DigestUpdate`], depending on the implementation, may allow Updates after Squeezes.
// But, [FIPS 202], as shown in Figure 7, has a distinguished absorbing phase followed by a squeezing phase.
Expand All @@ -304,7 +304,7 @@ impl Hasher {

/// Squeezes buf out of the hasher. Can be called multiple times, unlike `finish_xof`.
/// The output will be as long as the buf.
#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
pub fn squeeze_xof(&mut self, buf: &mut [u8]) -> Result<(), ErrorStack> {
unsafe {
cvt(ffi::EVP_DigestSqueeze(
Expand Down Expand Up @@ -514,7 +514,7 @@ mod tests {
}

/// Squeezes the expected length by doing two squeezes.
#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
fn hash_xof_squeeze_test(hashtype: MessageDigest, hashtest: &(&str, &str)) {
let data = Vec::from_hex(hashtest.0).unwrap();
let mut h = Hasher::new(hashtype).unwrap();
Expand Down Expand Up @@ -584,7 +584,7 @@ mod tests {
assert_eq!(&*res, &*null);
}

#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
#[test]
fn test_finish_then_squeeze() {
let digest = MessageDigest::shake_128();
Expand All @@ -595,7 +595,7 @@ mod tests {
.expect_err("squeezing after finalize should fail");
}

#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
#[test]
fn test_squeeze_then_update() {
let digest = MessageDigest::shake_128();
Expand All @@ -607,15 +607,19 @@ mod tests {
.expect_err("updating after squeeze should fail");
}

#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
#[test]
fn test_squeeze_then_finalize() {
let digest = MessageDigest::shake_128();
let mut h = Hasher::new(digest).unwrap();
let mut buf = vec![0; digest.size()];
h.squeeze_xof(&mut buf).unwrap();
h.finish_xof(&mut buf)
.expect_err("finalize after squeeze should fail");
if cfg!(ossl330) {
h.finish_xof(&mut buf)
.expect_err("finalize after squeeze should fail");
} else if cfg!(awslc) {
h.finish_xof(&mut buf).unwrap();
}
}

#[test]
Expand Down Expand Up @@ -791,7 +795,7 @@ mod tests {

for test in tests.iter() {
hash_xof_test(MessageDigest::shake_128(), test);
#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
hash_xof_squeeze_test(MessageDigest::shake_128(), test);
}

Expand All @@ -816,7 +820,7 @@ mod tests {

for test in tests.iter() {
hash_xof_test(MessageDigest::shake_256(), test);
#[cfg(ossl330)]
#[cfg(any(ossl330, awslc))]
hash_xof_squeeze_test(MessageDigest::shake_256(), test);
}

Expand Down