From 3b21958bf2a3eca22a0e3af4001df441a317f24a Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 29 Oct 2015 14:17:15 +0000 Subject: 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 , 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 Tested-by: Laszlo Ersek Reviewed-by: Qin Long git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18706 6f19259b-4bc3-4df7-8a09-765794883524 --- .../BaseCryptLibRuntimeCryptProtocol/InternalCryptLib.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol') 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.
+Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.
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 #include -// -// Environment Setting for OpenSSL-based UEFI Crypto Library. -// -#ifndef OPENSSL_SYSNAME_UWIN -#define OPENSSL_SYSNAME_UWIN -#endif - - #endif -- cgit v1.2.3