Commit 44a7d444 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto updates from Herbert Xu:
 "Algorithms:

   - Add AES-NI/AVX/x86_64 implementation of SM4.

  Drivers:

   - Add Arm SMCCC TRNG based driver"

[ And obviously a lot of random fixes and updates  - Linus]

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (84 commits)
  crypto: sha512 - remove imaginary and mystifying clearing of variables
  crypto: aesni - xts_crypt() return if walk.nbytes is 0
  padata: Remove repeated verbose license text
  crypto: ccp - Add support for new CCP/PSP device ID
  crypto: x86/sm4 - add AES-NI/AVX2/x86_64 implementation
  crypto: x86/sm4 - export reusable AESNI/AVX functions
  crypto: rmd320 - remove rmd320 in Makefile
  crypto: skcipher - in_irq() cleanup
  crypto: hisilicon - check _PS0 and _PR0 method
  crypto: hisilicon - change parameter passing of debugfs function
  crypto: hisilicon - support runtime PM for accelerator device
  crypto: hisilicon - add runtime PM ops
  crypto: hisilicon - using 'debugfs_create_file' instead of 'debugfs_create_regset32'
  crypto: tcrypt - add GCM/CCM mode test for SM4 algorithm
  crypto: testmgr - Add GCM/CCM mode test of SM4 algorithm
  crypto: tcrypt - Fix missing return value check
  crypto: hisilicon/sec - modify the hardware endian configuration
  crypto: hisilicon/sec - fix the abnormal exiting process
  crypto: qat - store vf.compatible flag
  crypto: qat - do not export adf_iov_putmsg()
  ...
parents 4ca42564 6ae51ffe

arch/arm/crypto/curve25519-glue.c

+4 −4
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static struct kpp_alg curve25519_alg = { 
	.max_size		= curve25519_max_size,

};



static int __init mod_init(void)

static int __init arm_curve25519_init(void)

{

	if (elf_hwcap & HWCAP_NEON) {

		static_branch_enable(&have_neon);
@@ -122,14 +122,14 @@ static int __init mod_init(void) 
	return 0;

}



static void __exit mod_exit(void)

static void __exit arm_curve25519_exit(void)

{

	if (IS_REACHABLE(CONFIG_CRYPTO_KPP) && elf_hwcap & HWCAP_NEON)

		crypto_unregister_kpp(&curve25519_alg);

}



module_init(mod_init);

module_exit(mod_exit);

module_init(arm_curve25519_init);

module_exit(arm_curve25519_exit);



MODULE_ALIAS_CRYPTO("curve25519");

MODULE_ALIAS_CRYPTO("curve25519-neon");

arch/arm64/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ config CRYPTO_SM4_ARM64_CE 
	tristate "SM4 symmetric cipher (ARMv8.2 Crypto Extensions)"

	depends on KERNEL_MODE_NEON

	select CRYPTO_ALGAPI

	select CRYPTO_SM4

	select CRYPTO_LIB_SM4



config CRYPTO_GHASH_ARM64_CE

	tristate "GHASH/AES-GCM using ARMv8 Crypto Extensions"

arch/arm64/crypto/sm4-ce-glue.c

+14 −6
Original line number Diff line number Diff line
@@ -17,12 +17,20 @@ MODULE_LICENSE("GPL v2"); 


asmlinkage void sm4_ce_do_crypt(const u32 *rk, void *out, const void *in);



static int sm4_ce_setkey(struct crypto_tfm *tfm, const u8 *key,

		       unsigned int key_len)

{

	struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);



	return sm4_expandkey(ctx, key, key_len);

}



static void sm4_ce_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

	const struct crypto_sm4_ctx *ctx = crypto_tfm_ctx(tfm);

	const struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);



	if (!crypto_simd_usable()) {

		crypto_sm4_encrypt(tfm, out, in);

		sm4_crypt_block(ctx->rkey_enc, out, in);

	} else {

		kernel_neon_begin();

		sm4_ce_do_crypt(ctx->rkey_enc, out, in);
@@ -32,10 +40,10 @@ static void sm4_ce_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) 


static void sm4_ce_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

	const struct crypto_sm4_ctx *ctx = crypto_tfm_ctx(tfm);

	const struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);



	if (!crypto_simd_usable()) {

		crypto_sm4_decrypt(tfm, out, in);

		sm4_crypt_block(ctx->rkey_dec, out, in);

	} else {

		kernel_neon_begin();

		sm4_ce_do_crypt(ctx->rkey_dec, out, in);
@@ -49,12 +57,12 @@ static struct crypto_alg sm4_ce_alg = { 
	.cra_priority			= 200,

	.cra_flags			= CRYPTO_ALG_TYPE_CIPHER,

	.cra_blocksize			= SM4_BLOCK_SIZE,

	.cra_ctxsize			= sizeof(struct crypto_sm4_ctx),

	.cra_ctxsize			= sizeof(struct sm4_ctx),

	.cra_module			= THIS_MODULE,

	.cra_u.cipher = {

		.cia_min_keysize	= SM4_KEY_SIZE,

		.cia_max_keysize	= SM4_KEY_SIZE,

		.cia_setkey		= crypto_sm4_set_key,

		.cia_setkey		= sm4_ce_setkey,

		.cia_encrypt		= sm4_ce_encrypt,

		.cia_decrypt		= sm4_ce_decrypt

	}

arch/x86/crypto/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -88,6 +88,12 @@ nhpoly1305-avx2-y := nh-avx2-x86_64.o nhpoly1305-avx2-glue.o 


obj-$(CONFIG_CRYPTO_CURVE25519_X86) += curve25519-x86_64.o



obj-$(CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64) += sm4-aesni-avx-x86_64.o

sm4-aesni-avx-x86_64-y := sm4-aesni-avx-asm_64.o sm4_aesni_avx_glue.o



obj-$(CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64) += sm4-aesni-avx2-x86_64.o

sm4-aesni-avx2-x86_64-y := sm4-aesni-avx2-asm_64.o sm4_aesni_avx2_glue.o



quiet_cmd_perlasm = PERLASM $@

      cmd_perlasm = $(PERL) $< > $@

$(obj)/%.S: $(src)/%.pl FORCE

arch/x86/crypto/aesni-intel_glue.c

+5 −0
Original line number Diff line number Diff line
@@ -849,6 +849,8 @@ static int xts_crypt(struct skcipher_request *req, bool encrypt) 
		return -EINVAL;



	err = skcipher_walk_virt(&walk, req, false);

	if (!walk.nbytes)

		return err;



	if (unlikely(tail > 0 && walk.nbytes < walk.total)) {

		int blocks = DIV_ROUND_UP(req->cryptlen, AES_BLOCK_SIZE) - 2;
@@ -862,7 +864,10 @@ static int xts_crypt(struct skcipher_request *req, bool encrypt) 
		skcipher_request_set_crypt(&subreq, req->src, req->dst,

					   blocks * AES_BLOCK_SIZE, req->iv);

		req = &subreq;



		err = skcipher_walk_virt(&walk, req, false);

		if (err)

			return err;

	} else {

		tail = 0;

	}