From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.12291.1679027327871365227 for ; Thu, 16 Mar 2023 21:28:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=hH3hRKQb; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: yi1.li@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679027328; x=1710563328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vD+zZG25mqddJqdgd+wt1nEw3ZWNmkVfksm254Sk6vU=; b=hH3hRKQbMctT41cjI2U0C/d0Nh/nV5MyYqLGSPIEr+0aRYudllumAtE2 ZVnIMs+r8p4hEohUbX2e0juFtLC82A4gzyiPZpCTXiOPNnOHYjhBrPYeE LR5VuXmGCJF7PpN1AD9AiMlmx+hUCL4I0+09hAQNAncDijoFjYwir6thE LdG4XP9x5FxbgrAWIFwirYFm2q8NeHvD0J3FrjA2DKpptXO2qboUTHE/Q tvyWpPdza+kXU19jIxx/Jl4NNKkESFN3CzN63OSaYLwV50uhXJ7batS3d OXtp28li1s/uxBDCVDZaBgixXO90GLdVn739cXVblZAsaAvhHG3gHvEAM A==; X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="322029715" X-IronPort-AV: E=Sophos;i="5.98,267,1673942400"; d="scan'208";a="322029715" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2023 21:28:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="630153789" X-IronPort-AV: E=Sophos;i="5.98,267,1673942400"; d="scan'208";a="630153789" Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.82]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2023 21:28:35 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Yi Li Subject: [edk2-staging/OpenSSL11_EOL 1/7] OpensslLib: remove bio prov Date: Fri, 17 Mar 2023 12:28:13 +0800 Message-Id: X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Yi Li --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 2 +- CryptoPkg/Library/OpensslLib/OpensslStub/uefiprov.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index 032862ac1f..47a045ef66 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -116,7 +116,7 @@ $(OPENSSL_PATH)/providers/common/provider_seeding.c $(OPENSSL_PATH)/providers/common/digest_to_nid.c $(OPENSSL_PATH)/providers/common/capabilities.c - $(OPENSSL_PATH)/providers/common/bio_prov.c + # $(OPENSSL_PATH)/providers/common/bio_prov.c $(OPENSSL_PATH)/providers/common/der/der_rsa_sig.c $(OPENSSL_PATH)/providers/prov_running.c $(OPENSSL_PATH)/providers/nullprov.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslStub/uefiprov.c b/CryptoPkg/Library/OpensslLib/OpensslStub/uefiprov.c index 0b61e72933..c21c475331 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslStub/uefiprov.c +++ b/CryptoPkg/Library/OpensslLib/OpensslStub/uefiprov.c @@ -266,10 +266,8 @@ int ossl_uefi_provider_init(const OSSL_CORE_HANDLE *handle, void **provctx) { OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL; - BIO_METHOD *corebiometh; - if (!ossl_prov_bio_from_dispatch(in) - || !ossl_prov_seeding_from_dispatch(in)) + if (!ossl_prov_seeding_from_dispatch(in)) return 0; for (; in->function_id != 0; in++) { switch (in->function_id) { @@ -299,8 +297,7 @@ int ossl_uefi_provider_init(const OSSL_CORE_HANDLE *handle, * This only works for built-in providers. Most providers should * create their own library context. */ - if ((*provctx = ossl_prov_ctx_new()) == NULL - || (corebiometh = ossl_bio_prov_init_bio_method()) == NULL) { + if ((*provctx = ossl_prov_ctx_new()) == NULL) { ossl_prov_ctx_free(*provctx); *provctx = NULL; return 0; @@ -308,7 +305,6 @@ int ossl_uefi_provider_init(const OSSL_CORE_HANDLE *handle, ossl_prov_ctx_set0_libctx(*provctx, (OSSL_LIB_CTX *)c_get_libctx(handle)); ossl_prov_ctx_set0_handle(*provctx, handle); - ossl_prov_ctx_set0_core_bio_method(*provctx, corebiometh); *out = deflt_dispatch_table; ossl_prov_cache_exported_algorithms(deflt_ciphers, exported_ciphers); -- 2.31.1.windows.1