Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / crypto / sha256_generic.c

diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
index 74bf2f95f4e5629e2881600f350ecbe48f6d23d5..5a8dd47558e566752d9d3cbd02231fd981be0a4e 100644 (file)
--- a/crypto/sha256_generic.c
+++ b/crypto/sha256_generic.c
@@ -9,6 +9,7 @@
  * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com>
  * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
  * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+ * SHA224 Support Copyright 2007 Intel Corporation <jonathan.lynch@intel.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -21,12 +22,9 @@
 #include <linux/mm.h>
 #include <linux/crypto.h>
 #include <linux/types.h>
-#include <asm/scatterlist.h>
+#include <crypto/sha.h>
 #include <asm/byteorder.h>
 
-#define SHA256_DIGEST_SIZE     32
-#define SHA256_HMAC_BLOCK_SIZE 64
-
 struct sha256_ctx {
        u32 count[2];
        u32 state[8];
@@ -48,15 +46,6 @@ static inline u32 Maj(u32 x, u32 y, u32 z)
 #define s0(x)       (ror32(x, 7) ^ ror32(x,18) ^ (x >> 3))
 #define s1(x)       (ror32(x,17) ^ ror32(x,19) ^ (x >> 10))
 
-#define H0         0x6a09e667
-#define H1         0xbb67ae85
-#define H2         0x3c6ef372
-#define H3         0xa54ff53a
-#define H4         0x510e527f
-#define H5         0x9b05688c
-#define H6         0x1f83d9ab
-#define H7         0x5be0cd19
-
 static inline void LOAD_OP(int I, u32 *W, const u8 *input)
 {
        W[I] = __be32_to_cpu( ((__be32*)(input))[I] );
@@ -230,17 +219,33 @@ static void sha256_transform(u32 *state, const u8 *input)
        memset(W, 0, 64 * sizeof(u32));
 }
 
+
+static void sha224_init(struct crypto_tfm *tfm)
+{
+       struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);
+       sctx->state[0] = SHA224_H0;
+       sctx->state[1] = SHA224_H1;
+       sctx->state[2] = SHA224_H2;
+       sctx->state[3] = SHA224_H3;
+       sctx->state[4] = SHA224_H4;
+       sctx->state[5] = SHA224_H5;
+       sctx->state[6] = SHA224_H6;
+       sctx->state[7] = SHA224_H7;
+       sctx->count[0] = 0;
+       sctx->count[1] = 0;
+}
+
 static void sha256_init(struct crypto_tfm *tfm)
 {
        struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);
-       sctx->state[0] = H0;
-       sctx->state[1] = H1;
-       sctx->state[2] = H2;
-       sctx->state[3] = H3;
-       sctx->state[4] = H4;
-       sctx->state[5] = H5;
-       sctx->state[6] = H6;
-       sctx->state[7] = H7;
+       sctx->state[0] = SHA256_H0;
+       sctx->state[1] = SHA256_H1;
+       sctx->state[2] = SHA256_H2;
+       sctx->state[3] = SHA256_H3;
+       sctx->state[4] = SHA256_H4;
+       sctx->state[5] = SHA256_H5;
+       sctx->state[6] = SHA256_H6;
+       sctx->state[7] = SHA256_H7;
        sctx->count[0] = sctx->count[1] = 0;
 }
 
@@ -306,37 +311,76 @@ static void sha256_final(struct crypto_tfm *tfm, u8 *out)
        memset(sctx, 0, sizeof(*sctx));
 }
 
+static void sha224_final(struct crypto_tfm *tfm, u8 *hash)
+{
+       u8 D[SHA256_DIGEST_SIZE];
+
+       sha256_final(tfm, D);
 
-static struct crypto_alg alg = {
+       memcpy(hash, D, SHA224_DIGEST_SIZE);
+       memset(D, 0, SHA256_DIGEST_SIZE);
+}
+
+static struct crypto_alg sha256 = {
        .cra_name       =       "sha256",
        .cra_driver_name=       "sha256-generic",
        .cra_flags      =       CRYPTO_ALG_TYPE_DIGEST,
-       .cra_blocksize  =       SHA256_HMAC_BLOCK_SIZE,
+       .cra_blocksize  =       SHA256_BLOCK_SIZE,
        .cra_ctxsize    =       sizeof(struct sha256_ctx),
        .cra_module     =       THIS_MODULE,
        .cra_alignmask  =       3,
-       .cra_list       =       LIST_HEAD_INIT(alg.cra_list),
+       .cra_list       =       LIST_HEAD_INIT(sha256.cra_list),
        .cra_u          =       { .digest = {
        .dia_digestsize =       SHA256_DIGEST_SIZE,
-       .dia_init       =       sha256_init,
-       .dia_update     =       sha256_update,
-       .dia_final      =       sha256_final } }
+       .dia_init       =       sha256_init,
+       .dia_update     =       sha256_update,
+       .dia_final      =       sha256_final } }
 };
 
-static int __init init(void)
+static struct crypto_alg sha224 = {
+       .cra_name       = "sha224",
+       .cra_driver_name = "sha224-generic",
+       .cra_flags      = CRYPTO_ALG_TYPE_DIGEST,
+       .cra_blocksize  = SHA224_BLOCK_SIZE,
+       .cra_ctxsize    = sizeof(struct sha256_ctx),
+       .cra_module     = THIS_MODULE,
+       .cra_alignmask  = 3,
+       .cra_list       = LIST_HEAD_INIT(sha224.cra_list),
+       .cra_u          = { .digest = {
+       .dia_digestsize = SHA224_DIGEST_SIZE,
+       .dia_init       = sha224_init,
+       .dia_update     = sha256_update,
+       .dia_final      = sha224_final } }
+};
+
+static int __init sha256_generic_mod_init(void)
 {
-       return crypto_register_alg(&alg);
+       int ret = 0;
+
+       ret = crypto_register_alg(&sha224);
+
+       if (ret < 0)
+               return ret;
+
+       ret = crypto_register_alg(&sha256);
+
+       if (ret < 0)
+               crypto_unregister_alg(&sha224);
+
+       return ret;
 }
 
-static void __exit fini(void)
+static void __exit sha256_generic_mod_fini(void)
 {
-       crypto_unregister_alg(&alg);
+       crypto_unregister_alg(&sha224);
+       crypto_unregister_alg(&sha256);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(sha256_generic_mod_init);
+module_exit(sha256_generic_mod_fini);
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm");
+MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm");
 
+MODULE_ALIAS("sha224");
 MODULE_ALIAS("sha256");