Re: [PATCH 6.1&6.6 V3 3/3] sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3

[Huacai Chen]

Hi, Greg and Sasha,

On Sun, Mar 30, 2025 at 9:40 PM Jan Stancek <jstancek@xxxxxxxxxx> wrote:
>
> On Sun, Mar 30, 2025 at 3:08 PM Huacai Chen <chenhuacai@xxxxxxxxxx> wrote:
> >
> > On Thu, Mar 20, 2025 at 12:53 AM Jan Stancek <jstancek@xxxxxxxxxx> wrote:
> > >
> > > On Wed, Mar 19, 2025 at 5:26 PM Greg Kroah-Hartman
> > > <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> > > >
> > > > On Wed, Mar 19, 2025 at 03:44:19PM +0100, Jan Stancek wrote:
> > > > > On Wed, Mar 19, 2025 at 07:13:13AM -0700, Greg Kroah-Hartman wrote:
> > > > > > On Wed, Mar 19, 2025 at 02:40:31PM +0800, Huacai Chen wrote:
> > > > > > > From: Jan Stancek <jstancek@xxxxxxxxxx>
> > > > > > >
> > > > > > > commit 558bdc45dfb2669e1741384a0c80be9c82fa052c upstream.
> > > > > > >
> > > > > > > ENGINE API has been deprecated since OpenSSL version 3.0 [1].
> > > > > > > Distros have started dropping support from headers and in future
> > > > > > > it will likely disappear also from library.
> > > > > > >
> > > > > > > It has been superseded by the PROVIDER API, so use it instead
> > > > > > > for OPENSSL MAJOR >= 3.
> > > > > > >
> > > > > > > [1] https://github.com/openssl/openssl/blob/master/README-ENGINES.md
> > > > > > >
> > > > > > > [jarkko: fixed up alignment issues reported by checkpatch.pl --strict]
> > > > > > >
> > > > > > > Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx>
> > > > > > > Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
> > > > > > > Tested-by: R Nageswara Sastry <rnsastry@xxxxxxxxxxxxx>
> > > > > > > Reviewed-by: Neal Gompa <neal@xxxxxxxxx>
> > > > > > > Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
> > > > > > > Signed-off-by: Huacai Chen <chenhuacai@xxxxxxxxxxx>
> > > > > > > ---
> > > > > > >  certs/extract-cert.c | 103 ++++++++++++++++++++++++++++++-------------
> > > > > > >  scripts/sign-file.c  |  93 ++++++++++++++++++++++++++------------
> > > > > > >  2 files changed, 138 insertions(+), 58 deletions(-)
> > > > > >
> > > > > > This seems to differ from what is upstream by a lot, please document
> > > > > > what you changed from it and why when you resend this series again.
> > > > >
> > > > > Hunks are arranged differently, but code appears to be identical.
> > > > > When I apply the series to v6.6.83 and compare with upstream I get:
> > > >
> > > > If so, why is the diffstat different?  Also why are the hunks arranged
> > > > differently,
> > >
> > > He appears to be using "--diff-algorithm=minimal", while you probably
> > > patience or histogram.
> > Hi, Jan,
> >
> > I tried --diff-algorithm=minimal/patience/histogram from the upstream
> > commit, they all give the same result as this patch. But Sasha said
> > the upstream diffstat is different, so how does he generate the patch?
>
> Hi,
>
> I don't know how he generates the patch, but with git-2.43 I get noticable
> different patches and diff stats for minimal vs. histogram. "minimal" one
> matches your v3 patch. I don't know details of Greg's workflow, just offered
> one possible explanation that would allow this series to progress further.
>
> $ git format-patch -1 --stdout --diff-algorithm=minimal 558bdc45dfb2 |
> grep -A3 -m1 -- "---"
Could you please tell me how you generate patches? I always get the
same result from the upstream repo.

Huacai

> ---
>  certs/extract-cert.c | 103 ++++++++++++++++++++++++++++++-------------
>  scripts/sign-file.c  |  93 ++++++++++++++++++++++++++------------
>  2 files changed, 138 insertions(+), 58 deletions(-)
>
> $ git format-patch -1 --stdout --diff-algorithm=histogram 558bdc45dfb2
> | grep -A3 -m1 -- "---"
> ---
>  certs/extract-cert.c | 103 ++++++++++++++++++++++++++++++-------------
>  scripts/sign-file.c  |  95 +++++++++++++++++++++++++++------------
>  2 files changed, 139 insertions(+), 59 deletions(-)
>
> Regards,
> Jan
>
> >
> > Huacai
> >
> > >
> > > $ git format-patch -1 --stdout --diff-algorithm=minimal 558bdc45dfb2 |
> > > grep -A3 -m1 -- "---"
> > > ---
> > >  certs/extract-cert.c | 103 ++++++++++++++++++++++++++++++-------------
> > >  scripts/sign-file.c  |  93 ++++++++++++++++++++++++++------------
> > >  2 files changed, 138 insertions(+), 58 deletions(-)
> > >
> > > Should be easy to regenerate with different diff-alg for v4.
> > >
> > > Regards,
> > > Jan
> > >
> > > > that's a hint to me that something went wrong and I can't
> > > > trust the patch at all.
> > > >
> > > > thanks,
> > > >
> > > > greg k-h
> > > >
> > >
> >
>
>