From nobody Mon Feb 9 19:30:31 2026 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+84314+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+84314+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638547758; cv=none; d=zohomail.com; s=zohoarc; b=FRZkbOF7XKmfpoQx+jQOqexypJLAzRUbgr/Y0CVcUjYTjcII8sfNvVoyYCo+MRV19SBvwfQEilYebxHZvisd6Ml4AtpXaChVUQaspiMqt0eHJrNko7l/uZ5obDCVtH7mCL25dmlB6F4ZPTgM6FQzdG/pbAfjrISg0N3u5Vw4nmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638547758; h=Content-Type: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=lLdztxblAFgjRHznkHfA12UWFTvQjIzDn0kffuWsAuw=; b=H0Naue4Qi4DORA8MJVCyO4Efc4Kt/4qLOQnVIDpwl07gfJr6SCEJhtcZYM3MJfZN3ryu3Zzr6QhpsUH0J/YZ06+hX1iFNG/0XyD6isqdMW6u42BvY2nOoMxBKbVZtM04q0BbpcD2ssupZMKj0I5qoVH7e1HLDFdPmObIY83HRxE= 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+84314+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 1638547758443811.4633760602815; Fri, 3 Dec 2021 08:09:18 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id EPcrYY1788612xUcEAHBD7k6; Fri, 03 Dec 2021 08:09:18 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web12.13646.1638547756896078088 for ; Fri, 03 Dec 2021 08:09:17 -0800 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-599-iXGS6cKlPjWRKsu93ljq_w-1; Fri, 03 Dec 2021 11:09:15 -0500 X-MC-Unique: iXGS6cKlPjWRKsu93ljq_w-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD1D9100CCC2; Fri, 3 Dec 2021 16:09:13 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 904B010013D6; Fri, 3 Dec 2021 16:09:13 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 102B518003AB; Fri, 3 Dec 2021 17:07:49 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Guomin Jiang , Pawel Polawski , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyu Lu , Gerd Hoffmann Subject: [edk2-devel] [PATCH 14/24] CryptoPkg/openssl: adapt rand_pool.c to openssl 3.0 changes Date: Fri, 3 Dec 2021 17:07:38 +0100 Message-Id: <20211203160748.866150-15-kraxel@redhat.com> In-Reply-To: <20211203160748.866150-1-kraxel@redhat.com> References: <20211203160748.866150-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,kraxel@redhat.com X-Gm-Message-State: SgJhX6i4dnoD5raiVp9jZz4ix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638547758; bh=8qJhz3JCqK2I50/0iaP2d9qrs79JpLJoYxM1Sz+cvp8=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=P8OSpzWBj5xc+EmvN353g4MR0CjEPjTODYsCDifD3e+UsvLLCSez1+zGdpzEhniTDfd WZxsQYzCXRD7np4npyGTDpCs95sk6BJUnx1R5UFgkrzRLYDTsEaRoagxm3uw2mXF1k7pa 7W8+56Ym3Et9HE5qJcHtonk7RTGwImco//4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638547758760100003 Content-Type: text/plain; charset="utf-8" Some functions have been renamed. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/rand_pool.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/rand_pool.c b/CryptoPkg/Library/O= pensslLib/rand_pool.c index 6218ae0c1cd7..89713494dcb3 100644 --- a/CryptoPkg/Library/OpensslLib/rand_pool.c +++ b/CryptoPkg/Library/OpensslLib/rand_pool.c @@ -75,7 +75,7 @@ RandGetBytes ( * This is OpenSSL required interface. */ size_t -rand_pool_acquire_entropy ( +ossl_pool_acquire_entropy ( RAND_POOL *pool ) { @@ -83,22 +83,22 @@ 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 /* @@ -107,14 +107,14 @@ rand_pool_acquire_entropy ( * This is OpenSSL required interface. */ int -rand_pool_add_nonce_data ( +ossl_pool_add_nonce_data ( RAND_POOL *pool ) { UINT8 data[16]; 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 ( UINT8 data[16]; 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 ) { --=20 2.33.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 (#84314): https://edk2.groups.io/g/devel/message/84314 Mute This Topic: https://groups.io/mt/87479963/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-