Commit 0fcec0b7 authored by Eric Biggers's avatar Eric Biggers
Browse files

crypto: crc64-rocksoft - remove from crypto API 



Remove crc64-rocksoft from the crypto API.  It has no known user now
that the lib is no longer built on top of it.  It was also added much
more recently than the longstanding crc32 and crc32c.  Unlike crc32 and
crc32c, crc64-rocksoft is also not mentioned in the dm-integrity
documentation and there are no references to it in anywhere in the
cryptsetup git repo, so it is unlikely to have any user there either.

Also, this CRC variant is named incorrectly; it has nothing to do with
Rocksoft and should be called crc64-nvme.  That is yet another reason to
remove it from the crypto API; we would not want anyone to start
depending on the current incorrect algorithm name of crc64-rocksoft.

Note that this change temporarily makes this CRC variant not be covered
by any tests, as previously it was relying on the crypto self-tests.
This will be fixed by adding this CRC variant to crc_kunit.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatar"Martin K. Petersen" <martin.petersen@oracle.com>
Acked-by: default avatarKeith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20250130035130.180676-3-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent feb541bf

crypto/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -1090,17 +1090,6 @@ config CRYPTO_CRCT10DIF 


	  CRC algorithm used by the SCSI Block Commands standard.



config CRYPTO_CRC64_ROCKSOFT

	tristate "CRC64 based on Rocksoft Model algorithm"

	depends on CRC64

	select CRYPTO_HASH

	help

	  CRC64 CRC algorithm based on the Rocksoft Model CRC Algorithm



	  Used by the NVMe implementation of T10 DIF (BLK_DEV_INTEGRITY)



	  See https://zlib.net/crc_v3.txt



endmenu



menu "Compression"

crypto/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ CFLAGS_crc32c_generic.o += -DARCH=$(ARCH) 
CFLAGS_crc32_generic.o += -DARCH=$(ARCH)

obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif_generic.o

CFLAGS_crct10dif_generic.o += -DARCH=$(ARCH)

obj-$(CONFIG_CRYPTO_CRC64_ROCKSOFT) += crc64_rocksoft_generic.o

obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o

obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o

obj-$(CONFIG_CRYPTO_LZ4) += lz4.o

crypto/crc64_rocksoft_generic.c

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include <linux/crc64.h>

#include <linux/module.h>

#include <crypto/internal/hash.h>

#include <linux/unaligned.h>



static int chksum_init(struct shash_desc *desc)

{

	u64 *crc = shash_desc_ctx(desc);



	*crc = 0;



	return 0;

}



static int chksum_update(struct shash_desc *desc, const u8 *data,

			 unsigned int length)

{

	u64 *crc = shash_desc_ctx(desc);



	*crc = crc64_rocksoft_generic(*crc, data, length);



	return 0;

}



static int chksum_final(struct shash_desc *desc, u8 *out)

{

	u64 *crc = shash_desc_ctx(desc);



	put_unaligned_le64(*crc, out);

	return 0;

}



static int __chksum_finup(u64 crc, const u8 *data, unsigned int len, u8 *out)

{

	crc = crc64_rocksoft_generic(crc, data, len);

	put_unaligned_le64(crc, out);

	return 0;

}



static int chksum_finup(struct shash_desc *desc, const u8 *data,

			unsigned int len, u8 *out)

{

	u64 *crc = shash_desc_ctx(desc);



	return __chksum_finup(*crc, data, len, out);

}



static int chksum_digest(struct shash_desc *desc, const u8 *data,

			 unsigned int length, u8 *out)

{

	return __chksum_finup(0, data, length, out);

}



static struct shash_alg alg = {

	.digestsize	= 	sizeof(u64),

	.init		=	chksum_init,

	.update		=	chksum_update,

	.final		=	chksum_final,

	.finup		=	chksum_finup,

	.digest		=	chksum_digest,

	.descsize	=	sizeof(u64),

	.base		=	{

		.cra_name		=	CRC64_ROCKSOFT_STRING,

		.cra_driver_name	=	"crc64-rocksoft-generic",

		.cra_priority		=	200,

		.cra_blocksize		=	1,

		.cra_module		=	THIS_MODULE,

	}

};



static int __init crc64_rocksoft_init(void)

{

	return crypto_register_shash(&alg);

}



static void __exit crc64_rocksoft_exit(void)

{

	crypto_unregister_shash(&alg);

}



module_init(crc64_rocksoft_init);

module_exit(crc64_rocksoft_exit);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Rocksoft model CRC64 calculation.");

MODULE_ALIAS_CRYPTO("crc64-rocksoft");

MODULE_ALIAS_CRYPTO("crc64-rocksoft-generic");

crypto/testmgr.c

+0 −7
Original line number Diff line number Diff line
@@ -4759,13 +4759,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.suite = {

			.hash = __VECS(crc32c_tv_template)

		}

	}, {

		.alg = "crc64-rocksoft",

		.test = alg_test_hash,

		.fips_allowed = 1,

		.suite = {

			.hash = __VECS(crc64_rocksoft_tv_template)

		}

	}, {

		.alg = "crct10dif",

		.test = alg_test_hash,

crypto/testmgr.h

+0 −15
Original line number Diff line number Diff line
@@ -6017,21 +6017,6 @@ static const struct hash_testvec rmd160_tv_template[] = { 
	}

};









static const u8 zeroes[4096] = { [0 ... 4095] = 0 };









static const u8 ones[4096] = { [0 ... 4095] = 0xff };

















static const struct hash_testvec crc64_rocksoft_tv_template[] = {









	{









		.plaintext	= zeroes,









		.psize		= 4096,









		.digest         = "\x4e\xb6\x22\xeb\x67\xd3\x82\x64",









	}, {









		.plaintext	= ones,









		.psize		= 4096,









		.digest         = "\xac\xa3\xec\x02\x73\xba\xdd\xc0",









	}









};

















static const struct hash_testvec crct10dif_tv_template[] = {









	{









		.plaintext	= "abc",