Revert "ARM: tegra: tegratab: dummy change"
[linux-2.6.git] / crypto / sha1_generic.c
index 48a3c3e..4279480 100644 (file)
  * any later version.
  *
  */
+#include <crypto/internal/hash.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <linux/crypto.h>
 #include <linux/cryptohash.h>
 #include <linux/types.h>
 #include <crypto/sha.h>
-#include <asm/scatterlist.h>
 #include <asm/byteorder.h>
 
-struct sha1_ctx {
-        u64 count;
-        u32 state[5];
-        u8 buffer[64];
-};
-
-static void sha1_init(struct crypto_tfm *tfm)
+static int sha1_init(struct shash_desc *desc)
 {
-       struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);
-       static const struct sha1_ctx initstate = {
-         0,
-         { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 },
-         { 0, }
+       struct sha1_state *sctx = shash_desc_ctx(desc);
+
+       *sctx = (struct sha1_state){
+               .state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 },
        };
 
-       *sctx = initstate;
+       return 0;
 }
 
-static void sha1_update(struct crypto_tfm *tfm, const u8 *data,
+int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
                        unsigned int len)
 {
-       struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);
+       struct sha1_state *sctx = shash_desc_ctx(desc);
        unsigned int partial, done;
        const u8 *src;
 
-       partial = sctx->count & 0x3f;
+       partial = sctx->count % SHA1_BLOCK_SIZE;
        sctx->count += len;
        done = 0;
        src = data;
 
-       if ((partial + len) > 63) {
+       if ((partial + len) >= SHA1_BLOCK_SIZE) {
                u32 temp[SHA_WORKSPACE_WORDS];
 
                if (partial) {
                        done = -partial;
-                       memcpy(sctx->buffer + partial, data, done + 64);
+                       memcpy(sctx->buffer + partial, data,
+                              done + SHA1_BLOCK_SIZE);
                        src = sctx->buffer;
                }
 
                do {
                        sha_transform(sctx->state, src, temp);
-                       done += 64;
+                       done += SHA1_BLOCK_SIZE;
                        src = data + done;
-               } while (done + 63 < len);
+               } while (done + SHA1_BLOCK_SIZE <= len);
 
                memset(temp, 0, sizeof(temp));
                partial = 0;
        }
        memcpy(sctx->buffer + partial, src, len - done);
+
+       return 0;
 }
+EXPORT_SYMBOL(crypto_sha1_update);
 
 
 /* Add padding and return the message digest. */
-static void sha1_final(struct crypto_tfm *tfm, u8 *out)
+static int sha1_final(struct shash_desc *desc, u8 *out)
 {
-       struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);
+       struct sha1_state *sctx = shash_desc_ctx(desc);
        __be32 *dst = (__be32 *)out;
        u32 i, index, padlen;
        __be64 bits;
@@ -92,10 +88,10 @@ static void sha1_final(struct crypto_tfm *tfm, u8 *out)
        /* Pad out to 56 mod 64 */
        index = sctx->count & 0x3f;
        padlen = (index < 56) ? (56 - index) : ((64+56) - index);
-       sha1_update(tfm, padding, padlen);
+       crypto_sha1_update(desc, padding, padlen);
 
        /* Append length */
-       sha1_update(tfm, (const u8 *)&bits, sizeof(bits));
+       crypto_sha1_update(desc, (const u8 *)&bits, sizeof(bits));
 
        /* Store state in digest */
        for (i = 0; i < 5; i++)
@@ -103,36 +99,56 @@ static void sha1_final(struct crypto_tfm *tfm, u8 *out)
 
        /* Wipe context */
        memset(sctx, 0, sizeof *sctx);
+
+       return 0;
+}
+
+static int sha1_export(struct shash_desc *desc, void *out)
+{
+       struct sha1_state *sctx = shash_desc_ctx(desc);
+
+       memcpy(out, sctx, sizeof(*sctx));
+       return 0;
 }
 
-static struct crypto_alg alg = {
-       .cra_name       =       "sha1",
-       .cra_driver_name=       "sha1-generic",
-       .cra_flags      =       CRYPTO_ALG_TYPE_DIGEST,
-       .cra_blocksize  =       SHA1_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,
-       .dia_init       =       sha1_init,
-       .dia_update     =       sha1_update,
-       .dia_final      =       sha1_final } }
+static int sha1_import(struct shash_desc *desc, const void *in)
+{
+       struct sha1_state *sctx = shash_desc_ctx(desc);
+
+       memcpy(sctx, in, sizeof(*sctx));
+       return 0;
+}
+
+static struct shash_alg alg = {
+       .digestsize     =       SHA1_DIGEST_SIZE,
+       .init           =       sha1_init,
+       .update         =       crypto_sha1_update,
+       .final          =       sha1_final,
+       .export         =       sha1_export,
+       .import         =       sha1_import,
+       .descsize       =       sizeof(struct sha1_state),
+       .statesize      =       sizeof(struct sha1_state),
+       .base           =       {
+               .cra_name       =       "sha1",
+               .cra_driver_name=       "sha1-generic",
+               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
+               .cra_blocksize  =       SHA1_BLOCK_SIZE,
+               .cra_module     =       THIS_MODULE,
+       }
 };
 
-static int __init init(void)
+static int __init sha1_generic_mod_init(void)
 {
-       return crypto_register_alg(&alg);
+       return crypto_register_shash(&alg);
 }
 
-static void __exit fini(void)
+static void __exit sha1_generic_mod_fini(void)
 {
-       crypto_unregister_alg(&alg);
+       crypto_unregister_shash(&alg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(sha1_generic_mod_init);
+module_exit(sha1_generic_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");