Revision: 19555
http://sourceforge.net/p/edk2/code/19555
Author: vanjeff
Date: 2015-12-29 03:11:08 +0000 (Tue, 29 Dec 2015)
Log Message:
-----------
CryptoPkg/BaseCryptLib: Add missing OpenSSL includes
OpenSSL 1.1 has cleaned up its include files a little, and it will now
be necessary to directly include things like <openssl/bn.h> if we want
to use them, rather than assuming they are included indirectly from
other headers.
(Sync patch r18698 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: David Woodhouse <[email protected]>
Tested-by: Laszlo Ersek <[email protected]>
Reviewed-by: Qin Long <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/18698
Modified Paths:
--------------
branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
Modified: branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
===================================================================
--- branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
2015-12-29 03:10:32 UTC (rev 19554)
+++ branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
2015-12-29 03:11:08 UTC (rev 19555)
@@ -1,7 +1,7 @@
/** @file
Diffie-Hellman Wrapper Implementation over OpenSSL.
-Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 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
@@ -13,6 +13,7 @@
**/
#include "InternalCryptLib.h"
+#include <openssl/bn.h>
#include <openssl/dh.h>
Modified: branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
===================================================================
--- branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
2015-12-29 03:10:32 UTC (rev 19554)
+++ branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
2015-12-29 03:11:08 UTC (rev 19555)
@@ -7,7 +7,7 @@
3) RsaSetKey
4) RsaPkcs1Verify
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 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
@@ -20,6 +20,7 @@
#include "InternalCryptLib.h"
+#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/objects.h>
Modified: branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
===================================================================
--- branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
2015-12-29 03:10:32 UTC (rev 19554)
+++ branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
2015-12-29 03:11:08 UTC (rev 19555)
@@ -7,7 +7,7 @@
3) RsaCheckKey
4) RsaPkcs1Sign
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 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
@@ -20,6 +20,7 @@
#include "InternalCryptLib.h"
+#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/err.h>
#include <openssl/objects.h>
Modified: branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
===================================================================
--- branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
2015-12-29 03:10:32 UTC (rev 19554)
+++ branches/UDK2015/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
2015-12-29 03:11:08 UTC (rev 19555)
@@ -14,8 +14,8 @@
#include "InternalCryptLib.h"
#include <openssl/x509.h>
+#include <openssl/rsa.h>
-
/**
Construct a X509 object from DER-encoded certificate data.
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
