Commit 37d40084 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
  crypto: aes_generic - Fix checkpatch errors
  crypto: fcrypt - Fix checkpatch errors
  crypto: ecb - Fix checkpatch errors
  crypto: des_generic - Fix checkpatch errors
  crypto: deflate - Fix checkpatch errors
  crypto: crypto_null - Fix checkpatch errors
  crypto: cipher - Fix checkpatch errors
  crypto: crc32 - Fix checkpatch errors
  crypto: compress - Fix checkpatch errors
  crypto: cast6 - Fix checkpatch errors
  crypto: cast5 - Fix checkpatch errors
  crypto: camellia - Fix checkpatch errors
  crypto: authenc - Fix checkpatch errors
  crypto: api - Fix checkpatch errors
  crypto: anubis - Fix checkpatch errors
  crypto: algapi - Fix checkpatch errors
  crypto: blowfish - Fix checkpatch errors
  crypto: aead - Fix checkpatch errors
  crypto: ablkcipher - Fix checkpatch errors
  crypto: pcrypt - call the complete function on error
  ...
parents 68c6b859 8d0c123f

arch/arm/mach-nomadik/cpu-8815.c

+8 −0
Original line number Diff line number Diff line
@@ -86,11 +86,19 @@ static struct amba_device cpu8815_amba_gpio[] = { 
	},

};



static struct amba_device cpu8815_amba_rng = {

	.dev = {

		.init_name = "rng",

	},

	__MEM_4K_RESOURCE(NOMADIK_RNG_BASE),

};



static struct amba_device *amba_devs[] __initdata = {

	cpu8815_amba_gpio + 0,

	cpu8815_amba_gpio + 1,

	cpu8815_amba_gpio + 2,

	cpu8815_amba_gpio + 3,

	&cpu8815_amba_rng

};



static int __init cpu8815_init(void)

arch/s390/crypto/aes_s390.c

+3 −3
Original line number Diff line number Diff line
@@ -78,14 +78,14 @@ static int setkey_fallback_cip(struct crypto_tfm *tfm, const u8 *in_key, 
	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);

	int ret;



	sctx->fallback.blk->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;

	sctx->fallback.blk->base.crt_flags |= (tfm->crt_flags &

	sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;

	sctx->fallback.cip->base.crt_flags |= (tfm->crt_flags &

			CRYPTO_TFM_REQ_MASK);



	ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);

	if (ret) {

		tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;

		tfm->crt_flags |= (sctx->fallback.blk->base.crt_flags &

		tfm->crt_flags |= (sctx->fallback.cip->base.crt_flags &

				CRYPTO_TFM_RES_MASK);

	}

	return ret;

crypto/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -114,6 +114,16 @@ config CRYPTO_NULL 
	help

	  These are 'Null' algorithms, used by IPsec, which do nothing.



config CRYPTO_PCRYPT

	tristate "Parallel crypto engine (EXPERIMENTAL)"

	depends on SMP && EXPERIMENTAL

	select PADATA

	select CRYPTO_MANAGER

	select CRYPTO_AEAD

	help

	  This converts an arbitrary crypto algorithm into a parallel

	  algorithm that executes in kernel threads.



config CRYPTO_WORKQUEUE

       tristate

crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ obj-$(CONFIG_CRYPTO_XTS) += xts.o 
obj-$(CONFIG_CRYPTO_CTR) += ctr.o

obj-$(CONFIG_CRYPTO_GCM) += gcm.o

obj-$(CONFIG_CRYPTO_CCM) += ccm.o

obj-$(CONFIG_CRYPTO_PCRYPT) += pcrypt.o

obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o

obj-$(CONFIG_CRYPTO_DES) += des_generic.o

obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o

crypto/anubis.c

+11 −11
Original line number Diff line number Diff line
@@ -469,8 +469,7 @@ static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key, 
	u32 kappa[ANUBIS_MAX_N];

	u32 inter[ANUBIS_MAX_N];



	switch (key_len)

	{

	switch (key_len) {

		case 16: case 20: case 24: case 28:

		case 32: case 36: case 40:

			break;
@@ -530,24 +529,25 @@ static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key, 
		/*

		 * compute kappa^{r+1} from kappa^r:

		 */

		if (r == R) {

		if (r == R)

			break;

		}

		for (i = 0; i < N; i++) {

			int j = i;

			inter[i]  = T0[(kappa[j--] >> 24)       ];

			if (j < 0) j = N - 1;

			if (j < 0)

				j = N - 1;

			inter[i] ^= T1[(kappa[j--] >> 16) & 0xff];

			if (j < 0) j = N - 1;

			if (j < 0)

				j = N - 1;

			inter[i] ^= T2[(kappa[j--] >>  8) & 0xff];

			if (j < 0) j = N - 1;

			if (j < 0)

				j = N - 1;

			inter[i] ^= T3[(kappa[j  ]      ) & 0xff];

		}

		kappa[0] = inter[0] ^ rc[r];

		for (i = 1; i < N; i++) {

		for (i = 1; i < N; i++)

			kappa[i] = inter[i];

	}

	}



	/*

	 * generate inverse key schedule: K'^0 = K^R, K'^R =

CRA Git | Maintained and supported by SUSTech CRA and CCSE