Commit c597b6bc 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 update from Herbert Xu:
 "Algorithms:
   - Add RSA padding algorithm

  Drivers:
   - Add GCM mode support to atmel
   - Add atmel support for SAMA5D2 devices
   - Add cipher modes to talitos
   - Add rockchip driver for rk3288
   - Add qat support for C3XXX and C62X"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (103 commits)
  crypto: hifn_795x, picoxcell - use ablkcipher_request_cast
  crypto: qat - fix SKU definiftion for c3xxx dev
  crypto: qat - Fix random config build issue
  crypto: ccp - use to_pci_dev and to_platform_device
  crypto: qat - Rename dh895xcc mmp firmware
  crypto: 842 - remove WARN inside printk
  crypto: atmel-aes - add debug facilities to monitor register accesses.
  crypto: atmel-aes - add support to GCM mode
  crypto: atmel-aes - change the DMA threshold
  crypto: atmel-aes - fix the counter overflow in CTR mode
  crypto: atmel-aes - fix atmel-ctr-aes driver for RFC 3686
  crypto: atmel-aes - create sections to regroup functions by usage
  crypto: atmel-aes - fix typo and indentation
  crypto: atmel-aes - use SIZE_IN_WORDS() helper macro
  crypto: atmel-aes - improve performances of data transfer
  crypto: atmel-aes - fix atmel_aes_remove()
  crypto: atmel-aes - remove useless AES_FLAGS_DMA flag
  crypto: atmel-aes - reduce latency of DMA completion
  crypto: atmel-aes - remove unused 'err' member of struct atmel_aes_dev
  crypto: atmel-aes - rework crypto request completion
  ...
parents 60b7eca1 48d62764

Documentation/devicetree/bindings/crypto/rockchip-crypto.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
Rockchip Electronics And Security Accelerator



Required properties:

- compatible: Should be "rockchip,rk3288-crypto"

- reg: Base physical address of the engine and length of memory mapped

       region

- interrupts: Interrupt number

- clocks: Reference to the clocks about crypto

- clock-names: "aclk" used to clock data

	       "hclk" used to clock data

	       "sclk" used to clock crypto accelerator

	       "apb_pclk" used to clock dma

- resets: Must contain an entry for each entry in reset-names.

	  See ../reset/reset.txt for details.

- reset-names: Must include the name "crypto-rst".



Examples:



	crypto: cypto-controller@ff8a0000 {

		compatible = "rockchip,rk3288-crypto";

		reg = <0xff8a0000 0x4000>;

		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,

			 <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;

		clock-names = "aclk", "hclk", "sclk", "apb_pclk";

		resets = <&cru SRST_CRYPTO>;

		reset-names = "crypto-rst";

		status = "okay";

	};

arch/powerpc/include/asm/icswx.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ struct coprocessor_request_block { 
#define ICSWX_INITIATED		(0x8)

#define ICSWX_BUSY		(0x4)

#define ICSWX_REJECTED		(0x2)

#define ICSWX_XERS0		(0x1)	/* undefined or set from XERSO. */



static inline int icswx(__be32 ccw, struct coprocessor_request_block *crb)

{

arch/x86/crypto/ghash-clmulni-intel_glue.c

+26 −0
Original line number Diff line number Diff line
@@ -219,6 +219,29 @@ static int ghash_async_final(struct ahash_request *req) 
	}

}



static int ghash_async_import(struct ahash_request *req, const void *in)

{

	struct ahash_request *cryptd_req = ahash_request_ctx(req);

	struct shash_desc *desc = cryptd_shash_desc(cryptd_req);

	struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);



	ghash_async_init(req);

	memcpy(dctx, in, sizeof(*dctx));

	return 0;



}



static int ghash_async_export(struct ahash_request *req, void *out)

{

	struct ahash_request *cryptd_req = ahash_request_ctx(req);

	struct shash_desc *desc = cryptd_shash_desc(cryptd_req);

	struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);



	memcpy(out, dctx, sizeof(*dctx));

	return 0;



}



static int ghash_async_digest(struct ahash_request *req)

{

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
@@ -288,8 +311,11 @@ static struct ahash_alg ghash_async_alg = { 
	.final		= ghash_async_final,

	.setkey		= ghash_async_setkey,

	.digest		= ghash_async_digest,

	.export		= ghash_async_export,

	.import		= ghash_async_import,

	.halg = {

		.digestsize	= GHASH_DIGEST_SIZE,

		.statesize = sizeof(struct ghash_desc_ctx),

		.base = {

			.cra_name		= "ghash",

			.cra_driver_name	= "ghash-clmulni",

crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ rsa_generic-y := rsapubkey-asn1.o 
rsa_generic-y += rsaprivkey-asn1.o

rsa_generic-y += rsa.o

rsa_generic-y += rsa_helper.o

rsa_generic-y += rsa-pkcs1pad.o

obj-$(CONFIG_CRYPTO_RSA) += rsa_generic.o



cryptomgr-y := algboss.o testmgr.o

crypto/akcipher.c

+33 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/cryptouser.h>

#include <net/netlink.h>

#include <crypto/akcipher.h>

#include <crypto/internal/akcipher.h>

#include "internal.h"



#ifdef CONFIG_NET
@@ -75,9 +76,17 @@ static int crypto_akcipher_init_tfm(struct crypto_tfm *tfm) 
	return 0;

}



static void crypto_akcipher_free_instance(struct crypto_instance *inst)

{

	struct akcipher_instance *akcipher = akcipher_instance(inst);



	akcipher->free(akcipher);

}



static const struct crypto_type crypto_akcipher_type = {

	.extsize = crypto_alg_extsize,

	.init_tfm = crypto_akcipher_init_tfm,

	.free = crypto_akcipher_free_instance,

#ifdef CONFIG_PROC_FS

	.show = crypto_akcipher_show,

#endif
@@ -88,6 +97,14 @@ static const struct crypto_type crypto_akcipher_type = { 
	.tfmsize = offsetof(struct crypto_akcipher, base),

};



int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn, const char *name,

			 u32 type, u32 mask)

{

	spawn->base.frontend = &crypto_akcipher_type;

	return crypto_grab_spawn(&spawn->base, name, type, mask);

}

EXPORT_SYMBOL_GPL(crypto_grab_akcipher);



struct crypto_akcipher *crypto_alloc_akcipher(const char *alg_name, u32 type,

					      u32 mask)

{
@@ -95,13 +112,20 @@ struct crypto_akcipher *crypto_alloc_akcipher(const char *alg_name, u32 type, 
}

EXPORT_SYMBOL_GPL(crypto_alloc_akcipher);



int crypto_register_akcipher(struct akcipher_alg *alg)

static void akcipher_prepare_alg(struct akcipher_alg *alg)

{

	struct crypto_alg *base = &alg->base;



	base->cra_type = &crypto_akcipher_type;

	base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;

	base->cra_flags |= CRYPTO_ALG_TYPE_AKCIPHER;

}



int crypto_register_akcipher(struct akcipher_alg *alg)

{

	struct crypto_alg *base = &alg->base;



	akcipher_prepare_alg(alg);

	return crypto_register_alg(base);

}

EXPORT_SYMBOL_GPL(crypto_register_akcipher);
@@ -112,5 +136,13 @@ void crypto_unregister_akcipher(struct akcipher_alg *alg) 
}

EXPORT_SYMBOL_GPL(crypto_unregister_akcipher);



int akcipher_register_instance(struct crypto_template *tmpl,

			       struct akcipher_instance *inst)

{

	akcipher_prepare_alg(&inst->alg);

	return crypto_register_instance(tmpl, akcipher_crypto_instance(inst));

}

EXPORT_SYMBOL_GPL(akcipher_register_instance);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Generic public key cipher type");

CRA Git | Maintained and supported by SUSTech CRA and CCSE