linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / crypto / sha512.c

diff --git a/crypto/sha512.c b/crypto/sha512.c
index 2dfe7f1..c957481 100644 (file)
--- a/crypto/sha512.c
+++ b/crypto/sha512.c
@@ -24,7 +24,7 @@
 
 #define SHA384_DIGEST_SIZE 48
 #define SHA512_DIGEST_SIZE 64
-#define SHA384_HMAC_BLOCK_SIZE  96
+#define SHA384_HMAC_BLOCK_SIZE 128
 #define SHA512_HMAC_BLOCK_SIZE 128
 
 struct sha512_ctx {
@@ -161,9 +161,9 @@ sha512_transform(u64 *state, u64 *W, const u8 *input)
 }
 
 static void
-sha512_init(struct crypto_tfm *tfm)
+sha512_init(void *ctx)
 {
-       struct sha512_ctx *sctx = crypto_tfm_ctx(tfm);
+        struct sha512_ctx *sctx = ctx;
        sctx->state[0] = H0;
        sctx->state[1] = H1;
        sctx->state[2] = H2;
@@ -173,12 +173,13 @@ sha512_init(struct crypto_tfm *tfm)
        sctx->state[6] = H6;
        sctx->state[7] = H7;
        sctx->count[0] = sctx->count[1] = sctx->count[2] = sctx->count[3] = 0;
+       memset(sctx->buf, 0, sizeof(sctx->buf));
 }
 
 static void
-sha384_init(struct crypto_tfm *tfm)
+sha384_init(void *ctx)
 {
-       struct sha512_ctx *sctx = crypto_tfm_ctx(tfm);
+        struct sha512_ctx *sctx = ctx;
         sctx->state[0] = HP0;
         sctx->state[1] = HP1;
         sctx->state[2] = HP2;
@@ -188,12 +189,13 @@ sha384_init(struct crypto_tfm *tfm)
         sctx->state[6] = HP6;
         sctx->state[7] = HP7;
         sctx->count[0] = sctx->count[1] = sctx->count[2] = sctx->count[3] = 0;
+        memset(sctx->buf, 0, sizeof(sctx->buf));
 }
 
 static void
-sha512_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len)
+sha512_update(void *ctx, const u8 *data, unsigned int len)
 {
-       struct sha512_ctx *sctx = crypto_tfm_ctx(tfm);
+        struct sha512_ctx *sctx = ctx;
 
        unsigned int i, index, part_len;
 
@@ -231,9 +233,9 @@ sha512_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len)
 }
 
 static void
-sha512_final(struct crypto_tfm *tfm, u8 *hash)
+sha512_final(void *ctx, u8 *hash)
 {
-       struct sha512_ctx *sctx = crypto_tfm_ctx(tfm);
+        struct sha512_ctx *sctx = ctx;
         static u8 padding[128] = { 0x80, };
        __be64 *dst = (__be64 *)hash;
        __be32 bits[4];
@@ -249,10 +251,10 @@ sha512_final(struct crypto_tfm *tfm, u8 *hash)
        /* Pad out to 112 mod 128. */
        index = (sctx->count[0] >> 3) & 0x7f;
        pad_len = (index < 112) ? (112 - index) : ((128+112) - index);
-       sha512_update(tfm, padding, pad_len);
+       sha512_update(sctx, padding, pad_len);
 
        /* Append length (before padding) */
-       sha512_update(tfm, (const u8 *)bits, sizeof(bits));
+       sha512_update(sctx, (const u8 *)bits, sizeof(bits));
 
        /* Store state in digest */
        for (i = 0; i < 8; i++)
@@ -262,11 +264,12 @@ sha512_final(struct crypto_tfm *tfm, u8 *hash)
        memset(sctx, 0, sizeof(struct sha512_ctx));
 }
 
-static void sha384_final(struct crypto_tfm *tfm, u8 *hash)
+static void sha384_final(void *ctx, u8 *hash)
 {
+        struct sha512_ctx *sctx = ctx;
         u8 D[64];
 
-       sha512_final(tfm, D);
+        sha512_final(sctx, D);
 
         memcpy(hash, D, 48);
         memset(D, 0, 64);
@@ -278,7 +281,6 @@ static struct crypto_alg sha512 = {
         .cra_blocksize  = SHA512_HMAC_BLOCK_SIZE,
         .cra_ctxsize    = sizeof(struct sha512_ctx),
         .cra_module     = THIS_MODULE,
-       .cra_alignmask  = 3,
         .cra_list       = LIST_HEAD_INIT(sha512.cra_list),
         .cra_u          = { .digest = {
                                 .dia_digestsize = SHA512_DIGEST_SIZE,
@@ -293,7 +295,6 @@ static struct crypto_alg sha384 = {
         .cra_flags      = CRYPTO_ALG_TYPE_DIGEST,
         .cra_blocksize  = SHA384_HMAC_BLOCK_SIZE,
         .cra_ctxsize    = sizeof(struct sha512_ctx),
-       .cra_alignmask  = 3,
         .cra_module     = THIS_MODULE,
         .cra_list       = LIST_HEAD_INIT(sha384.cra_list),
         .cra_u          = { .digest = {