diff options
author | Qin Long <qin.long@intel.com> | 2016-03-05 23:32:55 +0800 |
---|---|---|
committer | Hao Wu <hao.a.wu@intel.com> | 2016-03-14 08:44:16 +0800 |
commit | bf677a3a88377c1f7012406c0a20dd9503991462 (patch) | |
tree | cc22116c2ebc8ededee0a3909b064d16bc349598 /CryptoPkg | |
parent | 5f963dd8c893783a2aef3c1b7854dc2b7f3e7468 (diff) | |
download | edk2-platforms-bf677a3a88377c1f7012406c0a20dd9503991462.tar.xz |
CryptoPkg: Use OpenSSL include directory directly
The standard OpenSSL 1.0.2 configuration and build process will already
symlink or copy the necessary header files to the include/openssl/
directory within the OpenSSL source tree.
When we transition to OpenSSL 1.1 it won't even be necessary to link
or copy the files there; they have just been moved outright.
So let's use them from there. Change the include directory specified
in CryptoPkg/CryptoPkg.dec, and modify the Install.cmd and Install.sh
scripts to copy the files to the normal directory within the OpenSSL
source tree, instead of CryptoPkg/Include/openssl/.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Qin Long <qin.long@intel.com>
Tested-by: Qin Long <qin.long@intel.com>
(cherry picked from commit 6c56c76c75ef24e3ab103494a9236da73ad1ffa5)
Diffstat (limited to 'CryptoPkg')
-rw-r--r-- | CryptoPkg/CryptoPkg.dec | 3 | ||||
-rw-r--r-- | CryptoPkg/Include/openssl/README | 1 | ||||
-rwxr-xr-x | CryptoPkg/Library/OpensslLib/Install.cmd | 151 | ||||
-rwxr-xr-x | CryptoPkg/Library/OpensslLib/Install.sh | 151 |
4 files changed, 154 insertions, 152 deletions
diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec index 4561f3ffa9..82d24f566c 100644 --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -4,7 +4,7 @@ # This Package provides cryptographic-related libraries for UEFI security modules.
# It also provides a test application to test libraries.
#
-# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2016, 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
@@ -24,6 +24,7 @@ [Includes]
Include
+ Library/OpensslLib/openssl-1.0.2f/include
[LibraryClasses]
## @libraryclass Provides basic library functions for cryptographic primitives.
diff --git a/CryptoPkg/Include/openssl/README b/CryptoPkg/Include/openssl/README deleted file mode 100644 index 15940109a9..0000000000 --- a/CryptoPkg/Include/openssl/README +++ /dev/null @@ -1 +0,0 @@ -This directory contains all the public include files from the OpenSSL project.
diff --git a/CryptoPkg/Library/OpensslLib/Install.cmd b/CryptoPkg/Library/OpensslLib/Install.cmd index a96501cafc..5d7ad5f43c 100755 --- a/CryptoPkg/Library/OpensslLib/Install.cmd +++ b/CryptoPkg/Library/OpensslLib/Install.cmd @@ -1,77 +1,78 @@ cd openssl-1.0.2f
-copy e_os2.h ..\..\..\Include\openssl
-copy crypto\crypto.h ..\..\..\Include\openssl
-copy crypto\opensslv.h ..\..\..\Include\openssl
-copy crypto\opensslconf.h ..\..\..\Include\openssl
-copy crypto\ebcdic.h ..\..\..\Include\openssl
-copy crypto\symhacks.h ..\..\..\Include\openssl
-copy crypto\ossl_typ.h ..\..\..\Include\openssl
-copy crypto\objects\objects.h ..\..\..\Include\openssl
-copy crypto\objects\obj_mac.h ..\..\..\Include\openssl
-copy crypto\md4\md4.h ..\..\..\Include\openssl
-copy crypto\md5\md5.h ..\..\..\Include\openssl
-copy crypto\sha\sha.h ..\..\..\Include\openssl
-copy crypto\mdc2\mdc2.h ..\..\..\Include\openssl
-copy crypto\hmac\hmac.h ..\..\..\Include\openssl
-copy crypto\ripemd\ripemd.h ..\..\..\Include\openssl
-copy crypto\whrlpool\whrlpool.h ..\..\..\Include\openssl
-copy crypto\des\des.h ..\..\..\Include\openssl
-copy crypto\des\des_old.h ..\..\..\Include\openssl
-copy crypto\aes\aes.h ..\..\..\Include\openssl
-copy crypto\rc2\rc2.h ..\..\..\Include\openssl
-copy crypto\rc4\rc4.h ..\..\..\Include\openssl
-copy crypto\idea\idea.h ..\..\..\Include\openssl
-copy crypto\bf\blowfish.h ..\..\..\Include\openssl
-copy crypto\cast\cast.h ..\..\..\Include\openssl
-copy crypto\camellia\camellia.h ..\..\..\Include\openssl
-copy crypto\seed\seed.h ..\..\..\Include\openssl
-copy crypto\modes\modes.h ..\..\..\Include\openssl
-copy crypto\bn\bn.h ..\..\..\Include\openssl
-copy crypto\ec\ec.h ..\..\..\Include\openssl
-copy crypto\rsa\rsa.h ..\..\..\Include\openssl
-copy crypto\dsa\dsa.h ..\..\..\Include\openssl
-copy crypto\ecdsa\ecdsa.h ..\..\..\Include\openssl
-copy crypto\dh\dh.h ..\..\..\Include\openssl
-copy crypto\ecdh\ecdh.h ..\..\..\Include\openssl
-copy crypto\dso\dso.h ..\..\..\Include\openssl
-copy crypto\engine\engine.h ..\..\..\Include\openssl
-copy crypto\buffer\buffer.h ..\..\..\Include\openssl
-copy crypto\bio\bio.h ..\..\..\Include\openssl
-copy crypto\stack\stack.h ..\..\..\Include\openssl
-copy crypto\stack\safestack.h ..\..\..\Include\openssl
-copy crypto\lhash\lhash.h ..\..\..\Include\openssl
-copy crypto\rand\rand.h ..\..\..\Include\openssl
-copy crypto\err\err.h ..\..\..\Include\openssl
-copy crypto\evp\evp.h ..\..\..\Include\openssl
-copy crypto\asn1\asn1.h ..\..\..\Include\openssl
-copy crypto\asn1\asn1_mac.h ..\..\..\Include\openssl
-copy crypto\asn1\asn1t.h ..\..\..\Include\openssl
-copy crypto\pem\pem.h ..\..\..\Include\openssl
-copy crypto\pem\pem2.h ..\..\..\Include\openssl
-copy crypto\x509\x509.h ..\..\..\Include\openssl
-copy crypto\x509\x509_vfy.h ..\..\..\Include\openssl
-copy crypto\x509v3\x509v3.h ..\..\..\Include\openssl
-copy crypto\conf\conf.h ..\..\..\Include\openssl
-copy crypto\conf\conf_api.h ..\..\..\Include\openssl
-copy crypto\txt_db\txt_db.h ..\..\..\Include\openssl
-copy crypto\pkcs7\pkcs7.h ..\..\..\Include\openssl
-copy crypto\pkcs12\pkcs12.h ..\..\..\Include\openssl
-copy crypto\comp\comp.h ..\..\..\Include\openssl
-copy crypto\ocsp\ocsp.h ..\..\..\Include\openssl
-copy crypto\ui\ui.h ..\..\..\Include\openssl
-copy crypto\ui\ui_compat.h ..\..\..\Include\openssl
-copy crypto\krb5\krb5_asn.h ..\..\..\Include\openssl
-copy crypto\cms\cms.h ..\..\..\Include\openssl
-copy crypto\pqueue\pqueue.h ..\..\..\Include\openssl
-copy crypto\ts\ts.h ..\..\..\Include\openssl
-copy crypto\srp\srp.h ..\..\..\Include\openssl
-copy crypto\cmac\cmac.h ..\..\..\Include\openssl
-copy ssl\ssl.h ..\..\..\Include\openssl
-copy ssl\ssl2.h ..\..\..\Include\openssl
-copy ssl\ssl3.h ..\..\..\Include\openssl
-copy ssl\ssl23.h ..\..\..\Include\openssl
-copy ssl\tls1.h ..\..\..\Include\openssl
-copy ssl\dtls1.h ..\..\..\Include\openssl
-copy ssl\kssl.h ..\..\..\Include\openssl
-copy ssl\srtp.h ..\..\..\Include\openssl
+if not exist include\openssl mkdir include\openssl
+copy e_os2.h include\openssl
+copy crypto\crypto.h include\openssl
+copy crypto\opensslv.h include\openssl
+copy crypto\opensslconf.h include\openssl
+copy crypto\ebcdic.h include\openssl
+copy crypto\symhacks.h include\openssl
+copy crypto\ossl_typ.h include\openssl
+copy crypto\objects\objects.h include\openssl
+copy crypto\objects\obj_mac.h include\openssl
+copy crypto\md4\md4.h include\openssl
+copy crypto\md5\md5.h include\openssl
+copy crypto\sha\sha.h include\openssl
+copy crypto\mdc2\mdc2.h include\openssl
+copy crypto\hmac\hmac.h include\openssl
+copy crypto\ripemd\ripemd.h include\openssl
+copy crypto\whrlpool\whrlpool.h include\openssl
+copy crypto\des\des.h include\openssl
+copy crypto\des\des_old.h include\openssl
+copy crypto\aes\aes.h include\openssl
+copy crypto\rc2\rc2.h include\openssl
+copy crypto\rc4\rc4.h include\openssl
+copy crypto\idea\idea.h include\openssl
+copy crypto\bf\blowfish.h include\openssl
+copy crypto\cast\cast.h include\openssl
+copy crypto\camellia\camellia.h include\openssl
+copy crypto\seed\seed.h include\openssl
+copy crypto\modes\modes.h include\openssl
+copy crypto\bn\bn.h include\openssl
+copy crypto\ec\ec.h include\openssl
+copy crypto\rsa\rsa.h include\openssl
+copy crypto\dsa\dsa.h include\openssl
+copy crypto\ecdsa\ecdsa.h include\openssl
+copy crypto\dh\dh.h include\openssl
+copy crypto\ecdh\ecdh.h include\openssl
+copy crypto\dso\dso.h include\openssl
+copy crypto\engine\engine.h include\openssl
+copy crypto\buffer\buffer.h include\openssl
+copy crypto\bio\bio.h include\openssl
+copy crypto\stack\stack.h include\openssl
+copy crypto\stack\safestack.h include\openssl
+copy crypto\lhash\lhash.h include\openssl
+copy crypto\rand\rand.h include\openssl
+copy crypto\err\err.h include\openssl
+copy crypto\evp\evp.h include\openssl
+copy crypto\asn1\asn1.h include\openssl
+copy crypto\asn1\asn1_mac.h include\openssl
+copy crypto\asn1\asn1t.h include\openssl
+copy crypto\pem\pem.h include\openssl
+copy crypto\pem\pem2.h include\openssl
+copy crypto\x509\x509.h include\openssl
+copy crypto\x509\x509_vfy.h include\openssl
+copy crypto\x509v3\x509v3.h include\openssl
+copy crypto\conf\conf.h include\openssl
+copy crypto\conf\conf_api.h include\openssl
+copy crypto\txt_db\txt_db.h include\openssl
+copy crypto\pkcs7\pkcs7.h include\openssl
+copy crypto\pkcs12\pkcs12.h include\openssl
+copy crypto\comp\comp.h include\openssl
+copy crypto\ocsp\ocsp.h include\openssl
+copy crypto\ui\ui.h include\openssl
+copy crypto\ui\ui_compat.h include\openssl
+copy crypto\krb5\krb5_asn.h include\openssl
+copy crypto\cms\cms.h include\openssl
+copy crypto\pqueue\pqueue.h include\openssl
+copy crypto\ts\ts.h include\openssl
+copy crypto\srp\srp.h include\openssl
+copy crypto\cmac\cmac.h include\openssl
+copy ssl\ssl.h include\openssl
+copy ssl\ssl2.h include\openssl
+copy ssl\ssl3.h include\openssl
+copy ssl\ssl23.h include\openssl
+copy ssl\tls1.h include\openssl
+copy ssl\dtls1.h include\openssl
+copy ssl\kssl.h include\openssl
+copy ssl\srtp.h include\openssl
cd ..
diff --git a/CryptoPkg/Library/OpensslLib/Install.sh b/CryptoPkg/Library/OpensslLib/Install.sh index 76648cd5a3..323d2de61c 100755 --- a/CryptoPkg/Library/OpensslLib/Install.sh +++ b/CryptoPkg/Library/OpensslLib/Install.sh @@ -1,79 +1,80 @@ #!/bin/sh cd openssl-1.0.2f -cp e_os2.h ../../../Include/openssl -cp crypto/crypto.h ../../../Include/openssl -cp crypto/opensslv.h ../../../Include/openssl -cp crypto/opensslconf.h ../../../Include/openssl -cp crypto/ebcdic.h ../../../Include/openssl -cp crypto/symhacks.h ../../../Include/openssl -cp crypto/ossl_typ.h ../../../Include/openssl -cp crypto/objects/objects.h ../../../Include/openssl -cp crypto/objects/obj_mac.h ../../../Include/openssl -cp crypto/md4/md4.h ../../../Include/openssl -cp crypto/md5/md5.h ../../../Include/openssl -cp crypto/sha/sha.h ../../../Include/openssl -cp crypto/mdc2/mdc2.h ../../../Include/openssl -cp crypto/hmac/hmac.h ../../../Include/openssl -cp crypto/ripemd/ripemd.h ../../../Include/openssl -cp crypto/whrlpool/whrlpool.h ../../../Include/openssl -cp crypto/des/des.h ../../../Include/openssl -cp crypto/des/des_old.h ../../../Include/openssl -cp crypto/aes/aes.h ../../../Include/openssl -cp crypto/rc2/rc2.h ../../../Include/openssl -cp crypto/rc4/rc4.h ../../../Include/openssl -cp crypto/idea/idea.h ../../../Include/openssl -cp crypto/bf/blowfish.h ../../../Include/openssl -cp crypto/cast/cast.h ../../../Include/openssl -cp crypto/camellia/camellia.h ../../../Include/openssl -cp crypto/seed/seed.h ../../../Include/openssl -cp crypto/modes/modes.h ../../../Include/openssl -cp crypto/bn/bn.h ../../../Include/openssl -cp crypto/ec/ec.h ../../../Include/openssl -cp crypto/rsa/rsa.h ../../../Include/openssl -cp crypto/dsa/dsa.h ../../../Include/openssl -cp crypto/ecdsa/ecdsa.h ../../../Include/openssl -cp crypto/dh/dh.h ../../../Include/openssl -cp crypto/ecdh/ecdh.h ../../../Include/openssl -cp crypto/dso/dso.h ../../../Include/openssl -cp crypto/engine/engine.h ../../../Include/openssl -cp crypto/buffer/buffer.h ../../../Include/openssl -cp crypto/bio/bio.h ../../../Include/openssl -cp crypto/stack/stack.h ../../../Include/openssl -cp crypto/stack/safestack.h ../../../Include/openssl -cp crypto/lhash/lhash.h ../../../Include/openssl -cp crypto/rand/rand.h ../../../Include/openssl -cp crypto/err/err.h ../../../Include/openssl -cp crypto/evp/evp.h ../../../Include/openssl -cp crypto/asn1/asn1.h ../../../Include/openssl -cp crypto/asn1/asn1_mac.h ../../../Include/openssl -cp crypto/asn1/asn1t.h ../../../Include/openssl -cp crypto/pem/pem.h ../../../Include/openssl -cp crypto/pem/pem2.h ../../../Include/openssl -cp crypto/x509/x509.h ../../../Include/openssl -cp crypto/x509/x509_vfy.h ../../../Include/openssl -cp crypto/x509v3/x509v3.h ../../../Include/openssl -cp crypto/conf/conf.h ../../../Include/openssl -cp crypto/conf/conf_api.h ../../../Include/openssl -cp crypto/txt_db/txt_db.h ../../../Include/openssl -cp crypto/pkcs7/pkcs7.h ../../../Include/openssl -cp crypto/pkcs12/pkcs12.h ../../../Include/openssl -cp crypto/comp/comp.h ../../../Include/openssl -cp crypto/ocsp/ocsp.h ../../../Include/openssl -cp crypto/ui/ui.h ../../../Include/openssl -cp crypto/ui/ui_compat.h ../../../Include/openssl -cp crypto/krb5/krb5_asn.h ../../../Include/openssl -cp crypto/cms/cms.h ../../../Include/openssl -cp crypto/pqueue/pqueue.h ../../../Include/openssl -cp crypto/ts/ts.h ../../../Include/openssl -cp crypto/srp/srp.h ../../../Include/openssl -cp crypto/cmac/cmac.h ../../../Include/openssl -cp ssl/ssl.h ../../../Include/openssl -cp ssl/ssl2.h ../../../Include/openssl -cp ssl/ssl3.h ../../../Include/openssl -cp ssl/ssl23.h ../../../Include/openssl -cp ssl/tls1.h ../../../Include/openssl -cp ssl/dtls1.h ../../../Include/openssl -cp ssl/kssl.h ../../../Include/openssl -cp ssl/srtp.h ../../../Include/openssl +mkdir -p include/openssl +cp e_os2.h include/openssl +cp crypto/crypto.h include/openssl +cp crypto/opensslv.h include/openssl +cp crypto/opensslconf.h include/openssl +cp crypto/ebcdic.h include/openssl +cp crypto/symhacks.h include/openssl +cp crypto/ossl_typ.h include/openssl +cp crypto/objects/objects.h include/openssl +cp crypto/objects/obj_mac.h include/openssl +cp crypto/md4/md4.h include/openssl +cp crypto/md5/md5.h include/openssl +cp crypto/sha/sha.h include/openssl +cp crypto/mdc2/mdc2.h include/openssl +cp crypto/hmac/hmac.h include/openssl +cp crypto/ripemd/ripemd.h include/openssl +cp crypto/whrlpool/whrlpool.h include/openssl +cp crypto/des/des.h include/openssl +cp crypto/des/des_old.h include/openssl +cp crypto/aes/aes.h include/openssl +cp crypto/rc2/rc2.h include/openssl +cp crypto/rc4/rc4.h include/openssl +cp crypto/idea/idea.h include/openssl +cp crypto/bf/blowfish.h include/openssl +cp crypto/cast/cast.h include/openssl +cp crypto/camellia/camellia.h include/openssl +cp crypto/seed/seed.h include/openssl +cp crypto/modes/modes.h include/openssl +cp crypto/bn/bn.h include/openssl +cp crypto/ec/ec.h include/openssl +cp crypto/rsa/rsa.h include/openssl +cp crypto/dsa/dsa.h include/openssl +cp crypto/ecdsa/ecdsa.h include/openssl +cp crypto/dh/dh.h include/openssl +cp crypto/ecdh/ecdh.h include/openssl +cp crypto/dso/dso.h include/openssl +cp crypto/engine/engine.h include/openssl +cp crypto/buffer/buffer.h include/openssl +cp crypto/bio/bio.h include/openssl +cp crypto/stack/stack.h include/openssl +cp crypto/stack/safestack.h include/openssl +cp crypto/lhash/lhash.h include/openssl +cp crypto/rand/rand.h include/openssl +cp crypto/err/err.h include/openssl +cp crypto/evp/evp.h include/openssl +cp crypto/asn1/asn1.h include/openssl +cp crypto/asn1/asn1_mac.h include/openssl +cp crypto/asn1/asn1t.h include/openssl +cp crypto/pem/pem.h include/openssl +cp crypto/pem/pem2.h include/openssl +cp crypto/x509/x509.h include/openssl +cp crypto/x509/x509_vfy.h include/openssl +cp crypto/x509v3/x509v3.h include/openssl +cp crypto/conf/conf.h include/openssl +cp crypto/conf/conf_api.h include/openssl +cp crypto/txt_db/txt_db.h include/openssl +cp crypto/pkcs7/pkcs7.h include/openssl +cp crypto/pkcs12/pkcs12.h include/openssl +cp crypto/comp/comp.h include/openssl +cp crypto/ocsp/ocsp.h include/openssl +cp crypto/ui/ui.h include/openssl +cp crypto/ui/ui_compat.h include/openssl +cp crypto/krb5/krb5_asn.h include/openssl +cp crypto/cms/cms.h include/openssl +cp crypto/pqueue/pqueue.h include/openssl +cp crypto/ts/ts.h include/openssl +cp crypto/srp/srp.h include/openssl +cp crypto/cmac/cmac.h include/openssl +cp ssl/ssl.h include/openssl +cp ssl/ssl2.h include/openssl +cp ssl/ssl3.h include/openssl +cp ssl/ssl23.h include/openssl +cp ssl/tls1.h include/openssl +cp ssl/dtls1.h include/openssl +cp ssl/kssl.h include/openssl +cp ssl/srtp.h include/openssl cd .. |