davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto: chacha - unexport chacha_generic routines

Browse Source 
Now that all users of generic ChaCha code have moved to the core library,
there is no longer a need for the generic ChaCha skcpiher driver to
export parts of it implementation for reuse by other drivers. So drop
the exports, and make the symbols static.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ard Biesheuvel 2019-11-08 13:22:18 +01:00 committed by Herbert Xu
parent 3a2f58f3ba
commit 22cf705360
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crypto/chacha_generic.c
View File

@ -21,7 +21,7 @@ static int chacha_stream_xor(struct skcipher_request *req,
err = skcipher_walk_virt(&walk, req, false); err = skcipher_walk_virt(&walk, req, false);
crypto_chacha_init(state, ctx, iv); chacha_init_generic(state, ctx->key, iv);
while (walk.nbytes > 0) { while (walk.nbytes > 0) {
unsigned int nbytes = walk.nbytes; unsigned int nbytes = walk.nbytes;
@ -37,36 +37,27 @@ static int chacha_stream_xor(struct skcipher_request *req,
return err; return err;
} }
void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv) static int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
{ unsigned int keysize)
chacha_init_generic(state, ctx->key, iv);
}
EXPORT_SYMBOL_GPL(crypto_chacha_init);
int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keysize)
{ {
return chacha_setkey(tfm, key, keysize, 20); return chacha_setkey(tfm, key, keysize, 20);
} }
EXPORT_SYMBOL_GPL(crypto_chacha20_setkey);
int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key, static int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keysize) unsigned int keysize)
{ {
return chacha_setkey(tfm, key, keysize, 12); return chacha_setkey(tfm, key, keysize, 12);
} }
EXPORT_SYMBOL_GPL(crypto_chacha12_setkey);
int crypto_chacha_crypt(struct skcipher_request *req) static int crypto_chacha_crypt(struct skcipher_request *req)
{ {
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm); struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
return chacha_stream_xor(req, ctx, req->iv); return chacha_stream_xor(req, ctx, req->iv);
} }
EXPORT_SYMBOL_GPL(crypto_chacha_crypt);
int crypto_xchacha_crypt(struct skcipher_request *req) static int crypto_xchacha_crypt(struct skcipher_request *req)
{ {
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm); struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
@ -75,7 +66,7 @@ int crypto_xchacha_crypt(struct skcipher_request *req)
u8 real_iv[16]; u8 real_iv[16];
/* Compute the subkey given the original key and first 128 nonce bits */ /* Compute the subkey given the original key and first 128 nonce bits */
crypto_chacha_init(state, ctx, req->iv); chacha_init_generic(state, ctx->key, req->iv);
hchacha_block_generic(state, subctx.key, ctx->nrounds); hchacha_block_generic(state, subctx.key, ctx->nrounds);
subctx.nrounds = ctx->nrounds; subctx.nrounds = ctx->nrounds;
@ -86,7 +77,6 @@ int crypto_xchacha_crypt(struct skcipher_request *req)
/* Generate the stream and XOR it with the data */ /* Generate the stream and XOR it with the data */
return chacha_stream_xor(req, &subctx, real_iv); return chacha_stream_xor(req, &subctx, real_iv);
} }
EXPORT_SYMBOL_GPL(crypto_xchacha_crypt);
static struct skcipher_alg algs[] = { static struct skcipher_alg algs[] = {
{ {

10
include/crypto/internal/chacha.h
View File

@ -12,8 +12,6 @@ struct chacha_ctx {
int nrounds; int nrounds;
}; };
void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv);
static inline int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key, static inline int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keysize, int nrounds) unsigned int keysize, int nrounds)
{ {
@ -42,12 +40,4 @@ static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
return chacha_setkey(tfm, key, keysize, 12); return chacha_setkey(tfm, key, keysize, 12);
} }
int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keysize);
int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keysize);
int crypto_chacha_crypt(struct skcipher_request *req);
int crypto_xchacha_crypt(struct skcipher_request *req);
#endif /* _CRYPTO_CHACHA_H */ #endif /* _CRYPTO_CHACHA_H */