Re: [PATCH v4 0/2] CryptoPkg/OpensslLib: Add native instruction support for X64

Zurcher, Christopher J

I may have misunderstood the recommendation; the file is under [Sources.X64] in the INF file.
The X64 folder is automatically deleted and re-generated when is run, so no standard file can go there. The architecture-specific folders from this patch are maintained by so that any changes to uefi-asm.conf can take effect in the auto-generated assembly files.

Christopher Zurcher

-----Original Message-----
From: Yao, Jiewen <>
Sent: Friday, October 30, 2020 18:15
To: Zurcher, Christopher J <>;
Cc: Wang, Jian J <>; Lu, XiaoyuX <>;
Kinney, Michael D <>; Ard Biesheuvel
Subject: RE: [PATCH v4 0/2] CryptoPkg/OpensslLib: Add native instruction
support for X64

Hi Zurcher
I have given the feedback to move ApiHooks.c to X64 dir.

But I do not see your response, and I do not see you are following the

ApiHooks.c is for any compiler building the assembly files, not only Visual
[Jiewen] Got it. Thanks for the clarification.
It is only needed for X64 assembly. Right?
If so, I recommend to put it to [Source.X64]

-----Original Message-----
From: Christopher J Zurcher <>
Sent: Thursday, October 29, 2020 2:16 AM
Cc: Yao, Jiewen <>; Wang, Jian J
<>; Lu, XiaoyuX <>; Kinney,
Michael D <>; Ard Biesheuvel
Subject: [PATCH v4 0/2] CryptoPkg/OpensslLib: Add native instruction
support for X64

V4 Changes:
Add copyright header to uefi-asm.conf
Move [Sources.X64] block to cover entire X64-specific config

V3 Changes:
Added definitions for ptrdiff_t and wchar_t to CrtLibSupport.h for
LLVM/Clang build support.
Added -UWIN32 to GCC Flags for LLVM/Clang build support.
Added missing AES GCM assembly file.

V2 Changes:
Limit scope of assembly config to SHA and AES functions.
Removed IA32 native support (reduced config was causing build failure and
can be added in a later patch).
Removed XMM instructions from assembly generation.
Added automatic copyright header porting for generated assembly files.

This patch adds support for building the native instruction algorithms for
the X64 architecture in OpensslLib. The script was
to parse the .asm file targets from the OpenSSL build config data struct,
generate the necessary assembly files for the EDK2 build environment.

For the X64 variant, OpenSSL includes calls to a Windows error handling
and that function has been stubbed out in ApiHooks.c.

For all variants, a constructor is added to call the required CPUID
within OpenSSL to facilitate processor capability checks in the native

Additional native architecture variants should be simple to add by
the changes made for this architecture.

The OpenSSL assembly files are traditionally generated at build time using
perl script. To avoid that burden on EDK2 users, these end-result assembly
files are generated during the configuration steps performed by the package
maintainer (through The perl generator scripts inside
OpenSSL do not parse file comments as they are only meant to create
intermediate build files, so contains additional hooks to
preserve the copyright headers as well as clean up tabs and line endings to
comply with EDK2 coding standards. The resulting file headers align with
the generated .h files which are already included in the EDK2 repository.

Cc: Jiewen Yao <>
Cc: Jian J Wang <>
Cc: Xiaoyu Lu <>
Cc: Mike Kinney <>
Cc: Ard Biesheuvel <>

Christopher J Zurcher (2):
CryptoPkg/OpensslLib: Add native instruction support for X64
CryptoPkg/OpensslLib: Commit the auto-generated assembly files for X64

CryptoPkg/Library/OpensslLib/OpensslLib.inf |
2 +-
CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf |
2 +-
CryptoPkg/Library/OpensslLib/OpensslLibX64.inf |
655 +++
CryptoPkg/Library/Include/CrtLibSupport.h |
2 +
CryptoPkg/Library/Include/openssl/opensslconf.h |
3 -
CryptoPkg/Library/OpensslLib/ApiHooks.c |
18 +
CryptoPkg/Library/OpensslLib/OpensslLibConstructor.c |
34 +
CryptoPkg/Library/OpensslLib/X64/crypto/aes/aesni-mb-x86_64.nasm |
732 +++
CryptoPkg/Library/OpensslLib/X64/crypto/aes/aesni-sha1-x86_64.nasm |
1916 ++++++++
CryptoPkg/Library/OpensslLib/X64/crypto/aes/aesni-sha256-x86_64.nasm |
78 +
CryptoPkg/Library/OpensslLib/X64/crypto/aes/aesni-x86_64.nasm |
5103 ++++++++++++++++++++
CryptoPkg/Library/OpensslLib/X64/crypto/aes/vpaes-x86_64.nasm |
1173 +++++
CryptoPkg/Library/OpensslLib/X64/crypto/modes/aesni-gcm-x86_64.nasm |
34 +
CryptoPkg/Library/OpensslLib/X64/crypto/modes/ghash-x86_64.nasm |
1569 ++++++
CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha1-mb-x86_64.nasm |
3137 ++++++++++++
CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha1-x86_64.nasm |
2884 +++++++++++
CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha256-mb-x86_64.nasm |
3461 +++++++++++++
CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha256-x86_64.nasm |
3313 +++++++++++++
CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha512-x86_64.nasm |
1938 ++++++++
CryptoPkg/Library/OpensslLib/X64/crypto/x86_64cpuid.nasm |
CryptoPkg/Library/OpensslLib/ |
223 +-
CryptoPkg/Library/OpensslLib/uefi-asm.conf |
21 +
22 files changed, 26739 insertions(+), 50 deletions(-)
create mode 100644 CryptoPkg/Library/OpensslLib/OpensslLibX64.inf
create mode 100644 CryptoPkg/Library/OpensslLib/ApiHooks.c
create mode 100644 CryptoPkg/Library/OpensslLib/OpensslLibConstructor.c
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/aes/aesni-
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/aes/aesni-
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/aes/aesni-
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/aes/aesni-
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/aes/vpaes-
create mode 100644
create mode 100644
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha1-
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha1-
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha256-
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha256-
create mode 100644 CryptoPkg/Library/OpensslLib/X64/crypto/sha/sha512-
create mode 100644
create mode 100644 CryptoPkg/Library/OpensslLib/uefi-asm.conf


Join to automatically receive all group messages.