CryptoPkg/openssl: UefiAsm.conf update for openssl 3.0

New naming convention for the configs:  UEFI-${efiarch}-${compiler}.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Brian J. Johnson <brian.johnson@hpe.com>
Tested-by: Kenneth Lautner <klautner@microsoft.com>
This commit is contained in:
Gerd Hoffmann 2023-08-03 12:37:23 +08:00 committed by mergify[bot]
parent 81f5aa0700
commit ac492c3ead

View File

@ -8,41 +8,24 @@
##
my %targets = (
#### UEFI
"UEFI-x86" => {
"UEFI-IA32-MSFT" => {
inherit_from => [ "UEFI" ],
perlasm_scheme => "win32n",
# inherit_from => [ "UEFI", asm("x86_asm") ],
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",
asm_arch => "x86",
},
"UEFI-x86-GCC" => {
"UEFI-IA32-GCC" => {
inherit_from => [ "UEFI" ],
perlasm_scheme => "elf",
# inherit_from => [ "UEFI", asm("x86_asm") ],
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",
asm_arch => "x86",
},
"UEFI-x86_64" => {
"UEFI-X64-MSFT" => {
inherit_from => [ "UEFI" ],
perlasm_scheme => "nasm",
# inherit_from => [ "UEFI", asm("x86_64_asm") ],
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",
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",
},
);