[PATCH] selftests/tls: Fix tls selftests dependency to correct algorithm

[PATCH] selftests/tls: Fix tls selftests dependency to correct algorithm

[Tianjia Zhang]

Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moves
the SM3 and SM4 stand-alone library and the algorithm implementation for
the Crypto API into the same directory, and the corresponding relationship
of Kconfig is modified, CONFIG_CRYPTO_SM3/4 corresponds to the stand-alone
library of SM3/4, and CONFIG_CRYPTO_SM3/4_GENERIC corresponds to the
algorithm implementation for the Crypto API. Therefore, it is necessary
for this module to depend on the correct algorithm.

Fixes: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: stable@vger.kernel.org # v5.19+
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
 tools/testing/selftests/net/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
index ead7963b9bf0..bd89198cd817 100644
--- a/tools/testing/selftests/net/config
+++ b/tools/testing/selftests/net/config
@@ -43,5 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_BAREUDP=m
 CONFIG_IPV6_IOAM6_LWTUNNEL=y
-CONFIG_CRYPTO_SM4=y
+CONFIG_CRYPTO_SM4_GENERIC=y
 CONFIG_AMT=m
-- 
2.24.3 (Apple Git-128)

Re: [PATCH] selftests/tls: Fix tls selftests dependency to correct algorithm

[Bagas Sanjaya]

[-- Attachment #1: Type: text/plain, Size: 1876 bytes --]

On Fri, Nov 25, 2022 at 08:19:05PM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moves
> the SM3 and SM4 stand-alone library and the algorithm implementation for
> the Crypto API into the same directory, and the corresponding relationship
> of Kconfig is modified, CONFIG_CRYPTO_SM3/4 corresponds to the stand-alone
> library of SM3/4, and CONFIG_CRYPTO_SM3/4_GENERIC corresponds to the
> algorithm implementation for the Crypto API. Therefore, it is necessary
> for this module to depend on the correct algorithm.
> 

I feel a rather confused. What about below?

```
Commit <commit> moves SM3 and SM4 algorithm implementations from
stand-alone library to crypto API. The corresponding configuration
options for the API version (generic) are CONFIG_CRYPTO_SM3_GENERIC and
CONFIG_CRYPTO_SM4_GENERIC, respectively.

Replace option selected in selftests configuration from the library version
to the API version.
```

> Fixes: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> Cc: Jason A. Donenfeld <Jason@zx2c4.com>
> Cc: stable@vger.kernel.org # v5.19+
> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
>  tools/testing/selftests/net/config | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
> index ead7963b9bf0..bd89198cd817 100644
> --- a/tools/testing/selftests/net/config
> +++ b/tools/testing/selftests/net/config
> @@ -43,5 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m
>  CONFIG_NET_ACT_MIRRED=m
>  CONFIG_BAREUDP=m
>  CONFIG_IPV6_IOAM6_LWTUNNEL=y
> -CONFIG_CRYPTO_SM4=y
> +CONFIG_CRYPTO_SM4_GENERIC=y
>  CONFIG_AMT=m

You mean the correct algo option is CONFIG_CRYPTO_SM4_GENERIC, right?

-- 
An old man doll... just what I always wanted! - Clara

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH] selftests/tls: Fix tls selftests dependency to correct algorithm

[Tianjia Zhang]

Hi Bagas,

On 11/25/22 9:18 PM, Bagas Sanjaya wrote:
> On Fri, Nov 25, 2022 at 08:19:05PM +0800, Tianjia Zhang wrote:
>> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moves
>> the SM3 and SM4 stand-alone library and the algorithm implementation for
>> the Crypto API into the same directory, and the corresponding relationship
>> of Kconfig is modified, CONFIG_CRYPTO_SM3/4 corresponds to the stand-alone
>> library of SM3/4, and CONFIG_CRYPTO_SM3/4_GENERIC corresponds to the
>> algorithm implementation for the Crypto API. Therefore, it is necessary
>> for this module to depend on the correct algorithm.
>>
> 
> I feel a rather confused. What about below?
> 
> ```
> Commit <commit> moves SM3 and SM4 algorithm implementations from
> stand-alone library to crypto API. The corresponding configuration
> options for the API version (generic) are CONFIG_CRYPTO_SM3_GENERIC and
> CONFIG_CRYPTO_SM4_GENERIC, respectively.
> 
> Replace option selected in selftests configuration from the library version
> to the API version.
> ```
> 

Thanks, this is great, I will pick it up.

>> Fixes: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
>> Cc: Jason A. Donenfeld <Jason@zx2c4.com>
>> Cc: stable@vger.kernel.org # v5.19+
>> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
>> ---
>>   tools/testing/selftests/net/config | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
>> index ead7963b9bf0..bd89198cd817 100644
>> --- a/tools/testing/selftests/net/config
>> +++ b/tools/testing/selftests/net/config
>> @@ -43,5 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m
>>   CONFIG_NET_ACT_MIRRED=m
>>   CONFIG_BAREUDP=m
>>   CONFIG_IPV6_IOAM6_LWTUNNEL=y
>> -CONFIG_CRYPTO_SM4=y
>> +CONFIG_CRYPTO_SM4_GENERIC=y
>>   CONFIG_AMT=m
> 
> You mean the correct algo option is CONFIG_CRYPTO_SM4_GENERIC, right?
> 

Yes, CONFIG_CRYPTO_SM4_GENERIC is the correct algo option.

Best regards,
Tianjia

Re: [PATCH] selftests/tls: Fix tls selftests dependency to correct algorithm

[Hangbin Liu]

On Fri, Nov 25, 2022 at 08:19:05PM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moves
> the SM3 and SM4 stand-alone library and the algorithm implementation for
> the Crypto API into the same directory, and the corresponding relationship
> of Kconfig is modified, CONFIG_CRYPTO_SM3/4 corresponds to the stand-alone
> library of SM3/4, and CONFIG_CRYPTO_SM3/4_GENERIC corresponds to the
> algorithm implementation for the Crypto API. Therefore, it is necessary
> for this module to depend on the correct algorithm.
> 
> Fixes: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> Cc: Jason A. Donenfeld <Jason@zx2c4.com>
> Cc: stable@vger.kernel.org # v5.19+
> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
>  tools/testing/selftests/net/config | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
> index ead7963b9bf0..bd89198cd817 100644
> --- a/tools/testing/selftests/net/config
> +++ b/tools/testing/selftests/net/config
> @@ -43,5 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m
>  CONFIG_NET_ACT_MIRRED=m
>  CONFIG_BAREUDP=m
>  CONFIG_IPV6_IOAM6_LWTUNNEL=y
> -CONFIG_CRYPTO_SM4=y
> +CONFIG_CRYPTO_SM4_GENERIC=y
>  CONFIG_AMT=m
> -- 
> 2.24.3 (Apple Git-128)
> 

Looks the issue in this discuss
https://lore.kernel.org/netdev/Y3c9zMbKsR+tcLHk@Laptop-X1/
related to your fix.

Thanks
Hangbin

Re: [PATCH] selftests/tls: Fix tls selftests dependency to correct algorithm

[Tianjia Zhang]

Hi Hangbin,

On 11/27/22 8:17 PM, Hangbin Liu wrote:
> On Fri, Nov 25, 2022 at 08:19:05PM +0800, Tianjia Zhang wrote:
>> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moves
>> the SM3 and SM4 stand-alone library and the algorithm implementation for
>> the Crypto API into the same directory, and the corresponding relationship
>> of Kconfig is modified, CONFIG_CRYPTO_SM3/4 corresponds to the stand-alone
>> library of SM3/4, and CONFIG_CRYPTO_SM3/4_GENERIC corresponds to the
>> algorithm implementation for the Crypto API. Therefore, it is necessary
>> for this module to depend on the correct algorithm.
>>
>> Fixes: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
>> Cc: Jason A. Donenfeld <Jason@zx2c4.com>
>> Cc: stable@vger.kernel.org # v5.19+
>> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
>> ---
>>   tools/testing/selftests/net/config | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
>> index ead7963b9bf0..bd89198cd817 100644
>> --- a/tools/testing/selftests/net/config
>> +++ b/tools/testing/selftests/net/config
>> @@ -43,5 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m
>>   CONFIG_NET_ACT_MIRRED=m
>>   CONFIG_BAREUDP=m
>>   CONFIG_IPV6_IOAM6_LWTUNNEL=y
>> -CONFIG_CRYPTO_SM4=y
>> +CONFIG_CRYPTO_SM4_GENERIC=y
>>   CONFIG_AMT=m
>> -- 
>> 2.24.3 (Apple Git-128)
>>
> 
> Looks the issue in this discuss
> https://lore.kernel.org/netdev/Y3c9zMbKsR+tcLHk@Laptop-X1/
> related to your fix.
> 

Thanks for your information, it is indeed the same issue.I don’t know if
there is a patch to fix it. If not, can this patch solve this issue? If
so, can I add Reported-by or Tested-by tag?

Best regards,
Tianjia

Re: [PATCH] selftests/tls: Fix tls selftests dependency to correct algorithm

[Hangbin Liu]

On Mon, Nov 28, 2022 at 03:14:16PM +0800, Tianjia Zhang wrote:
> Hi Hangbin,
> 
> On 11/27/22 8:17 PM, Hangbin Liu wrote:
> > On Fri, Nov 25, 2022 at 08:19:05PM +0800, Tianjia Zhang wrote:
> > > Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moves
> > > the SM3 and SM4 stand-alone library and the algorithm implementation for
> > > the Crypto API into the same directory, and the corresponding relationship
> > > of Kconfig is modified, CONFIG_CRYPTO_SM3/4 corresponds to the stand-alone
> > > library of SM3/4, and CONFIG_CRYPTO_SM3/4_GENERIC corresponds to the
> > > algorithm implementation for the Crypto API. Therefore, it is necessary
> > > for this module to depend on the correct algorithm.
> > > 
> > > Fixes: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> > > Cc: Jason A. Donenfeld <Jason@zx2c4.com>
> > > Cc: stable@vger.kernel.org # v5.19+
> > > Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> > > ---
> > >   tools/testing/selftests/net/config | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
> > > index ead7963b9bf0..bd89198cd817 100644
> > > --- a/tools/testing/selftests/net/config
> > > +++ b/tools/testing/selftests/net/config
> > > @@ -43,5 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m
> > >   CONFIG_NET_ACT_MIRRED=m
> > >   CONFIG_BAREUDP=m
> > >   CONFIG_IPV6_IOAM6_LWTUNNEL=y
> > > -CONFIG_CRYPTO_SM4=y
> > > +CONFIG_CRYPTO_SM4_GENERIC=y
> > >   CONFIG_AMT=m
> > > -- 
> > > 2.24.3 (Apple Git-128)
> > > 
> > 
> > Looks the issue in this discuss
> > https://lore.kernel.org/netdev/Y3c9zMbKsR+tcLHk@Laptop-X1/
> > related to your fix.
> > 
> 
> Thanks for your information, it is indeed the same issue.I don’t know if
> there is a patch to fix it. If not, can this patch solve this issue? If
> so, can I add Reported-by or Tested-by tag?
> 

Feel free to add Reported-by flag. I can't test this unless the patch merged
to upstream.

Thanks
Hangbin

Re: [PATCH] selftests/tls: Fix tls selftests dependency to correct algorithm

[Tianjia Zhang]

On 11/28/22 3:25 PM, Hangbin Liu wrote:
> On Mon, Nov 28, 2022 at 03:14:16PM +0800, Tianjia Zhang wrote:
>> Hi Hangbin,
>>
>> On 11/27/22 8:17 PM, Hangbin Liu wrote:
>>> On Fri, Nov 25, 2022 at 08:19:05PM +0800, Tianjia Zhang wrote:
>>>> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moves
>>>> the SM3 and SM4 stand-alone library and the algorithm implementation for
>>>> the Crypto API into the same directory, and the corresponding relationship
>>>> of Kconfig is modified, CONFIG_CRYPTO_SM3/4 corresponds to the stand-alone
>>>> library of SM3/4, and CONFIG_CRYPTO_SM3/4_GENERIC corresponds to the
>>>> algorithm implementation for the Crypto API. Therefore, it is necessary
>>>> for this module to depend on the correct algorithm.
>>>>
>>>> Fixes: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
>>>> Cc: Jason A. Donenfeld <Jason@zx2c4.com>
>>>> Cc: stable@vger.kernel.org # v5.19+
>>>> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
>>>> ---
>>>>    tools/testing/selftests/net/config | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
>>>> index ead7963b9bf0..bd89198cd817 100644
>>>> --- a/tools/testing/selftests/net/config
>>>> +++ b/tools/testing/selftests/net/config
>>>> @@ -43,5 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m
>>>>    CONFIG_NET_ACT_MIRRED=m
>>>>    CONFIG_BAREUDP=m
>>>>    CONFIG_IPV6_IOAM6_LWTUNNEL=y
>>>> -CONFIG_CRYPTO_SM4=y
>>>> +CONFIG_CRYPTO_SM4_GENERIC=y
>>>>    CONFIG_AMT=m
>>>> -- 
>>>> 2.24.3 (Apple Git-128)
>>>>
>>>
>>> Looks the issue in this discuss
>>> https://lore.kernel.org/netdev/Y3c9zMbKsR+tcLHk@Laptop-X1/
>>> related to your fix.
>>>
>>
>> Thanks for your information, it is indeed the same issue.I don’t know if
>> there is a patch to fix it. If not, can this patch solve this issue? If
>> so, can I add Reported-by or Tested-by tag?
>>
> 
> Feel free to add Reported-by flag. I can't test this unless the patch merged
> to upstream.
> 

Thanks, I will send a v2 patch as soon as possible.

Tianjia