Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[sfrench/cifs-2.6.git] / arch / s390 / crypto / sha256_s390.c

diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index ccf8633c4f6580f509cff71c1bce08179037a65c..f9fefc5696329fd4f64e272ff6dac0c4e5ec0f91 100644 (file)
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -16,22 +16,17 @@
  * any later version.
  *
  */
+#include <crypto/internal/hash.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/crypto.h>
 #include <crypto/sha.h>
 
 #include "crypt_s390.h"
+#include "sha.h"
 
-struct s390_sha256_ctx {
-       u64 count;              /* message length */
-       u32 state[8];
-       u8 buf[2 * SHA256_BLOCK_SIZE];
-};
-
-static void sha256_init(struct crypto_tfm *tfm)
+static int sha256_init(struct shash_desc *desc)
 {
-       struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
+       struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
 
        sctx->state[0] = SHA256_H0;
        sctx->state[1] = SHA256_H1;
@@ -42,114 +37,43 @@ static void sha256_init(struct crypto_tfm *tfm)
        sctx->state[6] = SHA256_H6;
        sctx->state[7] = SHA256_H7;
        sctx->count = 0;
-}
-
-static void sha256_update(struct crypto_tfm *tfm, const u8 *data,
-                         unsigned int len)
-{
-       struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
-       unsigned int index;
-       int ret;
-
-       /* how much is already in the buffer? */
-       index = sctx->count & 0x3f;
-
-       sctx->count += len;
-
-       if ((index + len) < SHA256_BLOCK_SIZE)
-               goto store;
-
-       /* process one stored block */
-       if (index) {
-               memcpy(sctx->buf + index, data, SHA256_BLOCK_SIZE - index);
-               ret = crypt_s390_kimd(KIMD_SHA_256, sctx->state, sctx->buf,
-                                     SHA256_BLOCK_SIZE);
-               BUG_ON(ret != SHA256_BLOCK_SIZE);
-               data += SHA256_BLOCK_SIZE - index;
-               len -= SHA256_BLOCK_SIZE - index;
-       }
-
-       /* process as many blocks as possible */
-       if (len >= SHA256_BLOCK_SIZE) {
-               ret = crypt_s390_kimd(KIMD_SHA_256, sctx->state, data,
-                                     len & ~(SHA256_BLOCK_SIZE - 1));
-               BUG_ON(ret != (len & ~(SHA256_BLOCK_SIZE - 1)));
-               data += ret;
-               len -= ret;
-       }
+       sctx->func = KIMD_SHA_256;
 
-store:
-       /* anything left? */
-       if (len)
-               memcpy(sctx->buf + index , data, len);
+       return 0;
 }
 
-/* Add padding and return the message digest */
-static void sha256_final(struct crypto_tfm *tfm, u8 *out)
-{
-       struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
-       u64 bits;
-       unsigned int index, end;
-       int ret;
-
-       /* must perform manual padding */
-       index = sctx->count & 0x3f;
-       end = (index < 56) ? SHA256_BLOCK_SIZE : (2 * SHA256_BLOCK_SIZE);
-
-       /* start pad with 1 */
-       sctx->buf[index] = 0x80;
-
-       /* pad with zeros */
-       index++;
-       memset(sctx->buf + index, 0x00, end - index - 8);
-
-       /* append message length */
-       bits = sctx->count * 8;
-       memcpy(sctx->buf + end - 8, &bits, sizeof(bits));
-
-       ret = crypt_s390_kimd(KIMD_SHA_256, sctx->state, sctx->buf, end);
-       BUG_ON(ret != end);
-
-       /* copy digest to out */
-       memcpy(out, sctx->state, SHA256_DIGEST_SIZE);
-
-       /* wipe context */
-       memset(sctx, 0, sizeof *sctx);
-}
-
-static struct crypto_alg alg = {
-       .cra_name       =       "sha256",
-       .cra_driver_name =      "sha256-s390",
-       .cra_priority   =       CRYPT_S390_PRIORITY,
-       .cra_flags      =       CRYPTO_ALG_TYPE_DIGEST,
-       .cra_blocksize  =       SHA256_BLOCK_SIZE,
-       .cra_ctxsize    =       sizeof(struct s390_sha256_ctx),
-       .cra_module     =       THIS_MODULE,
-       .cra_list       =       LIST_HEAD_INIT(alg.cra_list),
-       .cra_u          =       { .digest = {
-       .dia_digestsize =       SHA256_DIGEST_SIZE,
-       .dia_init       =       sha256_init,
-       .dia_update     =       sha256_update,
-       .dia_final      =       sha256_final } }
+static struct shash_alg alg = {
+       .digestsize     =       SHA256_DIGEST_SIZE,
+       .init           =       sha256_init,
+       .update         =       s390_sha_update,
+       .final          =       s390_sha_final,
+       .descsize       =       sizeof(struct s390_sha_ctx),
+       .base           =       {
+               .cra_name       =       "sha256",
+               .cra_driver_name=       "sha256-s390",
+               .cra_priority   =       CRYPT_S390_PRIORITY,
+               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
+               .cra_blocksize  =       SHA256_BLOCK_SIZE,
+               .cra_module     =       THIS_MODULE,
+       }
 };
 
-static int init(void)
+static int sha256_s390_init(void)
 {
        if (!crypt_s390_func_available(KIMD_SHA_256))
                return -EOPNOTSUPP;
 
-       return crypto_register_alg(&alg);
+       return crypto_register_shash(&alg);
 }
 
-static void __exit fini(void)
+static void __exit sha256_s390_fini(void)
 {
-       crypto_unregister_alg(&alg);
+       crypto_unregister_shash(&alg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(sha256_s390_init);
+module_exit(sha256_s390_fini);
 
 MODULE_ALIAS("sha256");
-
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm");