diff mbox series

[v2,3/7] btrfs-progs: crypto/blake2: remove blake2 simple API

Message ID 6f15cfedf228f6e8d855fcdcf125b678273534d6.1683093416.git.wqu@suse.com (mailing list archive)
State New, archived
Headers show
Series btrfs-progs: fix -Wmissing-prototypes warnings and enable that warning option | expand

Commit Message

Qu Wenruo May 3, 2023, 6:03 a.m. UTC
We never utilize such simple API, just remove it.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 crypto/blake2b-ref.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Anand Jain May 4, 2023, 9:08 a.m. UTC | #1
On 03/05/2023 14:03, Qu Wenruo wrote:
> We never utilize such simple API, just remove it.
> 
> Signed-off-by: Qu Wenruo <wqu@suse.com>




> ---
>   crypto/blake2b-ref.c | 4 ----
>   1 file changed, 4 deletions(-)
> 
> diff --git a/crypto/blake2b-ref.c b/crypto/blake2b-ref.c
> index eac4cf0c48da..f28dce3ae2a8 100644
> --- a/crypto/blake2b-ref.c
> +++ b/crypto/blake2b-ref.c
> @@ -326,10 +326,6 @@ int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void
>     return 0;
>   }
>   
> -int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen ) {
> -  return blake2b(out, outlen, in, inlen, key, keylen);
> -}
> -

It came from the ref implementation. With minimum changes. Maybe needed 
it for future sync? No?

-----
commit 3778ece7ff4114dc071667cf13a60c4ef1936576

     btrfs-progs: add blake2b reference implementation

     Upstream commit 997fa5ba1e14b52c554fb03ce39e579e6f27b90c,
     git repository: git://github.com/BLAKE2/BLAKE2
----

Thanks, Anand

>   #if defined(SUPERCOP)
>   int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
>   {
David Sterba May 4, 2023, 10:05 p.m. UTC | #2
On Thu, May 04, 2023 at 05:08:44PM +0800, Anand Jain wrote:
> On 03/05/2023 14:03, Qu Wenruo wrote:
> > We never utilize such simple API, just remove it.
> > 
> > Signed-off-by: Qu Wenruo <wqu@suse.com>
> 
> 
> 
> 
> > ---
> >   crypto/blake2b-ref.c | 4 ----
> >   1 file changed, 4 deletions(-)
> > 
> > diff --git a/crypto/blake2b-ref.c b/crypto/blake2b-ref.c
> > index eac4cf0c48da..f28dce3ae2a8 100644
> > --- a/crypto/blake2b-ref.c
> > +++ b/crypto/blake2b-ref.c
> > @@ -326,10 +326,6 @@ int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void
> >     return 0;
> >   }
> >   
> > -int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen ) {
> > -  return blake2b(out, outlen, in, inlen, key, keylen);
> > -}
> > -
> 
> It came from the ref implementation. With minimum changes. Maybe needed 
> it for future sync? No?

It's not needed anymore, the code sync can be done from any incremental git
commits, blake2 upstream isn't changing much.
Qu Wenruo May 5, 2023, 7:05 a.m. UTC | #3
On 2023/5/4 17:08, Anand Jain wrote:
> On 03/05/2023 14:03, Qu Wenruo wrote:
>> We never utilize such simple API, just remove it.
>>
>> Signed-off-by: Qu Wenruo <wqu@suse.com>
>
>
>
>
>> ---
>>   crypto/blake2b-ref.c | 4 ----
>>   1 file changed, 4 deletions(-)
>>
>> diff --git a/crypto/blake2b-ref.c b/crypto/blake2b-ref.c
>> index eac4cf0c48da..f28dce3ae2a8 100644
>> --- a/crypto/blake2b-ref.c
>> +++ b/crypto/blake2b-ref.c
>> @@ -326,10 +326,6 @@ int blake2b( void *out, size_t outlen, const void
>> *in, size_t inlen, const void
>>     return 0;
>>   }
>> -int blake2( void *out, size_t outlen, const void *in, size_t inlen,
>> const void *key, size_t keylen ) {
>> -  return blake2b(out, outlen, in, inlen, key, keylen);
>> -}
>> -
>
> It came from the ref implementation. With minimum changes. Maybe needed
> it for future sync? No?

No need, that function is only defining an easy to use interface for
callers who doesn't care the details but only want a fast hash algo.

In our case, we explicitly want to use blake2b, thus we don't need that.

Thanks,
Qu
>
> -----
> commit 3778ece7ff4114dc071667cf13a60c4ef1936576
>
>      btrfs-progs: add blake2b reference implementation
>
>      Upstream commit 997fa5ba1e14b52c554fb03ce39e579e6f27b90c,
>      git repository: git://github.com/BLAKE2/BLAKE2
> ----
>
> Thanks, Anand
>
>>   #if defined(SUPERCOP)
>>   int crypto_hash( unsigned char *out, unsigned char *in, unsigned
>> long long inlen )
>>   {
>
diff mbox series

Patch

diff --git a/crypto/blake2b-ref.c b/crypto/blake2b-ref.c
index eac4cf0c48da..f28dce3ae2a8 100644
--- a/crypto/blake2b-ref.c
+++ b/crypto/blake2b-ref.c
@@ -326,10 +326,6 @@  int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void
   return 0;
 }
 
-int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen ) {
-  return blake2b(out, outlen, in, inlen, key, keylen);
-}
-
 #if defined(SUPERCOP)
 int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
 {