X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-crypto-adler.c;h=90f502f35e580cf54912a828a41a4d10af0b70a9;hb=08ec9c8b6f5a1334fa7de822a50fd480b844884c;hp=5b7438990475796d158d4c8159fb851d724a6c4b;hpb=06e7f5bde3a11d5786ef067157ba3e72a444d8ee;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/linux/linux-crypto-adler.c b/libcfs/libcfs/linux/linux-crypto-adler.c
index 5b74389..90f502f 100644
--- a/libcfs/libcfs/linux/linux-crypto-adler.c
+++ b/libcfs/libcfs/linux/linux-crypto-adler.c
@@ -31,22 +31,12 @@
 
 #include <linux/module.h>
 #include <linux/zutil.h>
-#ifdef HAVE_STRUCT_SHASH_ALG
+#include <libcfs/linux/linux-crypto.h>
 #include <crypto/internal/hash.h>
-#else
-#include <linux/crypto.h>
-#endif
-
 
 #define CHKSUM_BLOCK_SIZE	1
 #define CHKSUM_DIGEST_SIZE	4
 
-
-static u32 __adler32(u32 cksum, unsigned char const *p, size_t len)
-{
-	return zlib_adler32(cksum, p, len);
-}
-
 static int adler32_cra_init(struct crypto_tfm *tfm)
 {
 	u32 *key = crypto_tfm_ctx(tfm);
@@ -56,7 +46,6 @@ static int adler32_cra_init(struct crypto_tfm *tfm)
 	return 0;
 }
 
-#ifdef HAVE_STRUCT_SHASH_ALG
 static int adler32_setkey(struct crypto_shash *hash, const u8 *key,
 			  unsigned int keylen)
 {
@@ -85,13 +74,13 @@ static int adler32_update(struct shash_desc *desc, const u8 *data,
 {
 	u32 *cksump = shash_desc_ctx(desc);
 
-	*cksump = __adler32(*cksump, data, len);
+	*cksump = zlib_adler32(*cksump, data, len);
 	return 0;
 }
 static int __adler32_finup(u32 *cksump, const u8 *data, unsigned int len,
 			   u8 *out)
 {
-	*(u32 *)out = __adler32(*cksump, data, len);
+	*(u32 *)out = zlib_adler32(*cksump, data, len);
 	return 0;
 }
 
@@ -134,86 +123,13 @@ static struct shash_alg alg = {
 		.cra_init		= adler32_cra_init,
 	}
 };
-#else   /* HAVE_STRUCT_SHASH_ALG */
-#ifdef HAVE_DIGEST_SETKEY_FLAGS
-static int adler32_digest_setkey(struct crypto_tfm *tfm, const u8 *key,
-				 unsigned int keylen, u32 *flags)
-#else
-static int adler32_digest_setkey(struct crypto_tfm *tfm, const u8 *key,
-				 unsigned int keylen)
-#endif
-{
-	u32 *mctx = crypto_tfm_ctx(tfm);
-
-	if (keylen != sizeof(u32)) {
-		tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-		return -EINVAL;
-	}
-	*mctx = le32_to_cpup((__le32 *)key);
-	return 0;
-}
-
-static void adler32_digest_init(struct crypto_tfm *tfm)
-{
-	u32 *mctx = crypto_tfm_ctx(tfm);
-
-	*mctx = 0;
-
-}
-static void adler32_digest_update(struct crypto_tfm *tfm, const u8 *data,
-				  unsigned int len)
-{
-	u32 *crcp = crypto_tfm_ctx(tfm);
-
-	*crcp = __adler32(*crcp, data, len);
-}
-
-static void adler32_digest_final(struct crypto_tfm *tfm, u8 *out)
-{
-	u32 *chksum = crypto_tfm_ctx(tfm);
-
-	*(__le32 *)out = cpu_to_le32p(chksum);
-}
-
-static struct crypto_alg alg = {
-	.cra_name		= "adler32",
-	.cra_flags		= CRYPTO_ALG_TYPE_DIGEST,
-	.cra_driver_name	= "adler32-zlib",
-	.cra_priority		= 100,
-	.cra_blocksize		= CHKSUM_BLOCK_SIZE,
-	.cra_ctxsize		= sizeof(u32),
-	.cra_module		= THIS_MODULE,
-	.cra_init		= adler32_cra_init,
-	.cra_list		= LIST_HEAD_INIT(alg.cra_list),
-	.cra_u			= {
-		.digest		= {
-				.dia_digestsize	= CHKSUM_DIGEST_SIZE,
-				.dia_setkey	= adler32_digest_setkey,
-				.dia_init	= adler32_digest_init,
-				.dia_update	= adler32_digest_update,
-				.dia_final	= adler32_digest_final
-		}
-	}
-};
-#endif  /* HAVE_STRUCT_SHASH_ALG */
-
 
 int cfs_crypto_adler32_register(void)
 {
-#ifdef HAVE_STRUCT_SHASH_ALG
 	return crypto_register_shash(&alg);
-#else
-	return crypto_register_alg(&alg);
-#endif
 }
-EXPORT_SYMBOL(cfs_crypto_adler32_register);
 
 void cfs_crypto_adler32_unregister(void)
 {
-#ifdef HAVE_STRUCT_SHASH_ALG
 	crypto_unregister_shash(&alg);
-#else
-	crypto_unregister_alg(&alg);
-#endif
 }
-EXPORT_SYMBOL(cfs_crypto_adler32_unregister);