Commit d23fce15 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: chacha - remove <crypto/internal/chacha.h> 



<crypto/internal/chacha.h> is now included only by crypto/chacha.c, so
fold it into there.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 632ab097

crypto/chacha.c

+34 −1
Original line number Diff line number Diff line
@@ -8,10 +8,43 @@ 


#include <linux/unaligned.h>

#include <crypto/algapi.h>

#include <crypto/internal/chacha.h>

#include <crypto/chacha.h>

#include <crypto/internal/skcipher.h>

#include <linux/module.h>



struct chacha_ctx {

	u32 key[8];

	int nrounds;

};



static int chacha_setkey(struct crypto_skcipher *tfm,

			 const u8 *key, unsigned int keysize, int nrounds)

{

	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);

	int i;



	if (keysize != CHACHA_KEY_SIZE)

		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(ctx->key); i++)

		ctx->key[i] = get_unaligned_le32(key + i * sizeof(u32));



	ctx->nrounds = nrounds;

	return 0;

}



static int chacha20_setkey(struct crypto_skcipher *tfm,

			   const u8 *key, unsigned int keysize)

{

	return chacha_setkey(tfm, key, keysize, 20);

}



static int chacha12_setkey(struct crypto_skcipher *tfm,

			   const u8 *key, unsigned int keysize)

{

	return chacha_setkey(tfm, key, keysize, 12);

}



static int chacha_stream_xor(struct skcipher_request *req,

			     const struct chacha_ctx *ctx, const u8 *iv,

			     bool arch)

include/crypto/internal/chacha.h

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef _CRYPTO_INTERNAL_CHACHA_H

#define _CRYPTO_INTERNAL_CHACHA_H



#include <crypto/chacha.h>

#include <crypto/internal/skcipher.h>

#include <linux/crypto.h>



struct chacha_ctx {

	u32 key[8];

	int nrounds;

};



static inline int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key,

				unsigned int keysize, int nrounds)

{

	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);

	int i;



	if (keysize != CHACHA_KEY_SIZE)

		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(ctx->key); i++)

		ctx->key[i] = get_unaligned_le32(key + i * sizeof(u32));



	ctx->nrounds = nrounds;

	return 0;

}



static inline int chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,

				  unsigned int keysize)

{

	return chacha_setkey(tfm, key, keysize, 20);

}



static inline int chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,

				  unsigned int keysize)

{

	return chacha_setkey(tfm, key, keysize, 12);

}



#endif /* _CRYPTO_CHACHA_H */