sata_mv: fix pci_enable_msi() error handling

[powerpc.git] / crypto / sha1.c

diff --git a/crypto/sha1.c b/crypto/sha1.c
index 292dcc1..1bba551 100644 (file)
--- a/crypto/sha1.c
+++ b/crypto/sha1.c
@@ -34,9 +34,9 @@ struct sha1_ctx {
         u8 buffer[64];
 };
 
-static void sha1_init(void *ctx)
+static void sha1_init(struct crypto_tfm *tfm)
 {
-       struct sha1_ctx *sctx = ctx;
+       struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);
        static const struct sha1_ctx initstate = {
          0,
          { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 },
@@ -46,56 +46,58 @@ static void sha1_init(void *ctx)
        *sctx = initstate;
 }
 
-static void sha1_update(void *ctx, const u8 *data, unsigned int len)
+static void sha1_update(struct crypto_tfm *tfm, const u8 *data,
+                       unsigned int len)
 {
-       struct sha1_ctx *sctx = ctx;
-       unsigned int i, j;
+       struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);
+       unsigned int partial, done;
        const u8 *src;
 
-       j = (sctx->count >> 3) & 0x3f;
-       sctx->count += len << 3;
-       i = 0;
+       partial = sctx->count & 0x3f;
+       sctx->count += len;
+       done = 0;
        src = data;
 
-       if ((j + len) > 63) {
+       if ((partial + len) > 63) {
                u32 temp[SHA_WORKSPACE_WORDS];
 
-               if (j) {
-                       memcpy(&sctx->buffer[j], data, (i = 64-j));
+               if (partial) {
+                       done = -partial;
+                       memcpy(sctx->buffer + partial, data, done + 64);
                        src = sctx->buffer;
                }
 
                do {
                        sha_transform(sctx->state, src, temp);
-                       i += 64;
-                       src = &data[i];
-               } while (i + 63 < len);
+                       done += 64;
+                       src = data + done;
+               } while (done + 63 < len);
 
                memset(temp, 0, sizeof(temp));
-               j = 0;
+               partial = 0;
        }
-       memcpy(&sctx->buffer[j], src, len - i);
+       memcpy(sctx->buffer + partial, src, len - done);
 }
 
 
 /* Add padding and return the message digest. */
-static void sha1_final(void* ctx, u8 *out)
+static void sha1_final(struct crypto_tfm *tfm, u8 *out)
 {
-       struct sha1_ctx *sctx = ctx;
+       struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);
        __be32 *dst = (__be32 *)out;
        u32 i, index, padlen;
        __be64 bits;
        static const u8 padding[64] = { 0x80, };
 
-       bits = cpu_to_be64(sctx->count);
+       bits = cpu_to_be64(sctx->count << 3);
 
        /* Pad out to 56 mod 64 */
-       index = (sctx->count >> 3) & 0x3f;
+       index = sctx->count & 0x3f;
        padlen = (index < 56) ? (56 - index) : ((64+56) - index);
-       sha1_update(sctx, padding, padlen);
+       sha1_update(tfm, padding, padlen);
 
        /* Append length */
-       sha1_update(sctx, (const u8 *)&bits, sizeof(bits));
+       sha1_update(tfm, (const u8 *)&bits, sizeof(bits));
 
        /* Store state in digest */
        for (i = 0; i < 5; i++)
@@ -107,10 +109,12 @@ static void sha1_final(void* ctx, u8 *out)
 
 static struct crypto_alg alg = {
        .cra_name       =       "sha1",
+       .cra_driver_name=       "sha1-generic",
        .cra_flags      =       CRYPTO_ALG_TYPE_DIGEST,
        .cra_blocksize  =       SHA1_HMAC_BLOCK_SIZE,
        .cra_ctxsize    =       sizeof(struct sha1_ctx),
        .cra_module     =       THIS_MODULE,
+       .cra_alignmask  =       3,
        .cra_list       =       LIST_HEAD_INIT(alg.cra_list),
        .cra_u          =       { .digest = {
        .dia_digestsize =       SHA1_DIGEST_SIZE,
@@ -134,3 +138,5 @@ module_exit(fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
+
+MODULE_ALIAS("sha1-generic");