mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 08:02:27 +02:00
crypto: sparc/md5 - Use API partial block handling
Use the Crypto API partial block handling. Also switch to the generic export format. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
60fded5709
commit
cc1f5bbe42
|
|
@ -14,121 +14,105 @@
|
|||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <crypto/internal/hash.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/types.h>
|
||||
#include <crypto/md5.h>
|
||||
|
||||
#include <asm/pstate.h>
|
||||
#include <asm/elf.h>
|
||||
#include <asm/pstate.h>
|
||||
#include <crypto/internal/hash.h>
|
||||
#include <crypto/md5.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/unaligned.h>
|
||||
|
||||
#include "opcodes.h"
|
||||
|
||||
asmlinkage void md5_sparc64_transform(u32 *digest, const char *data,
|
||||
struct sparc_md5_state {
|
||||
__le32 hash[MD5_HASH_WORDS];
|
||||
u64 byte_count;
|
||||
};
|
||||
|
||||
asmlinkage void md5_sparc64_transform(__le32 *digest, const char *data,
|
||||
unsigned int rounds);
|
||||
|
||||
static int md5_sparc64_init(struct shash_desc *desc)
|
||||
{
|
||||
struct md5_state *mctx = shash_desc_ctx(desc);
|
||||
struct sparc_md5_state *mctx = shash_desc_ctx(desc);
|
||||
|
||||
mctx->hash[0] = MD5_H0;
|
||||
mctx->hash[1] = MD5_H1;
|
||||
mctx->hash[2] = MD5_H2;
|
||||
mctx->hash[3] = MD5_H3;
|
||||
le32_to_cpu_array(mctx->hash, 4);
|
||||
mctx->hash[0] = cpu_to_le32(MD5_H0);
|
||||
mctx->hash[1] = cpu_to_le32(MD5_H1);
|
||||
mctx->hash[2] = cpu_to_le32(MD5_H2);
|
||||
mctx->hash[3] = cpu_to_le32(MD5_H3);
|
||||
mctx->byte_count = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __md5_sparc64_update(struct md5_state *sctx, const u8 *data,
|
||||
unsigned int len, unsigned int partial)
|
||||
{
|
||||
unsigned int done = 0;
|
||||
|
||||
sctx->byte_count += len;
|
||||
if (partial) {
|
||||
done = MD5_HMAC_BLOCK_SIZE - partial;
|
||||
memcpy((u8 *)sctx->block + partial, data, done);
|
||||
md5_sparc64_transform(sctx->hash, (u8 *)sctx->block, 1);
|
||||
}
|
||||
if (len - done >= MD5_HMAC_BLOCK_SIZE) {
|
||||
const unsigned int rounds = (len - done) / MD5_HMAC_BLOCK_SIZE;
|
||||
|
||||
md5_sparc64_transform(sctx->hash, data + done, rounds);
|
||||
done += rounds * MD5_HMAC_BLOCK_SIZE;
|
||||
}
|
||||
|
||||
memcpy(sctx->block, data + done, len - done);
|
||||
}
|
||||
|
||||
static int md5_sparc64_update(struct shash_desc *desc, const u8 *data,
|
||||
unsigned int len)
|
||||
{
|
||||
struct md5_state *sctx = shash_desc_ctx(desc);
|
||||
unsigned int partial = sctx->byte_count % MD5_HMAC_BLOCK_SIZE;
|
||||
struct sparc_md5_state *sctx = shash_desc_ctx(desc);
|
||||
|
||||
/* Handle the fast case right here */
|
||||
if (partial + len < MD5_HMAC_BLOCK_SIZE) {
|
||||
sctx->byte_count += len;
|
||||
memcpy((u8 *)sctx->block + partial, data, len);
|
||||
} else
|
||||
__md5_sparc64_update(sctx, data, len, partial);
|
||||
|
||||
return 0;
|
||||
sctx->byte_count += round_down(len, MD5_HMAC_BLOCK_SIZE);
|
||||
md5_sparc64_transform(sctx->hash, data, len / MD5_HMAC_BLOCK_SIZE);
|
||||
return len - round_down(len, MD5_HMAC_BLOCK_SIZE);
|
||||
}
|
||||
|
||||
/* Add padding and return the message digest. */
|
||||
static int md5_sparc64_final(struct shash_desc *desc, u8 *out)
|
||||
static int md5_sparc64_finup(struct shash_desc *desc, const u8 *src,
|
||||
unsigned int offset, u8 *out)
|
||||
{
|
||||
struct md5_state *sctx = shash_desc_ctx(desc);
|
||||
unsigned int i, index, padlen;
|
||||
u32 *dst = (u32 *)out;
|
||||
__le64 bits;
|
||||
static const u8 padding[MD5_HMAC_BLOCK_SIZE] = { 0x80, };
|
||||
struct sparc_md5_state *sctx = shash_desc_ctx(desc);
|
||||
__le64 block[MD5_BLOCK_WORDS] = {};
|
||||
u8 *p = memcpy(block, src, offset);
|
||||
__le32 *dst = (__le32 *)out;
|
||||
__le64 *pbits;
|
||||
int i;
|
||||
|
||||
bits = cpu_to_le64(sctx->byte_count << 3);
|
||||
|
||||
/* Pad out to 56 mod 64 and append length */
|
||||
index = sctx->byte_count % MD5_HMAC_BLOCK_SIZE;
|
||||
padlen = (index < 56) ? (56 - index) : ((MD5_HMAC_BLOCK_SIZE+56) - index);
|
||||
|
||||
/* We need to fill a whole block for __md5_sparc64_update() */
|
||||
if (padlen <= 56) {
|
||||
sctx->byte_count += padlen;
|
||||
memcpy((u8 *)sctx->block + index, padding, padlen);
|
||||
} else {
|
||||
__md5_sparc64_update(sctx, padding, padlen, index);
|
||||
}
|
||||
__md5_sparc64_update(sctx, (const u8 *)&bits, sizeof(bits), 56);
|
||||
src = p;
|
||||
p += offset;
|
||||
*p++ = 0x80;
|
||||
sctx->byte_count += offset;
|
||||
pbits = &block[(MD5_BLOCK_WORDS / (offset > 55 ? 1 : 2)) - 1];
|
||||
*pbits = cpu_to_le64(sctx->byte_count << 3);
|
||||
md5_sparc64_transform(sctx->hash, src, (pbits - block + 1) / 8);
|
||||
memzero_explicit(block, sizeof(block));
|
||||
|
||||
/* Store state in digest */
|
||||
for (i = 0; i < MD5_HASH_WORDS; i++)
|
||||
dst[i] = sctx->hash[i];
|
||||
|
||||
/* Wipe context */
|
||||
memset(sctx, 0, sizeof(*sctx));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int md5_sparc64_export(struct shash_desc *desc, void *out)
|
||||
{
|
||||
struct md5_state *sctx = shash_desc_ctx(desc);
|
||||
|
||||
memcpy(out, sctx, sizeof(*sctx));
|
||||
struct sparc_md5_state *sctx = shash_desc_ctx(desc);
|
||||
union {
|
||||
u8 *u8;
|
||||
u32 *u32;
|
||||
u64 *u64;
|
||||
} p = { .u8 = out };
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MD5_HASH_WORDS; i++)
|
||||
put_unaligned(le32_to_cpu(sctx->hash[i]), p.u32++);
|
||||
put_unaligned(sctx->byte_count, p.u64);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int md5_sparc64_import(struct shash_desc *desc, const void *in)
|
||||
{
|
||||
struct md5_state *sctx = shash_desc_ctx(desc);
|
||||
|
||||
memcpy(sctx, in, sizeof(*sctx));
|
||||
struct sparc_md5_state *sctx = shash_desc_ctx(desc);
|
||||
union {
|
||||
const u8 *u8;
|
||||
const u32 *u32;
|
||||
const u64 *u64;
|
||||
} p = { .u8 = in };
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MD5_HASH_WORDS; i++)
|
||||
sctx->hash[i] = cpu_to_le32(get_unaligned(p.u32++));
|
||||
sctx->byte_count = get_unaligned(p.u64);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -136,15 +120,16 @@ static struct shash_alg alg = {
|
|||
.digestsize = MD5_DIGEST_SIZE,
|
||||
.init = md5_sparc64_init,
|
||||
.update = md5_sparc64_update,
|
||||
.final = md5_sparc64_final,
|
||||
.finup = md5_sparc64_finup,
|
||||
.export = md5_sparc64_export,
|
||||
.import = md5_sparc64_import,
|
||||
.descsize = sizeof(struct md5_state),
|
||||
.statesize = sizeof(struct md5_state),
|
||||
.descsize = sizeof(struct sparc_md5_state),
|
||||
.statesize = sizeof(struct sparc_md5_state),
|
||||
.base = {
|
||||
.cra_name = "md5",
|
||||
.cra_driver_name= "md5-sparc64",
|
||||
.cra_priority = SPARC_CR_OPCODE_PRIORITY,
|
||||
.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
|
||||
.cra_blocksize = MD5_HMAC_BLOCK_SIZE,
|
||||
.cra_module = THIS_MODULE,
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user