[edk2] [PATCH v2 0/5] ArmVirt- Nt32- Ovmf- CryptoPkg: conditionalize libssl presence in OpensslLib

Laszlo Ersek posted 5 patches 7 years, 8 months ago
Failed in applying to current master (apply log)
ArmVirtPkg/ArmVirt.dsc.inc                                            |  2 +-
Nt32Pkg/Nt32Pkg.dsc                                                   |  4 ++
OvmfPkg/OvmfPkgIa32.dsc                                               |  4 ++
OvmfPkg/OvmfPkgIa32X64.dsc                                            |  4 ++
OvmfPkg/OvmfPkgX64.dsc                                                |  4 ++
CryptoPkg/Library/OpensslLib/OpensslLib.inf                           |  1 +
CryptoPkg/Library/OpensslLib/{OpensslLib.inf => OpensslLibCrypto.inf} | 55 ++------------------
CryptoPkg/Library/OpensslLib/opensslconf.h                            |  6 ---
CryptoPkg/Library/OpensslLib/{OpensslLib.uni => OpensslLibCrypto.uni} |  8 +--
CryptoPkg/Library/OpensslLib/process_files.sh                         | 27 +++++++---
10 files changed, 46 insertions(+), 69 deletions(-)
copy CryptoPkg/Library/OpensslLib/{OpensslLib.inf => OpensslLibCrypto.inf} (90%)
copy CryptoPkg/Library/OpensslLib/{OpensslLib.uni => OpensslLibCrypto.uni} (67%)
[edk2] [PATCH v2 0/5] ArmVirt- Nt32- Ovmf- CryptoPkg: conditionalize libssl presence in OpensslLib
Posted by Laszlo Ersek 7 years, 8 months ago
Version 2 of the series at
<https://lists.01.org/pipermail/edk2-devel/2017-February/007761.html>.

In version 2, the new library instance is called OpensslLibCrypto, not
OpensslLibNoSsl. The changes are noted in detail on each patch.

Public repo and branch:
https://github.com/lersek/edk2.git conditionalize-ssl-v2

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gary Lin <glin@suse.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Qin Long <qin.long@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Ting Ye <ting.ye@intel.com>
Cc: Tomas Hoger <thoger@redhat.com>

Thanks,
Laszlo

Laszlo Ersek (5):
  CryptoPkg/OpensslLib: refresh OpensslLib.inf, opensslconf.h after
    32387e00
  CryptoPkg/OpensslLib: introduce OpensslLibCrypto instance
  ArmVirtPkg: resolve OpensslLib to OpensslLibCrypto
  Nt32Pkg: exclude libssl functionality from OpensslLib if
    TLS_ENABLE=FALSE
  OvmfPkg: exclude libssl functionality from OpensslLib if
    TLS_ENABLE=FALSE

 ArmVirtPkg/ArmVirt.dsc.inc                                            |  2 +-
 Nt32Pkg/Nt32Pkg.dsc                                                   |  4 ++
 OvmfPkg/OvmfPkgIa32.dsc                                               |  4 ++
 OvmfPkg/OvmfPkgIa32X64.dsc                                            |  4 ++
 OvmfPkg/OvmfPkgX64.dsc                                                |  4 ++
 CryptoPkg/Library/OpensslLib/OpensslLib.inf                           |  1 +
 CryptoPkg/Library/OpensslLib/{OpensslLib.inf => OpensslLibCrypto.inf} | 55 ++------------------
 CryptoPkg/Library/OpensslLib/opensslconf.h                            |  6 ---
 CryptoPkg/Library/OpensslLib/{OpensslLib.uni => OpensslLibCrypto.uni} |  8 +--
 CryptoPkg/Library/OpensslLib/process_files.sh                         | 27 +++++++---
 10 files changed, 46 insertions(+), 69 deletions(-)
 copy CryptoPkg/Library/OpensslLib/{OpensslLib.inf => OpensslLibCrypto.inf} (90%)
 copy CryptoPkg/Library/OpensslLib/{OpensslLib.uni => OpensslLibCrypto.uni} (67%)

-- 
2.9.3

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2 0/5] ArmVirt- Nt32- Ovmf- CryptoPkg: conditionalize libssl presence in OpensslLib
Posted by Laszlo Ersek 7 years, 8 months ago
I committed most of this series as follows:

On 02/24/17 12:01, Laszlo Ersek wrote:
> Version 2 of the series at
> <https://lists.01.org/pipermail/edk2-devel/2017-February/007761.html>.
> 
> In version 2, the new library instance is called OpensslLibCrypto, not
> OpensslLibNoSsl. The changes are noted in detail on each patch.
> 
> Public repo and branch:
> https://github.com/lersek/edk2.git conditionalize-ssl-v2
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gary Lin <glin@suse.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Qin Long <qin.long@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Ting Ye <ting.ye@intel.com>
> Cc: Tomas Hoger <thoger@redhat.com>
> 
> Thanks,
> Laszlo
> 
> Laszlo Ersek (5):
>   CryptoPkg/OpensslLib: refresh OpensslLib.inf, opensslconf.h after
>     32387e00

Committed with Qin Long's review, commit hash 4e719ab5d1de.

>   CryptoPkg/OpensslLib: introduce OpensslLibCrypto instance

Committed with Qin Long's review, commit hash 823005621ef4.

>   ArmVirtPkg: resolve OpensslLib to OpensslLibCrypto

Committed with Ard's review, commit hash 622627f80f25.

>   Nt32Pkg: exclude libssl functionality from OpensslLib if
>     TLS_ENABLE=FALSE

Not committed. Delaying this until Jiaxin & Ray approve it.

>   OvmfPkg: exclude libssl functionality from OpensslLib if
>     TLS_ENABLE=FALSE

Committed with Gary's review, commit hash df453e1b7c7c.

Thanks,
Laszlo

> 
>  ArmVirtPkg/ArmVirt.dsc.inc                                            |  2 +-
>  Nt32Pkg/Nt32Pkg.dsc                                                   |  4 ++
>  OvmfPkg/OvmfPkgIa32.dsc                                               |  4 ++
>  OvmfPkg/OvmfPkgIa32X64.dsc                                            |  4 ++
>  OvmfPkg/OvmfPkgX64.dsc                                                |  4 ++
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf                           |  1 +
>  CryptoPkg/Library/OpensslLib/{OpensslLib.inf => OpensslLibCrypto.inf} | 55 ++------------------
>  CryptoPkg/Library/OpensslLib/opensslconf.h                            |  6 ---
>  CryptoPkg/Library/OpensslLib/{OpensslLib.uni => OpensslLibCrypto.uni} |  8 +--
>  CryptoPkg/Library/OpensslLib/process_files.sh                         | 27 +++++++---
>  10 files changed, 46 insertions(+), 69 deletions(-)
>  copy CryptoPkg/Library/OpensslLib/{OpensslLib.inf => OpensslLibCrypto.inf} (90%)
>  copy CryptoPkg/Library/OpensslLib/{OpensslLib.uni => OpensslLibCrypto.uni} (67%)
> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel