mirror of
https://github.com/torvalds/linux.git
synced 2025-08-15 14:11:42 +02:00
crypto: sha3-generic - Use API partial block handling
Use the Crypto API partial block handling. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu
parent
6f90ba7065
commit
0d474be267
2 changed files with 47 additions and 61 deletions
|
|
@ -9,10 +9,10 @@
|
|||
* Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
*/
|
||||
#include <crypto/internal/hash.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
#include <crypto/sha3.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/unaligned.h>
|
||||
|
||||
/*
|
||||
|
|
@ -161,68 +161,51 @@ static void keccakf(u64 st[25])
|
|||
int crypto_sha3_init(struct shash_desc *desc)
|
||||
{
|
||||
struct sha3_state *sctx = shash_desc_ctx(desc);
|
||||
unsigned int digest_size = crypto_shash_digestsize(desc->tfm);
|
||||
|
||||
sctx->rsiz = 200 - 2 * digest_size;
|
||||
sctx->rsizw = sctx->rsiz / 8;
|
||||
sctx->partial = 0;
|
||||
|
||||
memset(sctx->st, 0, sizeof(sctx->st));
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(crypto_sha3_init);
|
||||
|
||||
int crypto_sha3_update(struct shash_desc *desc, const u8 *data,
|
||||
unsigned int len)
|
||||
static int crypto_sha3_update(struct shash_desc *desc, const u8 *data,
|
||||
unsigned int len)
|
||||
{
|
||||
unsigned int rsiz = crypto_shash_blocksize(desc->tfm);
|
||||
struct sha3_state *sctx = shash_desc_ctx(desc);
|
||||
unsigned int done;
|
||||
const u8 *src;
|
||||
unsigned int rsizw = rsiz / 8;
|
||||
|
||||
done = 0;
|
||||
src = data;
|
||||
do {
|
||||
int i;
|
||||
|
||||
if ((sctx->partial + len) > (sctx->rsiz - 1)) {
|
||||
if (sctx->partial) {
|
||||
done = -sctx->partial;
|
||||
memcpy(sctx->buf + sctx->partial, data,
|
||||
done + sctx->rsiz);
|
||||
src = sctx->buf;
|
||||
}
|
||||
for (i = 0; i < rsizw; i++)
|
||||
sctx->st[i] ^= get_unaligned_le64(data + 8 * i);
|
||||
keccakf(sctx->st);
|
||||
|
||||
do {
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < sctx->rsizw; i++)
|
||||
sctx->st[i] ^= get_unaligned_le64(src + 8 * i);
|
||||
keccakf(sctx->st);
|
||||
|
||||
done += sctx->rsiz;
|
||||
src = data + done;
|
||||
} while (done + (sctx->rsiz - 1) < len);
|
||||
|
||||
sctx->partial = 0;
|
||||
}
|
||||
memcpy(sctx->buf + sctx->partial, src, len - done);
|
||||
sctx->partial += (len - done);
|
||||
|
||||
return 0;
|
||||
data += rsiz;
|
||||
len -= rsiz;
|
||||
} while (len >= rsiz);
|
||||
return len;
|
||||
}
|
||||
EXPORT_SYMBOL(crypto_sha3_update);
|
||||
|
||||
int crypto_sha3_final(struct shash_desc *desc, u8 *out)
|
||||
static int crypto_sha3_finup(struct shash_desc *desc, const u8 *src,
|
||||
unsigned int len, u8 *out)
|
||||
{
|
||||
struct sha3_state *sctx = shash_desc_ctx(desc);
|
||||
unsigned int i, inlen = sctx->partial;
|
||||
unsigned int digest_size = crypto_shash_digestsize(desc->tfm);
|
||||
unsigned int rsiz = crypto_shash_blocksize(desc->tfm);
|
||||
struct sha3_state *sctx = shash_desc_ctx(desc);
|
||||
__le64 block[SHA3_224_BLOCK_SIZE / 8] = {};
|
||||
__le64 *digest = (__le64 *)out;
|
||||
unsigned int rsizw = rsiz / 8;
|
||||
u8 *p;
|
||||
int i;
|
||||
|
||||
sctx->buf[inlen++] = 0x06;
|
||||
memset(sctx->buf + inlen, 0, sctx->rsiz - inlen);
|
||||
sctx->buf[sctx->rsiz - 1] |= 0x80;
|
||||
p = memcpy(block, src, len);
|
||||
p[len++] = 0x06;
|
||||
p[rsiz - 1] |= 0x80;
|
||||
|
||||
for (i = 0; i < sctx->rsizw; i++)
|
||||
sctx->st[i] ^= get_unaligned_le64(sctx->buf + 8 * i);
|
||||
for (i = 0; i < rsizw; i++)
|
||||
sctx->st[i] ^= le64_to_cpu(block[i]);
|
||||
memzero_explicit(block, sizeof(block));
|
||||
|
||||
keccakf(sctx->st);
|
||||
|
||||
|
|
@ -232,49 +215,51 @@ int crypto_sha3_final(struct shash_desc *desc, u8 *out)
|
|||
if (digest_size & 4)
|
||||
put_unaligned_le32(sctx->st[i], (__le32 *)digest);
|
||||
|
||||
memset(sctx, 0, sizeof(*sctx));
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(crypto_sha3_final);
|
||||
|
||||
static struct shash_alg algs[] = { {
|
||||
.digestsize = SHA3_224_DIGEST_SIZE,
|
||||
.init = crypto_sha3_init,
|
||||
.update = crypto_sha3_update,
|
||||
.final = crypto_sha3_final,
|
||||
.descsize = sizeof(struct sha3_state),
|
||||
.finup = crypto_sha3_finup,
|
||||
.descsize = SHA3_STATE_SIZE,
|
||||
.base.cra_name = "sha3-224",
|
||||
.base.cra_driver_name = "sha3-224-generic",
|
||||
.base.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
|
||||
.base.cra_blocksize = SHA3_224_BLOCK_SIZE,
|
||||
.base.cra_module = THIS_MODULE,
|
||||
}, {
|
||||
.digestsize = SHA3_256_DIGEST_SIZE,
|
||||
.init = crypto_sha3_init,
|
||||
.update = crypto_sha3_update,
|
||||
.final = crypto_sha3_final,
|
||||
.descsize = sizeof(struct sha3_state),
|
||||
.finup = crypto_sha3_finup,
|
||||
.descsize = SHA3_STATE_SIZE,
|
||||
.base.cra_name = "sha3-256",
|
||||
.base.cra_driver_name = "sha3-256-generic",
|
||||
.base.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
|
||||
.base.cra_blocksize = SHA3_256_BLOCK_SIZE,
|
||||
.base.cra_module = THIS_MODULE,
|
||||
}, {
|
||||
.digestsize = SHA3_384_DIGEST_SIZE,
|
||||
.init = crypto_sha3_init,
|
||||
.update = crypto_sha3_update,
|
||||
.final = crypto_sha3_final,
|
||||
.descsize = sizeof(struct sha3_state),
|
||||
.finup = crypto_sha3_finup,
|
||||
.descsize = SHA3_STATE_SIZE,
|
||||
.base.cra_name = "sha3-384",
|
||||
.base.cra_driver_name = "sha3-384-generic",
|
||||
.base.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
|
||||
.base.cra_blocksize = SHA3_384_BLOCK_SIZE,
|
||||
.base.cra_module = THIS_MODULE,
|
||||
}, {
|
||||
.digestsize = SHA3_512_DIGEST_SIZE,
|
||||
.init = crypto_sha3_init,
|
||||
.update = crypto_sha3_update,
|
||||
.final = crypto_sha3_final,
|
||||
.descsize = sizeof(struct sha3_state),
|
||||
.finup = crypto_sha3_finup,
|
||||
.descsize = SHA3_STATE_SIZE,
|
||||
.base.cra_name = "sha3-512",
|
||||
.base.cra_driver_name = "sha3-512-generic",
|
||||
.base.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
|
||||
.base.cra_blocksize = SHA3_512_BLOCK_SIZE,
|
||||
.base.cra_module = THIS_MODULE,
|
||||
} };
|
||||
|
|
@ -289,7 +274,7 @@ static void __exit sha3_generic_mod_fini(void)
|
|||
crypto_unregister_shashes(algs, ARRAY_SIZE(algs));
|
||||
}
|
||||
|
||||
subsys_initcall(sha3_generic_mod_init);
|
||||
module_init(sha3_generic_mod_init);
|
||||
module_exit(sha3_generic_mod_fini);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
#ifndef __CRYPTO_SHA3_H__
|
||||
#define __CRYPTO_SHA3_H__
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
#define SHA3_224_DIGEST_SIZE (224 / 8)
|
||||
#define SHA3_224_BLOCK_SIZE (200 - 2 * SHA3_224_DIGEST_SIZE)
|
||||
|
||||
|
|
@ -19,6 +21,8 @@
|
|||
|
||||
#define SHA3_STATE_SIZE 200
|
||||
|
||||
struct shash_desc;
|
||||
|
||||
struct sha3_state {
|
||||
u64 st[SHA3_STATE_SIZE / 8];
|
||||
unsigned int rsiz;
|
||||
|
|
@ -29,8 +33,5 @@ struct sha3_state {
|
|||
};
|
||||
|
||||
int crypto_sha3_init(struct shash_desc *desc);
|
||||
int crypto_sha3_update(struct shash_desc *desc, const u8 *data,
|
||||
unsigned int len);
|
||||
int crypto_sha3_final(struct shash_desc *desc, u8 *out);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue