diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2015-10-29 14:17:15 +0000 |
|---|---|---|
| committer | qlong <qlong@Edk2> | 2015-10-29 14:17:15 +0000 |
| commit | 3b21958bf2a3eca22a0e3af4001df441a317f24a (patch) | |
| tree | 8dcaf3530bb6a0d76c63044063560561515bf275 /CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/InternalCryptLib.h | |
| parent | 5121a764614a9b56aee34d9a278a36dfd95e1d4e (diff) | |
| download | edk2-3b21958bf2a3eca22a0e3af4001df441a317f24a.tar.gz edk2-3b21958bf2a3eca22a0e3af4001df441a317f24a.tar.bz2 edk2-3b21958bf2a3eca22a0e3af4001df441a317f24a.zip | |
CryptoPkg: Fix OpenSSL BN wordsize and OPENSSL_SYS_UEFI handling
We were manually setting -DSIXTY_FOUR_BIT_LONG or -DTHIRTY_TWO_BIT on
the compiler command line when building OpensslLib itself, but not when
building BaseCryptLib.
But when building BaseCryptLib, we weren't setting OPENSSL_SYS_UEFI
*either*. This meant that *that* build was picking up the definition
from <openssl/opensslconf.h>, and was thus *different* to the version
the library was built with, in some cases.
So set OPENSSL_SYS_UEFI consistently in OpensslSupport.h and *also*
define either SIXTY_FOUR_BIT or THIRTY_TWO_BIT there too.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Qin Long <qin.long@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18706 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/InternalCryptLib.h')
| -rw-r--r-- | CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/InternalCryptLib.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/InternalCryptLib.h b/CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/InternalCryptLib.h index 959ad0a0f5..24c767ced6 100644 --- a/CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/InternalCryptLib.h +++ b/CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/InternalCryptLib.h @@ -1,7 +1,7 @@ /** @file
Internal include file for BaseCryptLibRuntimeCryptProtocol.
-Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2012 - 2015, 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
@@ -19,13 +19,5 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/DebugLib.h>
#include <Library/BaseCryptLib.h>
-//
-// Environment Setting for OpenSSL-based UEFI Crypto Library.
-//
-#ifndef OPENSSL_SYSNAME_UWIN
-#define OPENSSL_SYSNAME_UWIN
-#endif
-
-
#endif
|