From: "Li, Yi" <yi1.li@intel.com>
To: devel@edk2.groups.io
Cc: Gerd Hoffmann <kraxel@redhat.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Xiaoyu Lu <xiaoyu1.lu@intel.com>,
Guomin Jiang <guomin.jiang@intel.com>
Subject: [edk2-devel] [PATCH V2 10/29] CryptoPkg/openssl: adapt rand_pool.c to openssl 3.0 changes
Date: Thu, 3 Aug 2023 12:37:28 +0800 [thread overview]
Message-ID: <66c7383ba053f19ffd6769e5ccb9b8f769b03717.1691031203.git.yi1.li@intel.com> (raw)
In-Reply-To: <cover.1691031203.git.yi1.li@intel.com>
From: Gerd Hoffmann <kraxel@redhat.com>
Some functions have been renamed.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
---
CryptoPkg/Library/OpensslLib/rand_pool.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/CryptoPkg/Library/OpensslLib/rand_pool.c b/CryptoPkg/Library/OpensslLib/rand_pool.c
index 13e860a853..03047b233e 100644
--- a/CryptoPkg/Library/OpensslLib/rand_pool.c
+++ b/CryptoPkg/Library/OpensslLib/rand_pool.c
@@ -74,7 +74,7 @@ RandGetBytes (
* This is OpenSSL required interface.
*/
size_t
-rand_pool_acquire_entropy (
+ossl_pool_acquire_entropy (
RAND_POOL *pool
)
{
@@ -82,21 +82,21 @@ rand_pool_acquire_entropy (
size_t Bytes_needed;
unsigned char *Buffer;
- Bytes_needed = rand_pool_bytes_needed (pool, 1 /*entropy_factor*/);
+ Bytes_needed = ossl_rand_pool_bytes_needed (pool, 1 /*entropy_factor*/);
if (Bytes_needed > 0) {
- Buffer = rand_pool_add_begin (pool, Bytes_needed);
+ Buffer = ossl_rand_pool_add_begin (pool, Bytes_needed);
if (Buffer != NULL) {
Ret = RandGetBytes (Bytes_needed, Buffer);
if (FALSE == Ret) {
- rand_pool_add_end (pool, 0, 0);
+ ossl_rand_pool_add_end (pool, 0, 0);
} else {
- rand_pool_add_end (pool, Bytes_needed, 8 * Bytes_needed);
+ ossl_rand_pool_add_end (pool, Bytes_needed, 8 * Bytes_needed);
}
}
}
- return rand_pool_entropy_available (pool);
+ return ossl_rand_pool_entropy_available (pool);
}
/*
@@ -105,7 +105,7 @@ rand_pool_acquire_entropy (
* This is OpenSSL required interface.
*/
int
-rand_pool_add_nonce_data (
+ossl_pool_add_nonce_data (
RAND_POOL *pool
)
{
@@ -113,7 +113,7 @@ rand_pool_add_nonce_data (
RandGetBytes (sizeof (data), data);
- return rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0);
+ return ossl_rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0);
}
/*
@@ -130,7 +130,7 @@ rand_pool_add_additional_data (
RandGetBytes (sizeof (data), data);
- return rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0);
+ return ossl_rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0);
}
/*
@@ -139,7 +139,7 @@ rand_pool_add_additional_data (
* This is OpenSSL required interface.
*/
int
-rand_pool_init (
+ossl_rand_pool_init (
VOID
)
{
@@ -152,7 +152,7 @@ rand_pool_init (
* This is OpenSSL required interface.
*/
VOID
-rand_pool_cleanup (
+ossl_rand_pool_cleanup (
VOID
)
{
@@ -164,7 +164,7 @@ rand_pool_cleanup (
* This is OpenSSL required interface.
*/
VOID
-rand_pool_keep_random_devices_open (
+ossl_rand_pool_keep_random_devices_open (
int keep
)
{
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107496): https://edk2.groups.io/g/devel/message/107496
Mute This Topic: https://groups.io/mt/100520598/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2023-08-03 4:38 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 4:37 [edk2-devel] [PATCH V2 00/29] CryptoPkg: Update OpenSSL submodule to 3.0.9 Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 01/29] CryptoPkg/openssl: update submodule to openssl-3.0.9 Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 02/29] CryptoPkg/openssl: cleanup all openssl1.1.1 generated files and code Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 03/29] CryptoPkg/openssl: update Openssl*.inf files for openssl 3.0 Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 04/29] CryptoPkg/openssl: add openssl3 configure scripts Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 05/29] CryptoPkg/openssl: UefiAsm.conf update for openssl 3.0 Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 06/29] CryptoPkg/BaseCryptLib: no openssl deprecation warnings please Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 07/29] CryptoPkg/BaseCryptLib: adapt CryptSm3.c to openssl 3.0 changes Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 08/29] CryptoPkg/BaseCryptLib: drop BIO_* dummy functions Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 09/29] CryptoPkg/TlsLib: ERR_GET_FUNC is gone Li, Yi
2023-08-03 4:37 ` Li, Yi [this message]
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 11/29] CryptoPkg/openssl: move compiler_flags to buildinf.c Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 12/29] CryptoPkg/openssl: store dummy update for openssl 3.0 Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 13/29] CryptoPkg/openssl: adapt EcSm2Null.c " Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 14/29] CryptoPkg: Move all UEFI implement of openssl to OpensslStub Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 15/29] CryptoPkg: use UEFI provider as default Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 16/29] CryptoPkg: adapt 3.0 change in SslNull.c Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 17/29] CryptoPkg: Add instrinsics to support building openssl3 on IA32 windows Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 18/29] CryptoPkg: disable C4133 warning in openssl libraries Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 19/29] CryptoPkg/TlsLib: use unsigned long for ErrorCode Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 20/29] CryptoPkg: Align with 4096 when build with OpensslFullAccel Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 21/29] CryptoPkg: Enable memcpy sys call in RISCV64 build Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 22/29] CryptoPkg: add missing gcc instructions Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 23/29] CryptoPkg: add define of maximum unsigned size_t Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 24/29] CryptoPkg: add implemention of _ftol2_sse() to avoid build error Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 25/29] CryptoPkg: add more dummy implement of openssl for size optimization Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 26/29] CryptoPkg: run configure.py to update all generated files Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 27/29] CryptoPkg: remove strcmp to syscall Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 28/29] CryptoPkg/openssl: update CI config for openssl 3.0 Li, Yi
2023-08-03 4:37 ` [edk2-devel] [PATCH V2 29/29] CryptoPkg: remove BN and EC accel for size optimization Li, Yi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=66c7383ba053f19ffd6769e5ccb9b8f769b03717.1691031203.git.yi1.li@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox