Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: sha1-generic - move to generic glue implementation

Browse source 
This updated the generic SHA-1 implementation to use the generic
shared SHA-1 glue code.

It also implements a .finup hook crypto_sha1_finup() and exports
it to other modules. The import and export() functions and the
.statesize member are dropped, since the default implementation
is perfectly suitable for this module.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ard Biesheuvel 2015-04-09 12:55:36 +02:00 • committed by Herbert Xu
parent b84a2a0b4e
commit 7c71f0f760
2 changed files with 23 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
crypto/sha1_generic.c
View file

@ -23,111 +23,49 @@
#include <linux/cryptohash.h> #include <linux/cryptohash.h>
#include <linux/types.h> #include <linux/types.h>
#include <crypto/sha.h> #include <crypto/sha.h>
#include <crypto/sha1_base.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
static int sha1_init(struct shash_desc *desc) static void sha1_generic_block_fn(struct sha1_state *sst, u8 const *src,
int blocks)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); u32 temp[SHA_WORKSPACE_WORDS];
*sctx = (struct sha1_state){ while (blocks--) {
.state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 }, sha_transform(sst->state, src, temp);
}; src += SHA1_BLOCK_SIZE;
}
return 0; memzero_explicit(temp, sizeof(temp));
} }
int crypto_sha1_update(struct shash_desc *desc, const u8 *data, int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
unsigned int len) unsigned int len)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); return sha1_base_do_update(desc, data, len, sha1_generic_block_fn);
unsigned int partial, done;
const u8 *src;
partial = sctx->count % SHA1_BLOCK_SIZE;
sctx->count += len;
done = 0;
src = data;
if ((partial + len) >= SHA1_BLOCK_SIZE) {
u32 temp[SHA_WORKSPACE_WORDS];
if (partial) {
done = -partial;
memcpy(sctx->buffer + partial, data,
done + SHA1_BLOCK_SIZE);
src = sctx->buffer;
}
do {
sha_transform(sctx->state, src, temp);
done += SHA1_BLOCK_SIZE;
src = data + done;
} while (done + SHA1_BLOCK_SIZE <= len);
memzero_explicit(temp, sizeof(temp));
partial = 0;
}
memcpy(sctx->buffer + partial, src, len - done);
return 0;
} }
EXPORT_SYMBOL(crypto_sha1_update); EXPORT_SYMBOL(crypto_sha1_update);
/* Add padding and return the message digest. */
static int sha1_final(struct shash_desc *desc, u8 *out) static int sha1_final(struct shash_desc *desc, u8 *out)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); sha1_base_do_finalize(desc, sha1_generic_block_fn);
__be32 *dst = (__be32 *)out; return sha1_base_finish(desc, out);
u32 i, index, padlen;
__be64 bits;
static const u8 padding[64] = { 0x80, };
bits = cpu_to_be64(sctx->count << 3);
/* Pad out to 56 mod 64 */
index = sctx->count & 0x3f;
padlen = (index < 56) ? (56 - index) : ((64+56) - index);
crypto_sha1_update(desc, padding, padlen);
/* Append length */
crypto_sha1_update(desc, (const u8 *)&bits, sizeof(bits));
/* Store state in digest */
for (i = 0; i < 5; i++)
dst[i] = cpu_to_be32(sctx->state[i]);
/* Wipe context */
memset(sctx, 0, sizeof *sctx);
return 0;
} }
static int sha1_export(struct shash_desc *desc, void *out) int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,
unsigned int len, u8 *out)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); sha1_base_do_update(desc, data, len, sha1_generic_block_fn);
return sha1_final(desc, out);
memcpy(out, sctx, sizeof(*sctx));
return 0;
}
static int sha1_import(struct shash_desc *desc, const void *in)
{
struct sha1_state *sctx = shash_desc_ctx(desc);
memcpy(sctx, in, sizeof(*sctx));
return 0;
} }
EXPORT_SYMBOL(crypto_sha1_finup);
static struct shash_alg alg = { static struct shash_alg alg = {
.digestsize = SHA1_DIGEST_SIZE, .digestsize = SHA1_DIGEST_SIZE,
.init = sha1_init, .init = sha1_base_init,
.update = crypto_sha1_update, .update = crypto_sha1_update,
.final = sha1_final, .final = sha1_final,
.export = sha1_export, .finup = crypto_sha1_finup,
.import = sha1_import,
.descsize = sizeof(struct sha1_state), .descsize = sizeof(struct sha1_state),
.statesize = sizeof(struct sha1_state),
.base = { .base = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name= "sha1-generic", .cra_driver_name= "sha1-generic",

3
include/crypto/sha.h
View file

@ -87,6 +87,9 @@ struct shash_desc;
extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data, extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
unsigned int len); unsigned int len);
extern int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,
unsigned int len, u8 *hash);
extern int crypto_sha256_update(struct shash_desc *desc, const u8 *data, extern int crypto_sha256_update(struct shash_desc *desc, const u8 *data,
unsigned int len); unsigned int len);