crypto: lib/chacha20poly1305 - use chacha20_crypt()
Subsystems (2)
Eric Biggers
maintainerPATCH 1/1 crypto: lib/chacha20poly1305 - use chacha20_crypt()
From: Eric Biggers <[email protected]>
Use chacha20_crypt() instead of chacha_crypt(), since it's not really appropriate for users of the ChaCha library API to be passing the number of rounds as an argument.
Signed-off-by Eric Biggers <[email protected]>
--- lib/crypto/chacha20poly1305.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
lib/crypto/chacha20poly1305.c +8 -8
@@ -66,14 +66,14 @@ __chacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,__le64 lens[2 ]; } b; -chacha_crypt (chacha_state, b.block0, pad0,sizeof (b.block0),20 ); +chacha20_crypt (chacha_state, b.block0, pad0,sizeof (b.block0));poly1305_init (&poly1305_state, b.block0);poly1305_update (&poly1305_state, ad, ad_len);if (ad_len &0xf )poly1305_update (&poly1305_state, pad0,0x10 - (ad_len &0xf )); -chacha_crypt (chacha_state, dst, src, src_len,20 ); +chacha20_crypt (chacha_state, dst, src, src_len);poly1305_update (&poly1305_state, dst, src_len);if (src_len &0xf )
@@ -140,7 +140,7 @@ __chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len,if (unlikely (src_len <POLY1305_DIGEST_SIZE ))return false; -chacha_crypt (chacha_state, b.block0, pad0,sizeof (b.block0),20 ); +chacha20_crypt (chacha_state, b.block0, pad0,sizeof (b.block0));poly1305_init (&poly1305_state, b.block0);poly1305_update (&poly1305_state, ad, ad_len);
@@ -160,7 +160,7 @@ __chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len, ret =crypto_memneq (b.mac, src + dst_len,POLY1305_DIGEST_SIZE );if (likely (!ret)) -chacha_crypt (chacha_state, dst, src, dst_len,20 ); +chacha20_crypt (chacha_state, dst, src, dst_len);memzero_explicit (&b,sizeof (b));
@@ -241,7 +241,7 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src, b.iv[1 ] =cpu_to_le64 (nonce);chacha_init (chacha_state, b.k, (u8 *)b.iv); -chacha_crypt (chacha_state, b.block0, pad0,sizeof (b.block0),20 ); +chacha20_crypt (chacha_state, b.block0, pad0,sizeof (b.block0));poly1305_init (&poly1305_state, b.block0);if (unlikely (ad_len)) {
@@ -278,14 +278,14 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src,if (unlikely (length < sl)) l &= ~(CHACHA_BLOCK_SIZE -1 ); -chacha_crypt (chacha_state, addr, addr, l,20 ); +chacha20_crypt (chacha_state, addr, addr, l); addr += l; length -= l; }if (unlikely (length >0 )) { -chacha_crypt (chacha_state, b.chacha_stream, pad0, -CHACHA_BLOCK_SIZE ,20 ); +chacha20_crypt (chacha_state, b.chacha_stream, pad0, +CHACHA_BLOCK_SIZE );crypto_xor (addr, b.chacha_stream, length); partial = length; }
Signature · 1 line
2.24.0
Quoted 8 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Use
chacha20_crypt()instead ofchacha_crypt(), since it's not really appropriate for users of the ChaCha library API to be passing the number of rounds as an argument.Signed-off-by Eric Biggers <[email protected]>
Acked-by Ard Biesheuvel <[email protected]>
Quoted 73 lines
--- lib/crypto/chacha20poly1305.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)lib/crypto/chacha20poly1305.c +8
-9@@ -66,14 +66,14 @@ __chacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,__le64 lens[2 ]; } b; -chacha_crypt (chacha_state, b.block0, pad0,sizeof (b.block0),20 ); +chacha20_crypt (chacha_state, b.block0, pad0,sizeof (b.block0));poly1305_init (&poly1305_state, b.block0);poly1305_update (&poly1305_state, ad, ad_len);if (ad_len &0xf )poly1305_update (&poly1305_state, pad0,0x10 - (ad_len &0xf )); -chacha_crypt (chacha_state, dst, src, src_len,20 ); +chacha20_crypt (chacha_state, dst, src, src_len);poly1305_update (&poly1305_state, dst, src_len);if (src_len &0xf )@@ -140,7 +140,7 @@ __chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len,if (unlikely (src_len <POLY1305_DIGEST_SIZE ))return false; -chacha_crypt (chacha_state, b.block0, pad0,sizeof (b.block0),20 ); +chacha20_crypt (chacha_state, b.block0, pad0,sizeof (b.block0));poly1305_init (&poly1305_state, b.block0);poly1305_update (&poly1305_state, ad, ad_len);@@ -160,7 +160,7 @@ __chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len, ret =crypto_memneq (b.mac, src + dst_len,POLY1305_DIGEST_SIZE );if (likely (!ret)) -chacha_crypt (chacha_state, dst, src, dst_len,20 ); +chacha20_crypt (chacha_state, dst, src, dst_len);memzero_explicit (&b,sizeof (b));@@ -241,7 +241,7 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src, b.iv[1 ] =cpu_to_le64 (nonce);chacha_init (chacha_state, b.k, (u8 *)b.iv); -chacha_crypt (chacha_state, b.block0, pad0,sizeof (b.block0),20 ); +chacha20_crypt (chacha_state, b.block0, pad0,sizeof (b.block0));poly1305_init (&poly1305_state, b.block0);if (unlikely (ad_len)) {@@ -278,14 +278,14 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src,if (unlikely (length < sl)) l &= ~(CHACHA_BLOCK_SIZE -1 ); -chacha_crypt (chacha_state, addr, addr, l,20 ); +chacha20_crypt (chacha_state, addr, addr, l); addr += l; length -= l; }if (unlikely (length >0 )) { -chacha_crypt (chacha_state, b.chacha_stream, pad0, -CHACHA_BLOCK_SIZE ,20 ); +chacha20_crypt (chacha_state, b.chacha_stream, pad0, +CHACHA_BLOCK_SIZE );crypto_xor (addr, b.chacha_stream, length); partial = length; } --2.24.0
Herbert Xu
maintainerQuoted 10 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Use
chacha20_crypt()instead ofchacha_crypt(), since it's not really appropriate for users of the ChaCha library API to be passing the number of rounds as an argument.Signed-off-by Eric Biggers <[email protected]>--- lib/crypto/chacha20poly1305.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt