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>

diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
index 4561f3ffa9a87ebf9c6cdd908a32dd3fa2033a30..82d24f566c332d0bf2809a178fc88d6e52b9fdaa 100644 (file)
--- a/CryptoPkg/CryptoPkg.dec
+++ b/CryptoPkg/CryptoPkg.dec
@@ -4,7 +4,7 @@
 #  This Package provides cryptographic-related libraries for UEFI security modules.\r
 #  It also provides a test application to test libraries.\r
 #\r
-#  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -24,6 +24,7 @@
 \r
 [Includes]\r
   Include\r
+  Library/OpensslLib/openssl-1.0.2f/include\r
 \r
 [LibraryClasses]\r
   ##  @libraryclass  Provides basic library functions for cryptographic primitives.\r

diff --git a/CryptoPkg/Include/openssl/README b/CryptoPkg/Include/openssl/README
deleted file mode 100644 (file)
index 1594010..0000000
--- a/CryptoPkg/Include/openssl/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains all the public include files from the OpenSSL project.\r

diff --git a/CryptoPkg/Library/OpensslLib/Install.cmd b/CryptoPkg/Library/OpensslLib/Install.cmd
index a96501cafc717b8b2665992a9dde60bb580785ce..5d7ad5f43cb10f59c7f20cedf565e9d7558edef7 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/Install.cmd
+++ b/CryptoPkg/Library/OpensslLib/Install.cmd
@@ -1,77 +1,78 @@
 cd openssl-1.0.2f\r
-copy e_os2.h                    ..\..\..\Include\openssl\r
-copy crypto\crypto.h            ..\..\..\Include\openssl\r
-copy crypto\opensslv.h          ..\..\..\Include\openssl\r
-copy crypto\opensslconf.h       ..\..\..\Include\openssl\r
-copy crypto\ebcdic.h            ..\..\..\Include\openssl\r
-copy crypto\symhacks.h          ..\..\..\Include\openssl\r
-copy crypto\ossl_typ.h          ..\..\..\Include\openssl\r
-copy crypto\objects\objects.h   ..\..\..\Include\openssl\r
-copy crypto\objects\obj_mac.h   ..\..\..\Include\openssl\r
-copy crypto\md4\md4.h           ..\..\..\Include\openssl\r
-copy crypto\md5\md5.h           ..\..\..\Include\openssl\r
-copy crypto\sha\sha.h           ..\..\..\Include\openssl\r
-copy crypto\mdc2\mdc2.h         ..\..\..\Include\openssl\r
-copy crypto\hmac\hmac.h         ..\..\..\Include\openssl\r
-copy crypto\ripemd\ripemd.h     ..\..\..\Include\openssl\r
-copy crypto\whrlpool\whrlpool.h ..\..\..\Include\openssl\r
-copy crypto\des\des.h           ..\..\..\Include\openssl\r
-copy crypto\des\des_old.h       ..\..\..\Include\openssl\r
-copy crypto\aes\aes.h           ..\..\..\Include\openssl\r
-copy crypto\rc2\rc2.h           ..\..\..\Include\openssl\r
-copy crypto\rc4\rc4.h           ..\..\..\Include\openssl\r
-copy crypto\idea\idea.h         ..\..\..\Include\openssl\r
-copy crypto\bf\blowfish.h       ..\..\..\Include\openssl\r
-copy crypto\cast\cast.h         ..\..\..\Include\openssl\r
-copy crypto\camellia\camellia.h ..\..\..\Include\openssl\r
-copy crypto\seed\seed.h         ..\..\..\Include\openssl\r
-copy crypto\modes\modes.h       ..\..\..\Include\openssl\r
-copy crypto\bn\bn.h             ..\..\..\Include\openssl\r
-copy crypto\ec\ec.h             ..\..\..\Include\openssl\r
-copy crypto\rsa\rsa.h           ..\..\..\Include\openssl\r
-copy crypto\dsa\dsa.h           ..\..\..\Include\openssl\r
-copy crypto\ecdsa\ecdsa.h       ..\..\..\Include\openssl\r
-copy crypto\dh\dh.h             ..\..\..\Include\openssl\r
-copy crypto\ecdh\ecdh.h         ..\..\..\Include\openssl\r
-copy crypto\dso\dso.h           ..\..\..\Include\openssl\r
-copy crypto\engine\engine.h     ..\..\..\Include\openssl\r
-copy crypto\buffer\buffer.h     ..\..\..\Include\openssl\r
-copy crypto\bio\bio.h           ..\..\..\Include\openssl\r
-copy crypto\stack\stack.h       ..\..\..\Include\openssl\r
-copy crypto\stack\safestack.h   ..\..\..\Include\openssl\r
-copy crypto\lhash\lhash.h       ..\..\..\Include\openssl\r
-copy crypto\rand\rand.h         ..\..\..\Include\openssl\r
-copy crypto\err\err.h           ..\..\..\Include\openssl\r
-copy crypto\evp\evp.h           ..\..\..\Include\openssl\r
-copy crypto\asn1\asn1.h         ..\..\..\Include\openssl\r
-copy crypto\asn1\asn1_mac.h     ..\..\..\Include\openssl\r
-copy crypto\asn1\asn1t.h        ..\..\..\Include\openssl\r
-copy crypto\pem\pem.h           ..\..\..\Include\openssl\r
-copy crypto\pem\pem2.h          ..\..\..\Include\openssl\r
-copy crypto\x509\x509.h         ..\..\..\Include\openssl\r
-copy crypto\x509\x509_vfy.h     ..\..\..\Include\openssl\r
-copy crypto\x509v3\x509v3.h     ..\..\..\Include\openssl\r
-copy crypto\conf\conf.h         ..\..\..\Include\openssl\r
-copy crypto\conf\conf_api.h     ..\..\..\Include\openssl\r
-copy crypto\txt_db\txt_db.h     ..\..\..\Include\openssl\r
-copy crypto\pkcs7\pkcs7.h       ..\..\..\Include\openssl\r
-copy crypto\pkcs12\pkcs12.h     ..\..\..\Include\openssl\r
-copy crypto\comp\comp.h         ..\..\..\Include\openssl\r
-copy crypto\ocsp\ocsp.h         ..\..\..\Include\openssl\r
-copy crypto\ui\ui.h             ..\..\..\Include\openssl\r
-copy crypto\ui\ui_compat.h      ..\..\..\Include\openssl\r
-copy crypto\krb5\krb5_asn.h     ..\..\..\Include\openssl\r
-copy crypto\cms\cms.h           ..\..\..\Include\openssl\r
-copy crypto\pqueue\pqueue.h     ..\..\..\Include\openssl\r
-copy crypto\ts\ts.h             ..\..\..\Include\openssl\r
-copy crypto\srp\srp.h           ..\..\..\Include\openssl\r
-copy crypto\cmac\cmac.h         ..\..\..\Include\openssl\r
-copy ssl\ssl.h                  ..\..\..\Include\openssl\r
-copy ssl\ssl2.h                 ..\..\..\Include\openssl\r
-copy ssl\ssl3.h                 ..\..\..\Include\openssl\r
-copy ssl\ssl23.h                ..\..\..\Include\openssl\r
-copy ssl\tls1.h                 ..\..\..\Include\openssl\r
-copy ssl\dtls1.h                ..\..\..\Include\openssl\r
-copy ssl\kssl.h                 ..\..\..\Include\openssl\r
-copy ssl\srtp.h                 ..\..\..\Include\openssl\r
+if not exist include\openssl mkdir include\openssl\r
+copy e_os2.h                    include\openssl\r
+copy crypto\crypto.h            include\openssl\r
+copy crypto\opensslv.h          include\openssl\r
+copy crypto\opensslconf.h       include\openssl\r
+copy crypto\ebcdic.h            include\openssl\r
+copy crypto\symhacks.h          include\openssl\r
+copy crypto\ossl_typ.h          include\openssl\r
+copy crypto\objects\objects.h   include\openssl\r
+copy crypto\objects\obj_mac.h   include\openssl\r
+copy crypto\md4\md4.h           include\openssl\r
+copy crypto\md5\md5.h           include\openssl\r
+copy crypto\sha\sha.h           include\openssl\r
+copy crypto\mdc2\mdc2.h         include\openssl\r
+copy crypto\hmac\hmac.h         include\openssl\r
+copy crypto\ripemd\ripemd.h     include\openssl\r
+copy crypto\whrlpool\whrlpool.h include\openssl\r
+copy crypto\des\des.h           include\openssl\r
+copy crypto\des\des_old.h       include\openssl\r
+copy crypto\aes\aes.h           include\openssl\r
+copy crypto\rc2\rc2.h           include\openssl\r
+copy crypto\rc4\rc4.h           include\openssl\r
+copy crypto\idea\idea.h         include\openssl\r
+copy crypto\bf\blowfish.h       include\openssl\r
+copy crypto\cast\cast.h         include\openssl\r
+copy crypto\camellia\camellia.h include\openssl\r
+copy crypto\seed\seed.h         include\openssl\r
+copy crypto\modes\modes.h       include\openssl\r
+copy crypto\bn\bn.h             include\openssl\r
+copy crypto\ec\ec.h             include\openssl\r
+copy crypto\rsa\rsa.h           include\openssl\r
+copy crypto\dsa\dsa.h           include\openssl\r
+copy crypto\ecdsa\ecdsa.h       include\openssl\r
+copy crypto\dh\dh.h             include\openssl\r
+copy crypto\ecdh\ecdh.h         include\openssl\r
+copy crypto\dso\dso.h           include\openssl\r
+copy crypto\engine\engine.h     include\openssl\r
+copy crypto\buffer\buffer.h     include\openssl\r
+copy crypto\bio\bio.h           include\openssl\r
+copy crypto\stack\stack.h       include\openssl\r
+copy crypto\stack\safestack.h   include\openssl\r
+copy crypto\lhash\lhash.h       include\openssl\r
+copy crypto\rand\rand.h         include\openssl\r
+copy crypto\err\err.h           include\openssl\r
+copy crypto\evp\evp.h           include\openssl\r
+copy crypto\asn1\asn1.h         include\openssl\r
+copy crypto\asn1\asn1_mac.h     include\openssl\r
+copy crypto\asn1\asn1t.h        include\openssl\r
+copy crypto\pem\pem.h           include\openssl\r
+copy crypto\pem\pem2.h          include\openssl\r
+copy crypto\x509\x509.h         include\openssl\r
+copy crypto\x509\x509_vfy.h     include\openssl\r
+copy crypto\x509v3\x509v3.h     include\openssl\r
+copy crypto\conf\conf.h         include\openssl\r
+copy crypto\conf\conf_api.h     include\openssl\r
+copy crypto\txt_db\txt_db.h     include\openssl\r
+copy crypto\pkcs7\pkcs7.h       include\openssl\r
+copy crypto\pkcs12\pkcs12.h     include\openssl\r
+copy crypto\comp\comp.h         include\openssl\r
+copy crypto\ocsp\ocsp.h         include\openssl\r
+copy crypto\ui\ui.h             include\openssl\r
+copy crypto\ui\ui_compat.h      include\openssl\r
+copy crypto\krb5\krb5_asn.h     include\openssl\r
+copy crypto\cms\cms.h           include\openssl\r
+copy crypto\pqueue\pqueue.h     include\openssl\r
+copy crypto\ts\ts.h             include\openssl\r
+copy crypto\srp\srp.h           include\openssl\r
+copy crypto\cmac\cmac.h         include\openssl\r
+copy ssl\ssl.h                  include\openssl\r
+copy ssl\ssl2.h                 include\openssl\r
+copy ssl\ssl3.h                 include\openssl\r
+copy ssl\ssl23.h                include\openssl\r
+copy ssl\tls1.h                 include\openssl\r
+copy ssl\dtls1.h                include\openssl\r
+copy ssl\kssl.h                 include\openssl\r
+copy ssl\srtp.h                 include\openssl\r
 cd ..\r

diff --git a/CryptoPkg/Library/OpensslLib/Install.sh b/CryptoPkg/Library/OpensslLib/Install.sh
index 76648cd5a34c82ce1600e8393a7c3e52ecf88183..323d2de61cba5cf451dc4d09dc23d26f2f270dd9 100755 (executable)
--- 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 ..