crypto: chacha - constify ctx and iv arguments

Constify the ctx and iv arguments to crypto_chacha_init() and the
various chacha*_stream_xor() functions.  This makes it clear that they
are not modified.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/chacha-neon-glue.c b/arch/arm/crypto/chacha-neon-glue.c
index 48a89537b8283c4bf8eaf2820250cd5aca27ced6..a8e9b534c8da5ec01eb64cd75de9769e84ad7821 100644 (file)
--- a/arch/arm/crypto/chacha-neon-glue.c
+++ b/arch/arm/crypto/chacha-neon-glue.c
@@ -63,7 +63,7 @@ static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
 }
 
 static int chacha_neon_stream_xor(struct skcipher_request *req,
-                                 struct chacha_ctx *ctx, u8 *iv)
+                                 const struct chacha_ctx *ctx, const u8 *iv)
 {
        struct skcipher_walk walk;
        u32 state[16];

diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c
index 82029cda2e77a0c0f898a290b58c28a26bb4a33b..1495d2b18518d4886f88e6ac8010754136381c68 100644 (file)
--- a/arch/arm64/crypto/chacha-neon-glue.c
+++ b/arch/arm64/crypto/chacha-neon-glue.c
@@ -60,7 +60,7 @@ static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
 }
 
 static int chacha_neon_stream_xor(struct skcipher_request *req,
-                                 struct chacha_ctx *ctx, u8 *iv)
+                                 const struct chacha_ctx *ctx, const u8 *iv)
 {
        struct skcipher_walk walk;
        u32 state[16];

diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c
index 4967ad620775b109048ba1d9a19bc448a549d012..7276b7ef14ec4f6d483af2dd0404bf3104e77f22 100644 (file)
--- a/arch/x86/crypto/chacha_glue.c
+++ b/arch/x86/crypto/chacha_glue.c
@@ -128,7 +128,7 @@ static void chacha_dosimd(u32 *state, u8 *dst, const u8 *src,
 }
 
 static int chacha_simd_stream_xor(struct skcipher_walk *walk,
-                                 struct chacha_ctx *ctx, u8 *iv)
+                                 const struct chacha_ctx *ctx, const u8 *iv)
 {
        u32 *state, state_buf[16 + 2] __aligned(8);
        int next_yield = 4096; /* bytes until next FPU yield */

diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c
index d2ec04997832e9ec7c21d85f1ee88b423727ee7c..d283bd3bdb6072024eb933381ee979393067909c 100644 (file)
--- a/crypto/chacha_generic.c
+++ b/crypto/chacha_generic.c
@@ -36,7 +36,7 @@ static void chacha_docrypt(u32 *state, u8 *dst, const u8 *src,
 }
 
 static int chacha_stream_xor(struct skcipher_request *req,
-                            struct chacha_ctx *ctx, u8 *iv)
+                            const struct chacha_ctx *ctx, const u8 *iv)
 {
        struct skcipher_walk walk;
        u32 state[16];
@@ -60,7 +60,7 @@ static int chacha_stream_xor(struct skcipher_request *req,
        return err;
 }
 
-void crypto_chacha_init(u32 *state, struct chacha_ctx *ctx, u8 *iv)
+void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv)
 {
        state[0]  = 0x61707865; /* "expa" */
        state[1]  = 0x3320646e; /* "nd 3" */

diff --git a/include/crypto/chacha.h b/include/crypto/chacha.h
index 1fc70a69d550886ee23fa671f39c0690804692f3..d1e723c6a37dd9e3faac1452e1e28d9cca2eef3b 100644 (file)
--- a/include/crypto/chacha.h
+++ b/include/crypto/chacha.h
@@ -41,7 +41,7 @@ static inline void chacha20_block(u32 *state, u8 *stream)
 }
 void hchacha_block(const u32 *in, u32 *out, int nrounds);
 
-void crypto_chacha_init(u32 *state, struct chacha_ctx *ctx, u8 *iv);
+void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv);
 
 int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
                           unsigned int keysize);