46cef60de6
- Rebase to edk2-stable202502 [RHEL-75592] - Resolves: RHEL-75592 (rebase to edk2-stable202502) - Resulves: RHEL-82646 (fix typo in fwcfg file name) - Resolves: RHEL-82837 (The newer revocation file and Server 2025 required to update it)
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 1e4acd524e41503e5b9baaa714f4210f00d67560 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Thu, 27 Feb 2025 10:59:32 +0100
|
|
Subject: [PATCH] Revert "CryptoPkg/BaseCryptLib: add next parameter to
|
|
SHA3_squeeze" (RH only)
|
|
|
|
This reverts commit 9895fe25ac9579cfd85327c7b6d8ee271539c0e5.
|
|
|
|
Revert adaptions for openssl newer than 3.0
|
|
---
|
|
CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h | 3 +--
|
|
CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c | 2 +-
|
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h b/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
|
|
index c65bffa85d..03a1a58cb8 100644
|
|
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
|
|
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
|
|
@@ -66,8 +66,7 @@ SHA3_squeeze (
|
|
uint64_t A[5][5],
|
|
unsigned char *out,
|
|
size_t len,
|
|
- size_t r,
|
|
- int next
|
|
+ size_t r
|
|
);
|
|
|
|
/**
|
|
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c
|
|
index f996778706..6abafc3c00 100644
|
|
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c
|
|
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c
|
|
@@ -160,7 +160,7 @@ Sha3Final (
|
|
|
|
(void)SHA3_absorb (Context->A, Context->buf, BlockSize, BlockSize);
|
|
|
|
- SHA3_squeeze (Context->A, MessageDigest, Context->md_size, BlockSize, 0);
|
|
+ SHA3_squeeze (Context->A, MessageDigest, Context->md_size, BlockSize);
|
|
|
|
return 1;
|
|
}
|