From nobody Tue Dec 16 07:08:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+107349+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+107349+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1690526496; cv=none; d=zohomail.com; s=zohoarc; b=PF++wfU4VE67ojswAS9UOpo3AWKxA9AxE+IxSl6itogXAyvH/alkaT3CXGEKUVwfPB+THf/7tCJip1i3Fl/N9iWNPAWs92/fmQzMqFJW+ucL58D9KS8SKEDGDG6WJnta2miFPn6FvgCiRAhixlRrgBCvwlyt8y1SS5+UC9s8UVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690526496; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=67m9JC1RjkVy9vtg0tcMw94ddhqrtnsI+wpPdVfSc0k=; b=Dr5k+P2e06UcIBw6ZU19Lu0bandT6pKLAUho2YaowkaTHV5ylR6K3voVLJ3xqgjZqNAgzxT4fAQjCbYh7BK+hPXLG0LQ12du/EUl/Xs6NrWVJEbWdyqgpiCuf7UeaTk2rXk/H+wOGVr1EEbX15S6tKfwCgiMWCQuRhfmFHSlHOU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+107349+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1690526496053777.0101519289022; Thu, 27 Jul 2023 23:41:36 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=AtHOLXiGpsCQk56zyb4hGdv3PlMGKDk/auPBkYo0JRM=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1690526495; v=1; b=BSww022XceZNlZLj01+JPaz28ZWqq93n1hyCQRDXjsDo8vdUTf5d462e6KhXR6s/IIuBqcSb l+13NOdQ4ajdCGRSCHc5ZpSi62Ro5chVNNLIgUPohBF8p6iTMezeUCdgKFNd3T8CKKq7BAnFwhw HsORBgW8uSONxUtBAxWYHRaI= X-Received: by 127.0.0.2 with SMTP id A0cqYY1788612xWtVX4iPsIB; Thu, 27 Jul 2023 23:41:35 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.27090.1690526494426901101 for ; Thu, 27 Jul 2023 23:41:35 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="434804258" X-IronPort-AV: E=Sophos;i="6.01,236,1684825200"; d="scan'208";a="434804258" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 23:41:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="762496027" X-IronPort-AV: E=Sophos;i="6.01,236,1684825200"; d="scan'208";a="762496027" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.10]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 23:41:02 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Jiewen Yao , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH 10/29] CryptoPkg/openssl: adapt rand_pool.c to openssl 3.0 changes Date: Fri, 28 Jul 2023 14:39:56 +0800 Message-Id: <66c7383ba053f19ffd6769e5ccb9b8f769b03717.1690444292.git.yi1.li@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yi1.li@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: is1MMEu7rtOKCB6OdSxvqNfix1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1690526498153100003 Content-Type: text/plain; charset="utf-8" From: Gerd Hoffmann Some functions have been renamed. Signed-off-by: Gerd Hoffmann Cc: Jiewen Yao Cc: Xiaoyu Lu Cc: Guomin Jiang --- 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/O= pensslLib/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; =20 - Bytes_needed =3D rand_pool_bytes_needed (pool, 1 /*entropy_factor*/); + Bytes_needed =3D ossl_rand_pool_bytes_needed (pool, 1 /*entropy_factor*/= ); if (Bytes_needed > 0) { - Buffer =3D rand_pool_add_begin (pool, Bytes_needed); + Buffer =3D ossl_rand_pool_add_begin (pool, Bytes_needed); =20 if (Buffer !=3D NULL) { Ret =3D RandGetBytes (Bytes_needed, Buffer); if (FALSE =3D=3D 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); } } } =20 - return rand_pool_entropy_available (pool); + return ossl_rand_pool_entropy_available (pool); } =20 /* @@ -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 ( =20 RandGetBytes (sizeof (data), data); =20 - return rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0); + return ossl_rand_pool_add (pool, (unsigned char *)&data, sizeof (data), = 0); } =20 /* @@ -130,7 +130,7 @@ rand_pool_add_additional_data ( =20 RandGetBytes (sizeof (data), data); =20 - return rand_pool_add (pool, (unsigned char *)&data, sizeof (data), 0); + return ossl_rand_pool_add (pool, (unsigned char *)&data, sizeof (data), = 0); } =20 /* @@ -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 ) { --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107349): https://edk2.groups.io/g/devel/message/107349 Mute This Topic: https://groups.io/mt/100406050/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-