redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

crypto: sha256 - Switch to shash 

This patch changes sha256 and sha224 to the new shash interface.

Signed-off-by: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
wifi-calibration
Adrian-Ken Rueegsegger 2008-12-03 19:57:49 +08:00 committed by Herbert Xu
parent 14b75ba70d
commit 50e109b5b9
2 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/Kconfig
View File

@ -357,7 +357,7 @@ config CRYPTO_SHA1
config CRYPTO_SHA256 config CRYPTO_SHA256
tristate "SHA224 and SHA256 digest algorithm" tristate "SHA224 and SHA256 digest algorithm"
select CRYPTO_ALGAPI select CRYPTO_HASH
help help
SHA256 secure hash standard (DFIPS 180-2). SHA256 secure hash standard (DFIPS 180-2).

104
crypto/sha256_generic.c
View File

@ -17,10 +17,10 @@
* any later version. * any later version.
* *
*/ */
#include <crypto/internal/hash.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/crypto.h>
#include <linux/types.h> #include <linux/types.h>
#include <crypto/sha.h> #include <crypto/sha.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
@ -69,7 +69,7 @@ static void sha256_transform(u32 *state, const u8 *input)
/* now blend */ /* now blend */
for (i = 16; i < 64; i++) for (i = 16; i < 64; i++)
BLEND_OP(i, W); BLEND_OP(i, W);
/* load the state into our registers */ /* load the state into our registers */
a=state[0]; b=state[1]; c=state[2]; d=state[3]; a=state[0]; b=state[1]; c=state[2]; d=state[3];
e=state[4]; f=state[5]; g=state[6]; h=state[7]; e=state[4]; f=state[5]; g=state[6]; h=state[7];
@ -220,9 +220,9 @@ static void sha256_transform(u32 *state, const u8 *input)
} }
static void sha224_init(struct crypto_tfm *tfm) static int sha224_init(struct shash_desc *desc)
{ {
struct sha256_ctx *sctx = crypto_tfm_ctx(tfm); struct sha256_ctx *sctx = shash_desc_ctx(desc);
sctx->state[0] = SHA224_H0; sctx->state[0] = SHA224_H0;
sctx->state[1] = SHA224_H1; sctx->state[1] = SHA224_H1;
sctx->state[2] = SHA224_H2; sctx->state[2] = SHA224_H2;
@ -233,11 +233,13 @@ static void sha224_init(struct crypto_tfm *tfm)
sctx->state[7] = SHA224_H7; sctx->state[7] = SHA224_H7;
sctx->count[0] = 0; sctx->count[0] = 0;
sctx->count[1] = 0; sctx->count[1] = 0;
return 0;
} }
static void sha256_init(struct crypto_tfm *tfm) static int sha256_init(struct shash_desc *desc)
{ {
struct sha256_ctx *sctx = crypto_tfm_ctx(tfm); struct sha256_ctx *sctx = shash_desc_ctx(desc);
sctx->state[0] = SHA256_H0; sctx->state[0] = SHA256_H0;
sctx->state[1] = SHA256_H1; sctx->state[1] = SHA256_H1;
sctx->state[2] = SHA256_H2; sctx->state[2] = SHA256_H2;
@ -247,12 +249,14 @@ static void sha256_init(struct crypto_tfm *tfm)
sctx->state[6] = SHA256_H6; sctx->state[6] = SHA256_H6;
sctx->state[7] = SHA256_H7; sctx->state[7] = SHA256_H7;
sctx->count[0] = sctx->count[1] = 0; sctx->count[0] = sctx->count[1] = 0;
return 0;
} }
static void sha256_update(struct crypto_tfm *tfm, const u8 *data, static int sha256_update(struct shash_desc *desc, const u8 *data,
unsigned int len) unsigned int len)
{ {
struct sha256_ctx *sctx = crypto_tfm_ctx(tfm); struct sha256_ctx *sctx = shash_desc_ctx(desc);
unsigned int i, index, part_len; unsigned int i, index, part_len;
/* Compute number of bytes mod 128 */ /* Compute number of bytes mod 128 */
@ -277,14 +281,16 @@ static void sha256_update(struct crypto_tfm *tfm, const u8 *data,
} else { } else {
i = 0; i = 0;
} }
/* Buffer remaining input */ /* Buffer remaining input */
memcpy(&sctx->buf[index], &data[i], len-i); memcpy(&sctx->buf[index], &data[i], len-i);
return 0;
} }
static void sha256_final(struct crypto_tfm *tfm, u8 *out) static int sha256_final(struct shash_desc *desc, u8 *out)
{ {
struct sha256_ctx *sctx = crypto_tfm_ctx(tfm); struct sha256_ctx *sctx = shash_desc_ctx(desc);
__be32 *dst = (__be32 *)out; __be32 *dst = (__be32 *)out;
__be32 bits[2]; __be32 bits[2];
unsigned int index, pad_len; unsigned int index, pad_len;
@ -298,10 +304,10 @@ static void sha256_final(struct crypto_tfm *tfm, u8 *out)
/* Pad out to 56 mod 64. */ /* Pad out to 56 mod 64. */
index = (sctx->count[0] >> 3) & 0x3f; index = (sctx->count[0] >> 3) & 0x3f;
pad_len = (index < 56) ? (56 - index) : ((64+56) - index); pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
sha256_update(tfm, padding, pad_len); sha256_update(desc, padding, pad_len);
/* Append length (before padding) */ /* Append length (before padding) */
sha256_update(tfm, (const u8 *)bits, sizeof(bits)); sha256_update(desc, (const u8 *)bits, sizeof(bits));
/* Store state in digest */ /* Store state in digest */
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
@ -309,71 +315,73 @@ static void sha256_final(struct crypto_tfm *tfm, u8 *out)
/* Zeroize sensitive information. */ /* Zeroize sensitive information. */
memset(sctx, 0, sizeof(*sctx)); memset(sctx, 0, sizeof(*sctx));
return 0;
} }
static void sha224_final(struct crypto_tfm *tfm, u8 *hash) static int sha224_final(struct shash_desc *desc, u8 *hash)
{ {
u8 D[SHA256_DIGEST_SIZE]; u8 D[SHA256_DIGEST_SIZE];
sha256_final(tfm, D); sha256_final(desc, D);
memcpy(hash, D, SHA224_DIGEST_SIZE); memcpy(hash, D, SHA224_DIGEST_SIZE);
memset(D, 0, SHA256_DIGEST_SIZE); memset(D, 0, SHA256_DIGEST_SIZE);
return 0;
} }
static struct crypto_alg sha256 = { static struct shash_alg sha256 = {
.cra_name = "sha256", .digestsize = SHA256_DIGEST_SIZE,
.cra_driver_name= "sha256-generic", .init = sha256_init,
.cra_flags = CRYPTO_ALG_TYPE_DIGEST, .update = sha256_update,
.cra_blocksize = SHA256_BLOCK_SIZE, .final = sha256_final,
.cra_ctxsize = sizeof(struct sha256_ctx), .descsize = sizeof(struct sha256_ctx),
.cra_module = THIS_MODULE, .base = {
.cra_alignmask = 3, .cra_name = "sha256",
.cra_list = LIST_HEAD_INIT(sha256.cra_list), .cra_driver_name= "sha256-generic",
.cra_u = { .digest = { .cra_flags = CRYPTO_ALG_TYPE_SHASH,
.dia_digestsize = SHA256_DIGEST_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.dia_init = sha256_init, .cra_module = THIS_MODULE,
.dia_update = sha256_update, }
.dia_final = sha256_final } }
}; };
static struct crypto_alg sha224 = { static struct shash_alg sha224 = {
.cra_name = "sha224", .digestsize = SHA224_DIGEST_SIZE,
.cra_driver_name = "sha224-generic", .init = sha224_init,
.cra_flags = CRYPTO_ALG_TYPE_DIGEST, .update = sha256_update,
.cra_blocksize = SHA224_BLOCK_SIZE, .final = sha224_final,
.cra_ctxsize = sizeof(struct sha256_ctx), .descsize = sizeof(struct sha256_ctx),
.cra_module = THIS_MODULE, .base = {
.cra_alignmask = 3, .cra_name = "sha224",
.cra_list = LIST_HEAD_INIT(sha224.cra_list), .cra_driver_name= "sha224-generic",
.cra_u = { .digest = { .cra_flags = CRYPTO_ALG_TYPE_SHASH,
.dia_digestsize = SHA224_DIGEST_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.dia_init = sha224_init, .cra_module = THIS_MODULE,
.dia_update = sha256_update, }
.dia_final = sha224_final } }
}; };
static int __init sha256_generic_mod_init(void) static int __init sha256_generic_mod_init(void)
{ {
int ret = 0; int ret = 0;
ret = crypto_register_alg(&sha224); ret = crypto_register_shash(&sha224);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = crypto_register_alg(&sha256); ret = crypto_register_shash(&sha256);
if (ret < 0) if (ret < 0)
crypto_unregister_alg(&sha224); crypto_unregister_shash(&sha224);
return ret; return ret;
} }
static void __exit sha256_generic_mod_fini(void) static void __exit sha256_generic_mod_fini(void)
{ {
crypto_unregister_alg(&sha224); crypto_unregister_shash(&sha224);
crypto_unregister_alg(&sha256); crypto_unregister_shash(&sha256);
} }
module_init(sha256_generic_mod_init); module_init(sha256_generic_mod_init);