From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 039B7D8024B for ; Thu, 3 Aug 2023 04:38:18 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=DhDGcX4Y2JY466rFBNqA5z/FfLL42B9kgIpvsYdNGM4=; c=relaxed/simple; d=groups.io; h=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:Content-Transfer-Encoding; s=20140610; t=1691037497; v=1; b=K6ao2ntnze5+AevwD3lNo17nQhaWB0Zfaw7xUByLYFLDyb3RggCH6zWwlMEmz57eOsh0mR1n mYbbyoBeqNaxdMLiNdX1Zb1BObfbAu/qh5UVmN6pBSHcC7G0VJuIX4b3lu5WXUE7dGVprz/dI3Q fwahKxXedBmPKhGGvVBpHRGs= X-Received: by 127.0.0.2 with SMTP id U5FeYY7687511xzK7ubj3UhS; Wed, 02 Aug 2023 21:38:17 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.7299.1691037495195793336 for ; Wed, 02 Aug 2023 21:38:15 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="456141092" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="456141092" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 21:38:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="794848006" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="794848006" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.10]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 21:38:13 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Jiewen Yao , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH V2 05/29] CryptoPkg/openssl: UefiAsm.conf update for openssl 3.0 Date: Thu, 3 Aug 2023 12:37:23 +0800 Message-Id: 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: S4Cl2KsMXjAYiytQ4oRQP25wx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=K6ao2ntn; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) From: Gerd Hoffmann New naming convention for the configs: UEFI-${efiarch}-${compiler}. Signed-off-by: Gerd Hoffmann Cc: Jiewen Yao Cc: Xiaoyu Lu Cc: Guomin Jiang --- CryptoPkg/Library/OpensslLib/UefiAsm.conf | 41 +++++++---------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/UefiAsm.conf b/CryptoPkg/Library/OpensslLib/UefiAsm.conf index c3940b5886..907582f93e 100644 --- a/CryptoPkg/Library/OpensslLib/UefiAsm.conf +++ b/CryptoPkg/Library/OpensslLib/UefiAsm.conf @@ -8,41 +8,24 @@ ## my %targets = ( -#### UEFI - "UEFI-x86" => { - perlasm_scheme => "win32n", - # inherit_from => [ "UEFI", asm("x86_asm") ], + "UEFI-IA32-MSFT" => { inherit_from => [ "UEFI" ], - cpuid_asm_src => "x86cpuid.s", - aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s", - sha1_asm_src => "sha1-586.s sha256-586.s sha512-586.s", - modes_asm_src => "ghash-x86.s", + perlasm_scheme => "win32n", + asm_arch => "x86", }, - "UEFI-x86-GCC" => { - perlasm_scheme => "elf", - # inherit_from => [ "UEFI", asm("x86_asm") ], + "UEFI-IA32-GCC" => { inherit_from => [ "UEFI" ], - cpuid_asm_src => "x86cpuid.s", - aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s", - sha1_asm_src => "sha1-586.s sha256-586.s sha512-586.s", - modes_asm_src => "ghash-x86.s", + perlasm_scheme => "elf", + asm_arch => "x86", }, - "UEFI-x86_64" => { - perlasm_scheme => "nasm", - # inherit_from => [ "UEFI", asm("x86_64_asm") ], + "UEFI-X64-MSFT" => { inherit_from => [ "UEFI" ], - cpuid_asm_src => "x86_64cpuid.s", - aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s", - sha1_asm_src => "sha1-x86_64.s sha256-x86_64.s sha512-x86_64.s sha1-mb-x86_64.s sha256-mb-x86_64.s", - modes_asm_src => "ghash-x86_64.s aesni-gcm-x86_64.s", + perlasm_scheme => "nasm", + asm_arch => "x86_64", }, - "UEFI-x86_64-GCC" => { - perlasm_scheme => "elf", - # inherit_from => [ "UEFI", asm("x86_64_asm") ], + "UEFI-X64-GCC" => { inherit_from => [ "UEFI" ], - cpuid_asm_src => "x86_64cpuid.s", - aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s", - sha1_asm_src => "sha1-x86_64.s sha256-x86_64.s sha512-x86_64.s sha1-mb-x86_64.s sha256-mb-x86_64.s", - modes_asm_src => "ghash-x86_64.s aesni-gcm-x86_64.s", + perlasm_scheme => "elf", + asm_arch => "x86_64", }, ); -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107486): https://edk2.groups.io/g/devel/message/107486 Mute This Topic: https://groups.io/mt/100520580/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-