| Message ID | 20180704153919.12432-4-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | Coccinelle cleanups | expand |
On Wed, Jul 04, 2018 at 12:39:14PM -0300, Philippe Mathieu-Daudé wrote: > Patch created mechanically by rerunning: > > $ spatch --sp-file scripts/coccinelle/typecast.cocci \ > --macro-file scripts/cocci-macro-file.h \ > --dir . --in-place > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > crypto/cipher-builtin.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/crypto/cipher-builtin.c b/crypto/cipher-builtin.c > index d8c811fd33..7eff760f0a 100644 > --- a/crypto/cipher-builtin.c > +++ b/crypto/cipher-builtin.c > @@ -133,7 +133,7 @@ static void qcrypto_cipher_aes_xts_encrypt(const void *ctx, > { > const QCryptoCipherBuiltinAESContext *aesctx = ctx; > > - qcrypto_cipher_aes_ecb_encrypt((AES_KEY *)&aesctx->enc, > + qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc, > src, dst, length); qcrypto_cipher_aes_ecb_encrypt expects a 'AES_KEY *' parameter, but '&aesctx->enc, is a 'const AES_KEY *'. The cast is needed to discard the const-ness. > @@ -145,7 +145,7 @@ static void qcrypto_cipher_aes_xts_decrypt(const void *ctx, > { > const QCryptoCipherBuiltinAESContext *aesctx = ctx; > > - qcrypto_cipher_aes_ecb_decrypt((AES_KEY *)&aesctx->dec, > + qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec, > src, dst, length); Same here. Regards, Daniel
On 07/04/2018 12:51 PM, Daniel P. Berrangé wrote: > On Wed, Jul 04, 2018 at 12:39:14PM -0300, Philippe Mathieu-Daudé wrote: >> Patch created mechanically by rerunning: >> >> $ spatch --sp-file scripts/coccinelle/typecast.cocci \ >> --macro-file scripts/cocci-macro-file.h \ >> --dir . --in-place >> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> crypto/cipher-builtin.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/crypto/cipher-builtin.c b/crypto/cipher-builtin.c >> index d8c811fd33..7eff760f0a 100644 >> --- a/crypto/cipher-builtin.c >> +++ b/crypto/cipher-builtin.c >> @@ -133,7 +133,7 @@ static void qcrypto_cipher_aes_xts_encrypt(const void *ctx, >> { >> const QCryptoCipherBuiltinAESContext *aesctx = ctx; >> >> - qcrypto_cipher_aes_ecb_encrypt((AES_KEY *)&aesctx->enc, >> + qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc, >> src, dst, length); > > qcrypto_cipher_aes_ecb_encrypt expects a 'AES_KEY *' parameter, but > '&aesctx->enc, is a 'const AES_KEY *'. The cast is needed to discard > the const-ness. Oh I didn't notice. I'll see if I can patch typecast.cocci to avoid this noise. Thanks! > >> @@ -145,7 +145,7 @@ static void qcrypto_cipher_aes_xts_decrypt(const void *ctx, >> { >> const QCryptoCipherBuiltinAESContext *aesctx = ctx; >> >> - qcrypto_cipher_aes_ecb_decrypt((AES_KEY *)&aesctx->dec, >> + qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec, >> src, dst, length); > > Same here. > > > Regards, > Daniel >
diff --git a/crypto/cipher-builtin.c b/crypto/cipher-builtin.c index d8c811fd33..7eff760f0a 100644 --- a/crypto/cipher-builtin.c +++ b/crypto/cipher-builtin.c @@ -133,7 +133,7 @@ static void qcrypto_cipher_aes_xts_encrypt(const void *ctx, { const QCryptoCipherBuiltinAESContext *aesctx = ctx; - qcrypto_cipher_aes_ecb_encrypt((AES_KEY *)&aesctx->enc, + qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc, src, dst, length); } @@ -145,7 +145,7 @@ static void qcrypto_cipher_aes_xts_decrypt(const void *ctx, { const QCryptoCipherBuiltinAESContext *aesctx = ctx; - qcrypto_cipher_aes_ecb_decrypt((AES_KEY *)&aesctx->dec, + qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec, src, dst, length); }
Patch created mechanically by rerunning: $ spatch --sp-file scripts/coccinelle/typecast.cocci \ --macro-file scripts/cocci-macro-file.h \ --dir . --in-place Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- crypto/cipher-builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)