Commit 639b4ac6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6 into next 

Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 3.16:

   - Added test vectors for SHA/AES-CCM/DES-CBC/3DES-CBC.
   - Fixed a number of error-path memory leaks in tcrypt.
   - Fixed error-path memory leak in caam.
   - Removed unnecessary global mutex from mxs-dcp.
   - Added ahash walk interface that can actually be asynchronous.
   - Cleaned up caam error reporting.
   - Allow crypto_user get operation to be used by non-root users.
   - Add support for SSS module on Exynos.
   - Misc fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6: (60 commits)
  crypto: testmgr - add aead cbc des, des3_ede tests
  crypto: testmgr - Fix DMA-API warning
  crypto: cesa - tfm->__crt_alg->cra_type directly
  crypto: sahara - tfm->__crt_alg->cra_name directly
  crypto: padlock - tfm->__crt_alg->cra_name directly
  crypto: n2 - tfm->__crt_alg->cra_name directly
  crypto: dcp - tfm->__crt_alg->cra_name directly
  crypto: cesa - tfm->__crt_alg->cra_name directly
  crypto: ccp - tfm->__crt_alg->cra_name directly
  crypto: geode - Don't use tfm->__crt_alg->cra_name directly
  crypto: geode - Weed out printk() from probe()
  crypto: geode - Consistently use AES_KEYSIZE_128
  crypto: geode - Kill AES_IV_LENGTH
  crypto: geode - Kill AES_MIN_BLOCK_SIZE
  crypto: mxs-dcp - Remove global mutex
  crypto: hash - Add real ahash walk interface
  hwrng: n2-drv - Introduce the use of the managed version of kzalloc
  crypto: caam - reinitialize keys_fit_inline for decrypt and givencrypt
  crypto: s5p-sss - fix multiplatform build
  hwrng: timeriomem - remove unnecessary OOM messages
  ...
parents 9d2cd01b 5208ed2c

Documentation/devicetree/bindings/crypto/samsung-sss.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
Samsung SoC SSS (Security SubSystem) module



The SSS module in S5PV210 SoC supports the following:

-- Feeder (FeedCtrl)

-- Advanced Encryption Standard (AES)

-- Data Encryption Standard (DES)/3DES

-- Public Key Accelerator (PKA)

-- SHA-1/SHA-256/MD5/HMAC (SHA-1/SHA-256/MD5)/PRNG

-- PRNG: Pseudo Random Number Generator



The SSS module in Exynos4 (Exynos4210) and

Exynos5 (Exynos5420 and Exynos5250) SoCs

supports the following also:

-- ARCFOUR (ARC4)

-- True Random Number Generator (TRNG)

-- Secure Key Manager



Required properties:



- compatible : Should contain entries for this and backward compatible

  SSS versions:

  - "samsung,s5pv210-secss" for S5PV210 SoC.

  - "samsung,exynos4210-secss" for Exynos4210, Exynos4212, Exynos4412, Exynos5250,

		Exynos5260 and Exynos5420 SoCs.

- reg : Offset and length of the register set for the module

- interrupts : interrupt specifiers of SSS module interrupts, should contain

		following entries:

		- first : feed control interrupt (required for all variants),

		- second : hash interrupt (required only for samsung,s5pv210-secss).



- clocks : list of clock phandle and specifier pairs for all clocks  listed in

		clock-names property.

- clock-names : list of device clock input names; should contain one entry

		"secss".

arch/x86/crypto/ghash-clmulni-intel_asm.S

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ __clmul_gf128mul_ble: 
	ret

ENDPROC(__clmul_gf128mul_ble)



/* void clmul_ghash_mul(char *dst, const be128 *shash) */

/* void clmul_ghash_mul(char *dst, const u128 *shash) */

ENTRY(clmul_ghash_mul)

	movups (%rdi), DATA

	movups (%rsi), SHASH
@@ -106,7 +106,7 @@ ENDPROC(clmul_ghash_mul) 


/*

 * void clmul_ghash_update(char *dst, const char *src, unsigned int srclen,

 *			   const be128 *shash);

 *			   const u128 *shash);

 */

ENTRY(clmul_ghash_update)

	cmp $16, %rdx

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

+6 −6
Original line number Diff line number Diff line
@@ -25,17 +25,17 @@ 
#define GHASH_BLOCK_SIZE	16

#define GHASH_DIGEST_SIZE	16



void clmul_ghash_mul(char *dst, const be128 *shash);

void clmul_ghash_mul(char *dst, const u128 *shash);



void clmul_ghash_update(char *dst, const char *src, unsigned int srclen,

			const be128 *shash);

			const u128 *shash);



struct ghash_async_ctx {

	struct cryptd_ahash *cryptd_tfm;

};



struct ghash_ctx {

	be128 shash;

	u128 shash;

};



struct ghash_desc_ctx {
@@ -68,11 +68,11 @@ static int ghash_setkey(struct crypto_shash *tfm, 
	a = be64_to_cpu(x->a);

	b = be64_to_cpu(x->b);



	ctx->shash.a = (__be64)((b << 1) | (a >> 63));

	ctx->shash.b = (__be64)((a << 1) | (b >> 63));

	ctx->shash.a = (b << 1) | (a >> 63);

	ctx->shash.b = (a << 1) | (b >> 63);



	if (a >> 63)

		ctx->shash.b ^= cpu_to_be64(0xc2);

		ctx->shash.b ^= ((u64)0xc2) << 56;



	return 0;

}

crypto/ahash.c

+36 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <crypto/internal/hash.h>

#include <crypto/scatterwalk.h>

#include <linux/bug.h>

#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/module.h>
@@ -46,6 +47,9 @@ static int hash_walk_next(struct crypto_hash_walk *walk) 
	unsigned int nbytes = min(walk->entrylen,

				  ((unsigned int)(PAGE_SIZE)) - offset);



	if (walk->flags & CRYPTO_ALG_ASYNC)

		walk->data = kmap(walk->pg);

	else

		walk->data = kmap_atomic(walk->pg);

	walk->data += offset;
@@ -93,8 +97,16 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) 
		return nbytes;

	}



	if (walk->flags & CRYPTO_ALG_ASYNC)

		kunmap(walk->pg);

	else {

		kunmap_atomic(walk->data);

		/*

		 * The may sleep test only makes sense for sync users.

		 * Async users don't need to sleep here anyway.

		 */

		crypto_yield(walk->flags);

	}



	if (err)

		return err;
@@ -124,12 +136,31 @@ int crypto_hash_walk_first(struct ahash_request *req, 


	walk->alignmask = crypto_ahash_alignmask(crypto_ahash_reqtfm(req));

	walk->sg = req->src;

	walk->flags = req->base.flags;

	walk->flags = req->base.flags & CRYPTO_TFM_REQ_MASK;



	return hash_walk_new_entry(walk);

}

EXPORT_SYMBOL_GPL(crypto_hash_walk_first);



int crypto_ahash_walk_first(struct ahash_request *req,

			    struct crypto_hash_walk *walk)

{

	walk->total = req->nbytes;



	if (!walk->total)

		return 0;



	walk->alignmask = crypto_ahash_alignmask(crypto_ahash_reqtfm(req));

	walk->sg = req->src;

	walk->flags = req->base.flags & CRYPTO_TFM_REQ_MASK;

	walk->flags |= CRYPTO_ALG_ASYNC;



	BUILD_BUG_ON(CRYPTO_TFM_REQ_MASK & CRYPTO_ALG_ASYNC);



	return hash_walk_new_entry(walk);

}

EXPORT_SYMBOL_GPL(crypto_ahash_walk_first);



int crypto_hash_walk_first_compat(struct hash_desc *hdesc,

				  struct crypto_hash_walk *walk,

				  struct scatterlist *sg, unsigned int len)
@@ -141,7 +172,7 @@ int crypto_hash_walk_first_compat(struct hash_desc *hdesc, 


	walk->alignmask = crypto_hash_alignmask(hdesc->tfm);

	walk->sg = sg;

	walk->flags = hdesc->flags;

	walk->flags = hdesc->flags & CRYPTO_TFM_REQ_MASK;



	return hash_walk_new_entry(walk);

}

crypto/crypto_user.c

+9 −3
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ static int crypto_update_alg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];

	LIST_HEAD(list);



	if (!netlink_capable(skb, CAP_NET_ADMIN))

		return -EPERM;



	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))

		return -EINVAL;
@@ -295,6 +298,9 @@ static int crypto_del_alg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct crypto_alg *alg;

	struct crypto_user_alg *p = nlmsg_data(nlh);



	if (!netlink_capable(skb, CAP_NET_ADMIN))

		return -EPERM;



	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))

		return -EINVAL;
@@ -379,6 +385,9 @@ static int crypto_add_alg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct crypto_user_alg *p = nlmsg_data(nlh);

	struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];



	if (!netlink_capable(skb, CAP_NET_ADMIN))

		return -EPERM;



	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))

		return -EINVAL;
@@ -466,9 +475,6 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
	type -= CRYPTO_MSG_BASE;

	link = &crypto_dispatch[type];



	if (!netlink_capable(skb, CAP_NET_ADMIN))

		return -EPERM;



	if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) &&

	    (nlh->nlmsg_flags & NLM_F_DUMP))) {

		struct crypto_alg *alg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE