From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: Jian J Wang <jian.j.wang@intel.com>,
Pawel Polawski <ppolawsk@redhat.com>,
Xiaoyu Lu <xiaoyu1.lu@intel.com>,
Ard Biesheuvel <ardb+tianocore@kernel.org>,
Guomin Jiang <guomin.jiang@intel.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Oliver Steffen <osteffen@redhat.com>,
Jordan Justen <jordan.l.justen@intel.com>
Subject: [PATCH 12/22] CryptoPkg/openssl: adapt rand_pool.c to openssl 3.0 changes
Date: Mon, 13 Mar 2023 09:30:06 +0100 [thread overview]
Message-ID: <20230313083016.136448-13-kraxel@redhat.com> (raw)
In-Reply-To: <20230313083016.136448-1-kraxel@redhat.com>
Some functions have been renamed.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.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 13e860a853d0..03047b233e3e 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.39.2
next prev parent reply other threads:[~2023-03-13 8:30 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 8:29 [PATCH 00/22] [edk2-staging] CryptoPkg/openssl: switch to openssl-3.0 Gerd Hoffmann
2023-03-13 8:29 ` [PATCH 01/22] CryptoPkg/openssl: update submodule to openssl-3.0.8 Gerd Hoffmann
2023-03-13 15:13 ` [edk2-devel] " Li, Yi
2023-03-14 8:16 ` Gerd Hoffmann
2023-03-14 8:45 ` Ard Biesheuvel
2023-03-14 9:04 ` Gerd Hoffmann
2023-06-02 2:53 ` Yao, Jiewen
2023-06-02 9:14 ` Ard Biesheuvel
2023-06-02 14:29 ` Yao, Jiewen
2023-06-19 8:12 ` Gerd Hoffmann
2023-06-19 8:37 ` Li, Yi
2023-08-03 4:40 ` Li, Yi
2023-03-13 8:29 ` [PATCH 02/22] CryptoPkg/openssl: remove openssl 1.1.1 header files Gerd Hoffmann
2023-03-13 8:29 ` [PATCH 03/22] CryptoPkg/openssl: remove generated file lists Gerd Hoffmann
2023-03-13 8:29 ` [PATCH 04/22] CryptoPkg/openssl: add openssl3 configure scripts Gerd Hoffmann
2023-03-13 8:29 ` [PATCH 05/22] CryptoPkg/openssl: UefiAsm.conf update for openssl 3.0, add aarch64 Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 06/22] CryptoPkg/openssl: update Openssl*.inf files for openssl 3.0 Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 07/22] CryptoPkg/BaseCryptLib: no openssl deprecation warnings please Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 08/22] CryptoPkg/BaseCryptLib; adapt CryptSm3.c to openssl 3.0 changes Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 09/22] CryptoPkg/BaseCryptLib: drop BIO_* dummy functions Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 10/22] CryptoPkg/TlsLib: ERR_GET_FUNC is gone Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 11/22] CryptoPkg/TlsLib: use unsigned long for ErrorCode Gerd Hoffmann
2023-03-13 8:30 ` Gerd Hoffmann [this message]
2023-03-13 8:30 ` [PATCH 13/22] CryptoPkg/openssl: move compiler_flags to buildinf.c Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 14/22] CryptoPkg/openssl: store dummy update for openssl 3.0 Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 15/22] CryptoPkg/openssl: adapt EcSm2Null.c " Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 16/22] [hash] CryptoPkg/openssl: add OpensslLibHash.inf Gerd Hoffmann
2023-03-13 15:46 ` [edk2-devel] " Li, Yi
2023-03-14 7:45 ` Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 17/22] [hash] OvmfPkg: wire up OpensslLibHash.inf Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 18/22] [provider] CryptoPkg/openssl: use our own predefined providers Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 19/22] CryptoPkg/openssl: update *.inf, add generated files Gerd Hoffmann
2023-03-13 15:26 ` [edk2-devel] " Li, Yi
2023-03-14 7:55 ` Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 20/22] CryptoPkg/openssl: update CI config for openssl 3.0 Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 21/22] CryptoPkg/openssl: cleanup remaining openssl-1.1.1 files Gerd Hoffmann
2023-03-13 8:30 ` [PATCH 22/22] CryptoPkg/openssl: update HOWTO file Gerd Hoffmann
2023-06-01 16:40 ` [edk2-devel] [PATCH 00/22] [edk2-staging] CryptoPkg/openssl: switch to openssl-3.0 Michael D Kinney
2023-06-02 2:51 ` Yao, Jiewen
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=20230313083016.136448-13-kraxel@redhat.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