Commit 5c947d0d 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:

   - Drop alignment requirement for data in aesni

   - Use synchronous seeding from the /dev/random in DRBG

   - Reseed nopr DRBGs every 5 minutes from /dev/random

   - Add KDF algorithms currently used by security/DH

   - Fix lack of entropy on some AMD CPUs with jitter RNG

  Drivers:

   - Add support for the D1 variant in sun8i-ce

   - Add SEV_INIT_EX support in ccp

   - PFVF support for GEN4 host driver in qat

   - Compression support for GEN4 devices in qat

   - Add cn10k random number generator support"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (145 commits)
  crypto: af_alg - rewrite NULL pointer check
  lib/mpi: Add the return value check of kcalloc()
  crypto: qat - fix definition of ring reset results
  crypto: hisilicon - cleanup warning in qm_get_qos_value()
  crypto: kdf - select SHA-256 required for self-test
  crypto: x86/aesni - don't require alignment of data
  crypto: ccp - remove unneeded semicolon
  crypto: stm32/crc32 - Fix kernel BUG triggered in probe()
  crypto: s390/sha512 - Use macros instead of direct IV numbers
  crypto: sparc/sha - remove duplicate hash init function
  crypto: powerpc/sha - remove duplicate hash init function
  crypto: mips/sha - remove duplicate hash init function
  crypto: sha256 - remove duplicate generic hash init function
  crypto: jitter - add oversampling of noise source
  MAINTAINERS: update SEC2 driver maintainers list
  crypto: ux500 - Use platform_get_irq() to get the interrupt
  crypto: hisilicon/qm - disable qm clock-gating
  crypto: omap-aes - Fix broken pm_runtime_and_get() usage
  MAINTAINERS: update caam crypto driver maintainers list
  crypto: octeontx2 - prevent underflow in get_cores_bmap()
  ...
parents 6f38be8f 5f21d7d2

Documentation/virt/kvm/amd-memory-encryption.rst

+6 −0
Original line number Diff line number Diff line
@@ -85,6 +85,12 @@ guests, such as launching, running, snapshotting, migrating and decommissioning. 
The KVM_SEV_INIT command is used by the hypervisor to initialize the SEV platform

context. In a typical workflow, this command should be the first command issued.



The firmware can be initialized either by using its own non-volatile storage or

the OS can manage the NV storage for the firmware using the module parameter

``init_ex_path``. The file specified by ``init_ex_path`` must exist. To create

a new NV storage file allocate the file with 32KB bytes of 0xFF as required by

the SEV spec.



Returns: 0 on success, -negative on error



2. KVM_SEV_LAUNCH_START

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -7557,6 +7557,7 @@ F: include/video/ 
FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER

M:	Horia Geantă <horia.geanta@nxp.com>

M:	Pankaj Gupta <pankaj.gupta@nxp.com>

M:	Gaurav Jain <gaurav.jain@nxp.com>

L:	linux-crypto@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -8676,6 +8677,7 @@ F: drivers/scsi/hisi_sas/ 








HISILICON SECURITY ENGINE V2 DRIVER (SEC2)









M:	Zaibo Xu <xuzaibo@huawei.com>









M:	Kai Ye <yekai13@huawei.com>









L:	linux-crypto@vger.kernel.org









S:	Maintained









F:	Documentation/ABI/testing/debugfs-hisi-sec








@@ -9721,7 +9723,6 @@ F:	Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml







F:	drivers/crypto/keembay/Kconfig









F:	drivers/crypto/keembay/Makefile









F:	drivers/crypto/keembay/keembay-ocs-ecc.c









F:	drivers/crypto/keembay/ocs-ecc-curve-defs.h

















INTEL KEEM BAY OCS HCU CRYPTO DRIVER









M:	Daniele Alessandrelli <daniele.alessandrelli@intel.com>
































arch/mips/cavium-octeon/crypto/octeon-sha1.c



+2
−15






























Original line number
Diff line number
Diff line







@@ -15,6 +15,7 @@

















#include <linux/mm.h>









#include <crypto/sha1.h>









#include <crypto/sha1_base.h>









#include <linux/init.h>









#include <linux/types.h>









#include <linux/module.h>








@@ -71,20 +72,6 @@ static void octeon_sha1_transform(const void *_block)







	octeon_sha1_start(block[7]);









}



















static int octeon_sha1_init(struct shash_desc *desc)









{









	struct sha1_state *sctx = shash_desc_ctx(desc);



















	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;



















	return 0;









}



















static void __octeon_sha1_update(struct sha1_state *sctx, const u8 *data,









				 unsigned int len)









{








@@ -200,7 +187,7 @@ static int octeon_sha1_import(struct shash_desc *desc, const void *in)

















static struct shash_alg octeon_sha1_alg = {









	.digestsize	=	SHA1_DIGEST_SIZE,









	.init		=	octeon_sha1_init,









	.init		=	sha1_base_init,









	.update		=	octeon_sha1_update,









	.final		=	octeon_sha1_final,









	.export		=	octeon_sha1_export,
































arch/mips/cavium-octeon/crypto/octeon-sha256.c



+3
−36






























Original line number
Diff line number
Diff line







@@ -16,6 +16,7 @@

















#include <linux/mm.h>









#include <crypto/sha2.h>









#include <crypto/sha256_base.h>









#include <linux/init.h>









#include <linux/types.h>









#include <linux/module.h>








@@ -63,40 +64,6 @@ static void octeon_sha256_transform(const void *_block)







	octeon_sha256_start(block[7]);









}



















static int octeon_sha224_init(struct shash_desc *desc)









{









	struct sha256_state *sctx = shash_desc_ctx(desc);



















	sctx->state[0] = SHA224_H0;









	sctx->state[1] = SHA224_H1;









	sctx->state[2] = SHA224_H2;









	sctx->state[3] = SHA224_H3;









	sctx->state[4] = SHA224_H4;









	sctx->state[5] = SHA224_H5;









	sctx->state[6] = SHA224_H6;









	sctx->state[7] = SHA224_H7;









	sctx->count = 0;



















	return 0;









}



















static int octeon_sha256_init(struct shash_desc *desc)









{









	struct sha256_state *sctx = shash_desc_ctx(desc);



















	sctx->state[0] = SHA256_H0;









	sctx->state[1] = SHA256_H1;









	sctx->state[2] = SHA256_H2;









	sctx->state[3] = SHA256_H3;









	sctx->state[4] = SHA256_H4;









	sctx->state[5] = SHA256_H5;









	sctx->state[6] = SHA256_H6;









	sctx->state[7] = SHA256_H7;









	sctx->count = 0;



















	return 0;









}



















static void __octeon_sha256_update(struct sha256_state *sctx, const u8 *data,









				   unsigned int len)









{








@@ -224,7 +191,7 @@ static int octeon_sha256_import(struct shash_desc *desc, const void *in)

















static struct shash_alg octeon_sha256_algs[2] = { {









	.digestsize	=	SHA256_DIGEST_SIZE,









	.init		=	octeon_sha256_init,









	.init		=	sha256_base_init,









	.update		=	octeon_sha256_update,









	.final		=	octeon_sha256_final,









	.export		=	octeon_sha256_export,








@@ -240,7 +207,7 @@ static struct shash_alg octeon_sha256_algs[2] = { {







	}









}, {









	.digestsize	=	SHA224_DIGEST_SIZE,









	.init		=	octeon_sha224_init,









	.init		=	sha224_base_init,









	.update		=	octeon_sha256_update,









	.final		=	octeon_sha224_final,









	.descsize	=	sizeof(struct sha256_state),
































arch/mips/cavium-octeon/crypto/octeon-sha512.c



+3
−36






























Original line number
Diff line number
Diff line







@@ -15,6 +15,7 @@

















#include <linux/mm.h>









#include <crypto/sha2.h>









#include <crypto/sha512_base.h>









#include <linux/init.h>









#include <linux/types.h>









#include <linux/module.h>








@@ -74,40 +75,6 @@ static void octeon_sha512_transform(const void *_block)







	octeon_sha512_start(block[15]);









}



















static int octeon_sha512_init(struct shash_desc *desc)









{









	struct sha512_state *sctx = shash_desc_ctx(desc);



















	sctx->state[0] = SHA512_H0;









	sctx->state[1] = SHA512_H1;









	sctx->state[2] = SHA512_H2;









	sctx->state[3] = SHA512_H3;









	sctx->state[4] = SHA512_H4;









	sctx->state[5] = SHA512_H5;









	sctx->state[6] = SHA512_H6;









	sctx->state[7] = SHA512_H7;









	sctx->count[0] = sctx->count[1] = 0;



















	return 0;









}



















static int octeon_sha384_init(struct shash_desc *desc)









{









	struct sha512_state *sctx = shash_desc_ctx(desc);



















	sctx->state[0] = SHA384_H0;









	sctx->state[1] = SHA384_H1;









	sctx->state[2] = SHA384_H2;









	sctx->state[3] = SHA384_H3;









	sctx->state[4] = SHA384_H4;









	sctx->state[5] = SHA384_H5;









	sctx->state[6] = SHA384_H6;









	sctx->state[7] = SHA384_H7;









	sctx->count[0] = sctx->count[1] = 0;



















	return 0;









}



















static void __octeon_sha512_update(struct sha512_state *sctx, const u8 *data,









				   unsigned int len)









{








@@ -223,7 +190,7 @@ static int octeon_sha384_final(struct shash_desc *desc, u8 *hash)

















static struct shash_alg octeon_sha512_algs[2] = { {









	.digestsize	=	SHA512_DIGEST_SIZE,









	.init		=	octeon_sha512_init,









	.init		=	sha512_base_init,









	.update		=	octeon_sha512_update,









	.final		=	octeon_sha512_final,









	.descsize	=	sizeof(struct sha512_state),








@@ -236,7 +203,7 @@ static struct shash_alg octeon_sha512_algs[2] = { {







	}









}, {









	.digestsize	=	SHA384_DIGEST_SIZE,









	.init		=	octeon_sha384_init,









	.init		=	sha384_base_init,









	.update		=	octeon_sha512_update,









	.final		=	octeon_sha384_final,









	.descsize	=	sizeof(struct sha512_state),