kill generic_file_direct_IO()

[safe/jmp/linux-2.6] / arch / s390 / crypto / sha1_s390.c

diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index 49ca869..b3cb5a8 100644 (file)
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -8,10 +8,11 @@
  * implementation written by Steve Reid.
  *
  * s390 Version:
- *   Copyright (C) 2003 IBM Deutschland GmbH, IBM Corporation
- *   Author(s): Thomas Spatzier (tspat@de.ibm.com)
+ *   Copyright IBM Corp. 2003,2007
+ *   Author(s): Thomas Spatzier
+ *             Jan Glauber (jan.glauber@de.ibm.com)
  *
- * Derived from "crypto/sha1.c"
+ * Derived from "crypto/sha1_generic.c"
  *   Copyright (c) Alan Smithee.
  *   Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
  *   Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
@@ -24,146 +25,56 @@
  */
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/mm.h>
 #include <linux/crypto.h>
-#include <asm/scatterlist.h>
-#include <asm/byteorder.h>
-#include "crypt_s390.h"
-
-#define SHA1_DIGEST_SIZE       20
-#define SHA1_BLOCK_SIZE                64
+#include <crypto/sha.h>
 
-struct crypt_s390_sha1_ctx {
-       u64 count;
-       u32 state[5];
-       u32 buf_len;
-       u8 buffer[2 * SHA1_BLOCK_SIZE];
-};
+#include "crypt_s390.h"
+#include "sha.h"
 
 static void sha1_init(struct crypto_tfm *tfm)
 {
-       struct crypt_s390_sha1_ctx *ctx = crypto_tfm_ctx(tfm);
-       static const u32 initstate[5] = {
-               0x67452301,
-               0xEFCDAB89,
-               0x98BADCFE,
-               0x10325476,
-               0xC3D2E1F0
-       };
-
-       ctx->count = 0;
-       memcpy(ctx->state, &initstate, sizeof(initstate));
-       ctx->buf_len = 0;
-}
-
-static void sha1_update(struct crypto_tfm *tfm, const u8 *data,
-                       unsigned int len)
-{
-       struct crypt_s390_sha1_ctx *sctx;
-       long imd_len;
-
-       sctx = crypto_tfm_ctx(tfm);
-       sctx->count += len * 8; //message bit length
-
-       //anything in buffer yet? -> must be completed
-       if (sctx->buf_len && (sctx->buf_len + len) >= SHA1_BLOCK_SIZE) {
-               //complete full block and hash
-               memcpy(sctx->buffer + sctx->buf_len, data,
-                               SHA1_BLOCK_SIZE - sctx->buf_len);
-               crypt_s390_kimd(KIMD_SHA_1, sctx->state, sctx->buffer,
-                               SHA1_BLOCK_SIZE);
-               data += SHA1_BLOCK_SIZE - sctx->buf_len;
-               len -= SHA1_BLOCK_SIZE - sctx->buf_len;
-               sctx->buf_len = 0;
-       }
-
-       //rest of data contains full blocks?
-       imd_len = len & ~0x3ful;
-       if (imd_len){
-               crypt_s390_kimd(KIMD_SHA_1, sctx->state, data, imd_len);
-               data += imd_len;
-               len -= imd_len;
-       }
-       //anything left? store in buffer
-       if (len){
-               memcpy(sctx->buffer + sctx->buf_len , data, len);
-               sctx->buf_len += len;
-       }
-}
-
-
-static void
-pad_message(struct crypt_s390_sha1_ctx* sctx)
-{
-       int index;
-
-       index = sctx->buf_len;
-       sctx->buf_len = (sctx->buf_len < 56)?
-               SHA1_BLOCK_SIZE:2 * SHA1_BLOCK_SIZE;
-       //start pad with 1
-       sctx->buffer[index] = 0x80;
-       //pad with zeros
-       index++;
-       memset(sctx->buffer + index, 0x00, sctx->buf_len - index);
-       //append length
-       memcpy(sctx->buffer + sctx->buf_len - 8, &sctx->count,
-                       sizeof sctx->count);
-}
-
-/* Add padding and return the message digest. */
-static void sha1_final(struct crypto_tfm *tfm, u8 *out)
-{
-       struct crypt_s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
-
-       //must perform manual padding
-       pad_message(sctx);
-       crypt_s390_kimd(KIMD_SHA_1, sctx->state, sctx->buffer, sctx->buf_len);
-       //copy digest to out
-       memcpy(out, sctx->state, SHA1_DIGEST_SIZE);
-       /* Wipe context */
-       memset(sctx, 0, sizeof *sctx);
+       struct s390_sha_ctx *sctx = crypto_tfm_ctx(tfm);
+
+       sctx->state[0] = SHA1_H0;
+       sctx->state[1] = SHA1_H1;
+       sctx->state[2] = SHA1_H2;
+       sctx->state[3] = SHA1_H3;
+       sctx->state[4] = SHA1_H4;
+       sctx->count = 0;
+       sctx->func = KIMD_SHA_1;
 }
 
 static struct crypto_alg alg = {
        .cra_name       =       "sha1",
-       .cra_driver_name =      "sha1-s390",
+       .cra_driver_name=       "sha1-s390",
        .cra_priority   =       CRYPT_S390_PRIORITY,
        .cra_flags      =       CRYPTO_ALG_TYPE_DIGEST,
        .cra_blocksize  =       SHA1_BLOCK_SIZE,
-       .cra_ctxsize    =       sizeof(struct crypt_s390_sha1_ctx),
+       .cra_ctxsize    =       sizeof(struct s390_sha_ctx),
        .cra_module     =       THIS_MODULE,
-       .cra_list       =       LIST_HEAD_INIT(alg.cra_list),
+       .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 } }
+       .dia_init       =       sha1_init,
+       .dia_update     =       s390_sha_update,
+       .dia_final      =       s390_sha_final } }
 };
 
-static int
-init(void)
+static int __init sha1_s390_init(void)
 {
-       int ret = -ENOSYS;
-
-       if (crypt_s390_func_available(KIMD_SHA_1)){
-               ret = crypto_register_alg(&alg);
-               if (ret == 0){
-                       printk(KERN_INFO "crypt_s390: sha1_s390 loaded.\n");
-               }
-       }
-       return ret;
+       if (!crypt_s390_func_available(KIMD_SHA_1))
+               return -EOPNOTSUPP;
+       return crypto_register_alg(&alg);
 }
 
-static void __exit
-fini(void)
+static void __exit sha1_s390_fini(void)
 {
        crypto_unregister_alg(&alg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(sha1_s390_init);
+module_exit(sha1_s390_fini);
 
 MODULE_ALIAS("sha1");
-
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");