Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26b265cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto update from Herbert Xu:
 - Made x86 ablk_helper generic for ARM
 - Phase out chainiv in favour of eseqiv (affects IPsec)
 - Fixed aes-cbc IV corruption on s390
 - Added constant-time crypto_memneq which replaces memcmp
 - Fixed aes-ctr in omap-aes
 - Added OMAP3 ROM RNG support
 - Add PRNG support for MSM SoC's
 - Add and use Job Ring API in caam
 - Misc fixes

[ NOTE! This pull request was sent within the merge window, but Herbert
  has some questionable email sending setup that makes him public enemy
  #1 as far as gmail is concerned.  So most of his emails seem to be
  trapped by gmail as spam, resulting in me not seeing them.  - Linus ]

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (49 commits)
  crypto: s390 - Fix aes-cbc IV corruption
  crypto: omap-aes - Fix CTR mode counter length
  crypto: omap-sham - Add missing modalias
  padata: make the sequence counter an atomic_t
  crypto: caam - Modify the interface layers to use JR API's
  crypto: caam - Add API's to allocate/free Job Rings
  crypto: caam - Add Platform driver for Job Ring
  hwrng: msm - Add PRNG support for MSM SoC's
  ARM: DT: msm: Add Qualcomm's PRNG driver binding document
  crypto: skcipher - Use eseqiv even on UP machines
  crypto: talitos - Simplify key parsing
  crypto: picoxcell - Simplify and harden key parsing
  crypto: ixp4xx - Simplify and harden key parsing
  crypto: authencesn - Simplify key parsing
  crypto: authenc - Export key parsing helper function
  crypto: mv_cesa: remove deprecated IRQF_DISABLED
  hwrng: OMAP3 ROM Random Number Generator support
  crypto: sha256_ssse3 - also test for BMI2
  crypto: mv_cesa - Remove redundant of_match_ptr
  crypto: sahara - Remove redundant of_match_ptr
  ...
parents 2e7babfa f262f0f5

Documentation/devicetree/bindings/rng/qcom,prng.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Qualcomm MSM pseudo random number generator.



Required properties:



- compatible  : should be "qcom,prng"

- reg         : specifies base physical address and size of the registers map

- clocks      : phandle to clock-controller plus clock-specifier pair

- clock-names : "core" clocks all registers, FIFO and circuits in PRNG IP block



Example:



	rng@f9bff000 {

		compatible = "qcom,prng";

		reg = <0xf9bff000 0x200>;

		clocks = <&clock GCC_PRNG_AHB_CLK>;

		clock-names = "core";

	};

arch/arm/mach-tegra/fuse.c

+0 −10
Original line number Diff line number Diff line
@@ -209,13 +209,3 @@ void __init tegra_init_fuse(void) 
		tegra_sku_id, tegra_cpu_process_id,

		tegra_core_process_id);

}
 


unsigned long long tegra_chip_uid(void)

{

	unsigned long long lo, hi;



	lo = tegra_fuse_readl(FUSE_UID_LOW);

	hi = tegra_fuse_readl(FUSE_UID_HIGH);

	return (hi << 32ull) | lo;

}

EXPORT_SYMBOL(tegra_chip_uid);

arch/s390/crypto/aes_s390.c

+12 −7
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ static u8 *ctrblk; 
static char keylen_flag;



struct s390_aes_ctx {

	u8 iv[AES_BLOCK_SIZE];

	u8 key[AES_MAX_KEY_SIZE];

	long enc;

	long dec;
@@ -441,30 +440,36 @@ static int cbc_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, 
	return aes_set_key(tfm, in_key, key_len);

}



static int cbc_aes_crypt(struct blkcipher_desc *desc, long func, void *param,

static int cbc_aes_crypt(struct blkcipher_desc *desc, long func,

			 struct blkcipher_walk *walk)

{

	struct s390_aes_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);

	int ret = blkcipher_walk_virt(desc, walk);

	unsigned int nbytes = walk->nbytes;

	struct {

		u8 iv[AES_BLOCK_SIZE];

		u8 key[AES_MAX_KEY_SIZE];

	} param;



	if (!nbytes)

		goto out;



	memcpy(param, walk->iv, AES_BLOCK_SIZE);

	memcpy(param.iv, walk->iv, AES_BLOCK_SIZE);

	memcpy(param.key, sctx->key, sctx->key_len);

	do {

		/* only use complete blocks */

		unsigned int n = nbytes & ~(AES_BLOCK_SIZE - 1);

		u8 *out = walk->dst.virt.addr;

		u8 *in = walk->src.virt.addr;



		ret = crypt_s390_kmc(func, param, out, in, n);

		ret = crypt_s390_kmc(func, &param, out, in, n);

		if (ret < 0 || ret != n)

			return -EIO;



		nbytes &= AES_BLOCK_SIZE - 1;

		ret = blkcipher_walk_done(desc, walk, nbytes);

	} while ((nbytes = walk->nbytes));

	memcpy(walk->iv, param, AES_BLOCK_SIZE);

	memcpy(walk->iv, param.iv, AES_BLOCK_SIZE);



out:

	return ret;
@@ -481,7 +486,7 @@ static int cbc_aes_encrypt(struct blkcipher_desc *desc, 
		return fallback_blk_enc(desc, dst, src, nbytes);



	blkcipher_walk_init(&walk, dst, src, nbytes);

	return cbc_aes_crypt(desc, sctx->enc, sctx->iv, &walk);

	return cbc_aes_crypt(desc, sctx->enc, &walk);

}



static int cbc_aes_decrypt(struct blkcipher_desc *desc,
@@ -495,7 +500,7 @@ static int cbc_aes_decrypt(struct blkcipher_desc *desc, 
		return fallback_blk_dec(desc, dst, src, nbytes);



	blkcipher_walk_init(&walk, dst, src, nbytes);

	return cbc_aes_crypt(desc, sctx->dec, sctx->iv, &walk);

	return cbc_aes_crypt(desc, sctx->dec, &walk);

}



static struct crypto_alg cbc_aes_alg = {

arch/x86/crypto/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ 
#



avx_supported := $(call as-instr,vpxor %xmm0$(comma)%xmm0$(comma)%xmm0,yes,no)

avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

				$(comma)4)$(comma)%ymm2,yes,no)



obj-$(CONFIG_CRYPTO_ABLK_HELPER_X86) += ablk_helper.o

obj-$(CONFIG_CRYPTO_GLUE_HELPER_X86) += glue_helper.o



obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o

arch/x86/crypto/aesni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <asm/cpu_device_id.h>

#include <asm/i387.h>

#include <asm/crypto/aes.h>

#include <asm/crypto/ablk_helper.h>

#include <crypto/ablk_helper.h>

#include <crypto/scatterwalk.h>

#include <crypto/internal/aead.h>

#include <linux/workqueue.h>