Re: [edk2] Merging OpenSSL support
On Fri, 2015-07-24 at 00:52 +, Long, Qin wrote: > David, > > Really thanks for your helps on this. > > For the include path issue, yes, "../openssl/crypto/include" may > include all symlinked header file. But it may depend on the unpack > utility (esp. In Windows). Some unpack tool will ignore those symlink > files or replace the content directly in Windows. That's why we need > one install script before to make sure all header files were in > place. In OpenSSL HEAD they've ditched all the symlink nonsense and the files just live in the include/ directories. -- dwmw2 smime.p7s Description: S/MIME cryptographic signature -- ___ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
Re: [edk2] Merging OpenSSL support
On Fri, 2015-07-24 at 08:06 +, Long, Qin wrote: > That's great. If so, we can remove the install script then. Well, after a 1.1 release and when we update to it. We'll be on 1.0.2 releases for a little while yet. But for the purpose of getting our changes merged into OpenSSL, of course I had to target HEAD. -- dwmw2 smime.p7s Description: S/MIME cryptographic signature -- ___ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
Re: [edk2] Merging OpenSSL support
That's great. If so, we can remove the install script then. Best Regards & Thanks, LONG, Qin -Original Message- From: David Woodhouse [mailto:[email protected]] Sent: Friday, July 24, 2015 3:49 PM To: Long, Qin; Andrew Fish Cc: [email protected] Subject: Re: [edk2] Merging OpenSSL support On Fri, 2015-07-24 at 00:52 +, Long, Qin wrote: > David, > > Really thanks for your helps on this. > > For the include path issue, yes, "../openssl/crypto/include" may > include all symlinked header file. But it may depend on the unpack > utility (esp. In Windows). Some unpack tool will ignore those symlink > files or replace the content directly in Windows. That's why we need > one install script before to make sure all header files were in > place. In OpenSSL HEAD they've ditched all the symlink nonsense and the files just live in the include/ directories. -- dwmw2 smime.p7s Description: S/MIME cryptographic signature -- ___ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
Re: [edk2] Merging OpenSSL support
David, Really thanks for your helps on this. For the include path issue, yes, "../openssl/crypto/include" may include all symlinked header file. But it may depend on the unpack utility (esp. In Windows). Some unpack tool will ignore those symlink files or replace the content directly in Windows. That's why we need one install script before to make sure all header files were in place. Best Regards & Thanks, LONG, Qin -Original Message- From: David Woodhouse [mailto:[email protected]] Sent: Friday, July 24, 2015 4:49 AM To: Andrew Fish Cc: [email protected] Subject: Re: [edk2] Merging OpenSSL support On Thu, 2015-07-23 at 13:37 -0700, Andrew Fish wrote: > > David, > > What I did for the acpica dump tool is I made a DEC file for the blob > of code from another project and I added the [Includes] section to the > DEC. Then the INF just depends on DEC for the package that represents > the 3rd party. You have to update the DEC if the non edk2 project > changes its include path, but otherwise your good to go. Oh, I don't even need a new DEC file. It's sufficient just to add to the [Includes] section of CryptoPkg/CryptoPkg.dec: --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -24,6 +24,8 @@ [Includes] Include + Library/OpensslLib/openssl/include + Library/OpensslLib/openssl/crypto/include [LibraryClasses] ## @libraryclass Provides basic library functions for cryptographic primitives. I've pushed that out to my tree now, so there's no need to run Install.sh at all. Thanks again. -- dwmw2 -- ___ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
Re: [edk2] Merging OpenSSL support
On 07/23/2015 12:54 PM, David Woodhouse wrote: > I'm starting to push the OpenSSL patches upstream where it makes sense. THANK YOU! -- ___ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
Re: [edk2] Merging OpenSSL support
On Thu, 2015-07-23 at 13:37 -0700, Andrew Fish wrote: > > David, > > What I did for the acpica dump tool is I made a DEC file for the blob > of code from another project and I added the [Includes] section to > the DEC. Then the INF just depends on DEC for the package that > represents the 3rd party. You have to update the DEC if the non edk2 > project changes its include path, but otherwise your good to go. Oh, I don't even need a new DEC file. It's sufficient just to add to the [Includes] section of CryptoPkg/CryptoPkg.dec: --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -24,6 +24,8 @@ [Includes] Include + Library/OpensslLib/openssl/include + Library/OpensslLib/openssl/crypto/include [LibraryClasses] ## @libraryclass Provides basic library functions for cryptographic primitives. I've pushed that out to my tree now, so there's no need to run Install.sh at all. Thanks again. -- dwmw2 smime.p7s Description: S/MIME cryptographic signature -- ___ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
Re: [edk2] Merging OpenSSL support
On Thu, 2015-07-23 at 13:37 -0700, Andrew Fish wrote: > > David, > > What I did for the acpica dump tool is I made a DEC file for the blob > of code from another project and I added the [Includes] section to > the DEC. Then the INF just depends on DEC for the package that > represents the 3rd party. You have to update the DEC if the non edk2 > project changes its include path, but otherwise your good to go. That sounds like an excellent plan. Thanks. -- dwmw2 smime.p7s Description: S/MIME cryptographic signature -- ___ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
Re: [edk2] Merging OpenSSL support
> On Jul 23, 2015, at 12:54 PM, David Woodhouse wrote: > > (The 01.org list seems to be rejecting all my posts, so I'll repost to > this not-dead-yet list.) > > WIP at git://git.infradead.org/users/dwmw2/openssl.git and > git://git.infradead.org/users/dwmw2/edk.git > > Clone the former into the CryptoPkg/Library/OpensslLib/openssl/ > directory of the EDK2 tree. > > I'm starting to push the OpenSSL patches upstream where it makes sense. > > I could do with some help fixing up EDK2 build side. Starting with the > include paths. Apparently I am not permitted to add an [includes] > section to OpensslLib.inf? David, What I did for the acpica dump tool is I made a DEC file for the blob of code from another project and I added the [Includes] section to the DEC. Then the INF just depends on DEC for the package that represents the 3rd party. You have to update the DEC if the non edk2 project changes its include path, but otherwise your good to go. Thanks, Andrew Fish > So we can't just tell it to include files > from the openssl/include and openssl/crypto/include/ directories? > > So far I've just symlinked *all* of openssl/include/internal.*.h and > openssl/crypto/include/*.h into a CryptoPkg/Include/internal/ directory > but that really wants fixing. > > You'll want to run './Configure UWIN' in the OpenSSL tree to generate > opensslconf.h. > > I'm going to see how we can automate that and keep the file list up to > date automatically too. > > Most importantly though, now that I have something that at least > builds, what should I be doing to test it? > > -- > David WoodhouseOpen Source Technology Centre > [email protected] Intel Corporation > -- > ___ > edk2-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/edk2-devel -- ___ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
