]> git.proxmox.com Git - mirror_edk2.git/commit - CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
CryptoPkg: Fix handling of &strcmp function pointers
authorQin Long <qin.long@intel.com>
Thu, 23 Mar 2017 12:09:17 +0000 (20:09 +0800)
committerQin Long <qin.long@intel.com>
Wed, 29 Mar 2017 08:12:32 +0000 (16:12 +0800)
commit420e508397c7775667f6935405bbd4accecd232e
treea888ebf043f39514470a4add27816761ba257838
parentd2cd3b683055a69670b975e3de4513d4344b7508
CryptoPkg: Fix handling of &strcmp function pointers

In a couple of places, OpenSSL code uses the address of the
strcmp() function, and assigns it to another comparator function
pointer.

Unfortunately, this falls foul of the inconsistent function ABI
that we use in EDKII. We '#define strcmp AsciiStrCmp' but AsciiStrCmp
is an EFIAPI function with the Microsoft ABI. And we're assigning its
address to a non-EFIAPI function, which may well have a different ABI.

Fix this by providing an actual strcmp() function in the default ABI.
We already *had* a prototype for it in OpenSslSupport.h, which was
then superseded by the #define strcmp AsciiStrCmp.

Now, OpenSSL code *can* use &strcmp without problems.

Cc: Ting Ye <ting.ye@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gary Lin <glin@suse.com>
Cc: Ronald Cron <ronald.cron@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Qin Long <qin.long@intel.com>
Reviewed-by: Ting Ye <ting.ye@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Gary Lin <glin@suse.com>
CryptoPkg/Include/OpenSslSupport.h
CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c