420e508397
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>
53 lines
1.7 KiB
C
53 lines
1.7 KiB
C
/** @file
|
|
Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based
|
|
Cryptographic Library.
|
|
|
|
Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
|
|
This program and the accompanying materials
|
|
are licensed and made available under the terms and conditions of the BSD License
|
|
which accompanies this distribution. The full text of the license may be found at
|
|
http://opensource.org/licenses/bsd-license.php
|
|
|
|
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
|
|
**/
|
|
|
|
#include <Base.h>
|
|
#include <Library/BaseMemoryLib.h>
|
|
#include <Library/BaseLib.h>
|
|
|
|
/* OpenSSL will use floating point support, and C compiler produces the _fltused
|
|
symbol by default. Simply define this symbol here to satisfy the linker. */
|
|
int _fltused = 1;
|
|
|
|
/* Sets buffers to a specified character */
|
|
void * memset (void *dest, char ch, unsigned int count)
|
|
{
|
|
//
|
|
// NOTE: Here we use one base implementation for memset, instead of the direct
|
|
// optimized SetMem() wrapper. Because the IntrinsicLib has to be built
|
|
// without whole program optimization option, and there will be some
|
|
// potential register usage errors when calling other optimized codes.
|
|
//
|
|
|
|
//
|
|
// Declare the local variables that actually move the data elements as
|
|
// volatile to prevent the optimizer from replacing this function with
|
|
// the intrinsic memset()
|
|
//
|
|
volatile UINT8 *Pointer;
|
|
|
|
Pointer = (UINT8 *)dest;
|
|
while (count-- != 0) {
|
|
*(Pointer++) = ch;
|
|
}
|
|
|
|
return dest;
|
|
}
|
|
|
|
int strcmp (const char *s1, const char *s2)
|
|
{
|
|
return (int)AsciiStrCmp(s1, s2);
|
|
}
|