1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH v3 0/8] CryptoPkg updates for openssl 3.0

Gerd Hoffmann posted 8 patches 2 years ago
Failed in applying to current master (apply log)
CryptoPkg/Library/Include/CrtLibSupport.h            | 12 +++++++++++-
CryptoPkg/Library/Include/fcntl.h                    |  9 +++++++++
CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c  | 10 ++++++++++
.../Test/UnitTest/Library/BaseCryptLib/DhTests.c     |  6 +++---
CryptoPkg/CryptoPkg.ci.yaml                          |  1 +
5 files changed, 34 insertions(+), 4 deletions(-)
create mode 100644 CryptoPkg/Library/Include/fcntl.h
[edk2-devel] [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
Posted by Gerd Hoffmann 2 years ago 
First batch of patches which update CrtLibSupport so it has everything
needed to build openssl3.  Also a testcase update for openssl3.

This does not update the openssl submodule, that'll happen in a
followup patch series.

v3:
 - move strcpy() from .h to .c file.
 - pick up review tags
v2:
 - rebase to latest master.
 - add codestyle exception for fcntl.h.

Gerd Hoffmann (8):
  CryptoPkg/CrtLibSupport: add fcntl.h
  CryptoPkg/CrtLibSupport: add strstr()
  CryptoPkg/CrtLibSupport: add INT_MIN
  CryptoPkg/CrtLibSupport: add UINT_MAX
  CryptoPkg/CrtLibSupport: add MODULESDIR
  CryptoPkg/CrtLibSupport: add off_t
  CryptoPkg/CrtLibSupport: fix strcpy
  CryptoPkg/UnitTest: fix DH testcase

 CryptoPkg/Library/Include/CrtLibSupport.h            | 12 +++++++++++-
 CryptoPkg/Library/Include/fcntl.h                    |  9 +++++++++
 CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c  | 10 ++++++++++
 .../Test/UnitTest/Library/BaseCryptLib/DhTests.c     |  6 +++---
 CryptoPkg/CryptoPkg.ci.yaml                          |  1 +
 5 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 CryptoPkg/Library/Include/fcntl.h

-- 
2.35.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#88694): https://edk2.groups.io/g/devel/message/88694
Mute This Topic: https://groups.io/mt/90392478/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
Posted by Yao, Jiewen 2 years ago 
Thanks for the contribution.
Merged https://github.com/tianocore/edk2/pull/2766

> -----Original Message-----
> From: Gerd Hoffmann <kraxel@redhat.com>
> Sent: Monday, April 11, 2022 7:25 PM
> To: devel@edk2.groups.io
> Cc: Oliver Steffen <osteffen@redhat.com>; Pawel Polawski
> <ppolawsk@redhat.com>; Wang, Jian J <jian.j.wang@intel.com>; Xiaoyu Lu
> <xiaoyux.lu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Jiang, Guomin
> <guomin.jiang@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> Subject: [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
> 
> First batch of patches which update CrtLibSupport so it has everything
> needed to build openssl3.  Also a testcase update for openssl3.
> 
> This does not update the openssl submodule, that'll happen in a
> followup patch series.
> 
> v3:
>  - move strcpy() from .h to .c file.
>  - pick up review tags
> v2:
>  - rebase to latest master.
>  - add codestyle exception for fcntl.h.
> 
> Gerd Hoffmann (8):
>   CryptoPkg/CrtLibSupport: add fcntl.h
>   CryptoPkg/CrtLibSupport: add strstr()
>   CryptoPkg/CrtLibSupport: add INT_MIN
>   CryptoPkg/CrtLibSupport: add UINT_MAX
>   CryptoPkg/CrtLibSupport: add MODULESDIR
>   CryptoPkg/CrtLibSupport: add off_t
>   CryptoPkg/CrtLibSupport: fix strcpy
>   CryptoPkg/UnitTest: fix DH testcase
> 
>  CryptoPkg/Library/Include/CrtLibSupport.h            | 12 +++++++++++-
>  CryptoPkg/Library/Include/fcntl.h                    |  9 +++++++++
>  CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c  | 10 ++++++++++
>  .../Test/UnitTest/Library/BaseCryptLib/DhTests.c     |  6 +++---
>  CryptoPkg/CryptoPkg.ci.yaml                          |  1 +
>  5 files changed, 34 insertions(+), 4 deletions(-)
>  create mode 100644 CryptoPkg/Library/Include/fcntl.h
> 
> --
> 2.35.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#88785): https://edk2.groups.io/g/devel/message/88785
Mute This Topic: https://groups.io/mt/90392478/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
Posted by duntan 2 years ago 
Hi Hoffmann,

When building CryptoPkg, I found a build failure caused by this patch " CryptoPkg/CrtLibSupport: fix strcpy" https://github.com/tianocore/edk2/commit/fab6285a73c4c73bb131792d0afb20be369082d1.
When building CryptoPkg with the command " build -p CryptoPkg/CryptoPkg.dsc -b DEBUG -t VS2015x86 -a IA32 -a X64 ", it failed with the following log:
c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(400): error C2146: syntax error: missing ')' before identifier 'strDest'
c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(400): error C2061: syntax error: identifier 'strDest'
c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(400): error C2059: syntax error: ';'
c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(400): error C2059: syntax error: ','
c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(402): error C2059: syntax error: ')'

I guess the root cause is the "restrict" keyword in this patch is not supported by VS2015.
Can you please to fix this issue?

Thanks,
Dun
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yao, Jiewen
Sent: Tuesday, April 12, 2022 10:41 PM
To: Gerd Hoffmann <kraxel@redhat.com>; devel@edk2.groups.io
Cc: Oliver Steffen <osteffen@redhat.com>; Pawel Polawski <ppolawsk@redhat.com>; Wang, Jian J <jian.j.wang@intel.com>; Xiaoyu Lu <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
Subject: Re: [edk2-devel] [PATCH v3 0/8] CryptoPkg updates for openssl 3.0

Thanks for the contribution.
Merged https://github.com/tianocore/edk2/pull/2766

> -----Original Message-----
> From: Gerd Hoffmann <kraxel@redhat.com>
> Sent: Monday, April 11, 2022 7:25 PM
> To: devel@edk2.groups.io
> Cc: Oliver Steffen <osteffen@redhat.com>; Pawel Polawski 
> <ppolawsk@redhat.com>; Wang, Jian J <jian.j.wang@intel.com>; Xiaoyu Lu 
> <xiaoyux.lu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Jiang, 
> Guomin <guomin.jiang@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> Subject: [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
> 
> First batch of patches which update CrtLibSupport so it has everything 
> needed to build openssl3.  Also a testcase update for openssl3.
> 
> This does not update the openssl submodule, that'll happen in a 
> followup patch series.
> 
> v3:
>  - move strcpy() from .h to .c file.
>  - pick up review tags
> v2:
>  - rebase to latest master.
>  - add codestyle exception for fcntl.h.
> 
> Gerd Hoffmann (8):
>   CryptoPkg/CrtLibSupport: add fcntl.h
>   CryptoPkg/CrtLibSupport: add strstr()
>   CryptoPkg/CrtLibSupport: add INT_MIN
>   CryptoPkg/CrtLibSupport: add UINT_MAX
>   CryptoPkg/CrtLibSupport: add MODULESDIR
>   CryptoPkg/CrtLibSupport: add off_t
>   CryptoPkg/CrtLibSupport: fix strcpy
>   CryptoPkg/UnitTest: fix DH testcase
> 
>  CryptoPkg/Library/Include/CrtLibSupport.h            | 12 +++++++++++-
>  CryptoPkg/Library/Include/fcntl.h                    |  9 +++++++++
>  CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c  | 10 ++++++++++
>  .../Test/UnitTest/Library/BaseCryptLib/DhTests.c     |  6 +++---
>  CryptoPkg/CryptoPkg.ci.yaml                          |  1 +
>  5 files changed, 34 insertions(+), 4 deletions(-)  create mode 100644 
> CryptoPkg/Library/Include/fcntl.h
> 
> --
> 2.35.1








-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89068): https://edk2.groups.io/g/devel/message/89068
Mute This Topic: https://groups.io/mt/90392478/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
Posted by Yao, Jiewen 2 years ago 
Hi Gerd
Do you have any comment for the regression issue?

I think we should remove "restrict" keyword.

Thank you
Yao Jiewen

> -----Original Message-----
> From: Tan, Dun <dun.tan@intel.com>
> Sent: Tuesday, April 19, 2022 5:27 PM
> To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Gerd
> Hoffmann <kraxel@redhat.com>
> Cc: Oliver Steffen <osteffen@redhat.com>; Pawel Polawski
> <ppolawsk@redhat.com>; Wang, Jian J <jian.j.wang@intel.com>; Xiaoyu Lu
> <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>; Liu,
> Zhiguang <zhiguang.liu@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: RE: [edk2-devel] [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
> 
> Hi Hoffmann,
> 
> When building CryptoPkg, I found a build failure caused by this patch "
> CryptoPkg/CrtLibSupport: fix strcpy"
> https://github.com/tianocore/edk2/commit/fab6285a73c4c73bb131792d0afb2
> 0be369082d1.
> When building CryptoPkg with the command " build -p CryptoPkg/CryptoPkg.dsc
> -b DEBUG -t VS2015x86 -a IA32 -a X64 ", it failed with the following log:
> c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(400): error
> C2146: syntax error: missing ')' before identifier 'strDest'
> c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(400): error
> C2061: syntax error: identifier 'strDest'
> c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(400): error
> C2059: syntax error: ';'
> c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(400): error
> C2059: syntax error: ','
> c:\code\edk2\edk2\CryptoPkg\Library\Include\CrtLibSupport.h(402): error
> C2059: syntax error: ')'
> 
> I guess the root cause is the "restrict" keyword in this patch is not supported by
> VS2015.
> Can you please to fix this issue?
> 
> Thanks,
> Dun
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yao, Jiewen
> Sent: Tuesday, April 12, 2022 10:41 PM
> To: Gerd Hoffmann <kraxel@redhat.com>; devel@edk2.groups.io
> Cc: Oliver Steffen <osteffen@redhat.com>; Pawel Polawski
> <ppolawsk@redhat.com>; Wang, Jian J <jian.j.wang@intel.com>; Xiaoyu Lu
> <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
> Subject: Re: [edk2-devel] [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
> 
> Thanks for the contribution.
> Merged https://github.com/tianocore/edk2/pull/2766
> 
> > -----Original Message-----
> > From: Gerd Hoffmann <kraxel@redhat.com>
> > Sent: Monday, April 11, 2022 7:25 PM
> > To: devel@edk2.groups.io
> > Cc: Oliver Steffen <osteffen@redhat.com>; Pawel Polawski
> > <ppolawsk@redhat.com>; Wang, Jian J <jian.j.wang@intel.com>; Xiaoyu Lu
> > <xiaoyux.lu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Jiang,
> > Guomin <guomin.jiang@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> > Subject: [PATCH v3 0/8] CryptoPkg updates for openssl 3.0
> >
> > First batch of patches which update CrtLibSupport so it has everything
> > needed to build openssl3.  Also a testcase update for openssl3.
> >
> > This does not update the openssl submodule, that'll happen in a
> > followup patch series.
> >
> > v3:
> >  - move strcpy() from .h to .c file.
> >  - pick up review tags
> > v2:
> >  - rebase to latest master.
> >  - add codestyle exception for fcntl.h.
> >
> > Gerd Hoffmann (8):
> >   CryptoPkg/CrtLibSupport: add fcntl.h
> >   CryptoPkg/CrtLibSupport: add strstr()
> >   CryptoPkg/CrtLibSupport: add INT_MIN
> >   CryptoPkg/CrtLibSupport: add UINT_MAX
> >   CryptoPkg/CrtLibSupport: add MODULESDIR
> >   CryptoPkg/CrtLibSupport: add off_t
> >   CryptoPkg/CrtLibSupport: fix strcpy
> >   CryptoPkg/UnitTest: fix DH testcase
> >
> >  CryptoPkg/Library/Include/CrtLibSupport.h            | 12 +++++++++++-
> >  CryptoPkg/Library/Include/fcntl.h                    |  9 +++++++++
> >  CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c  | 10 ++++++++++
> >  .../Test/UnitTest/Library/BaseCryptLib/DhTests.c     |  6 +++---
> >  CryptoPkg/CryptoPkg.ci.yaml                          |  1 +
> >  5 files changed, 34 insertions(+), 4 deletions(-)  create mode 100644
> > CryptoPkg/Library/Include/fcntl.h
> >
> > --
> > 2.35.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89104): https://edk2.groups.io/g/devel/message/89104
Mute This Topic: https://groups.io/mt/90392478/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.