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

Commit 0eddf038 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:
  [CRYPTO] null: Add missing Kconfig dependency on BLKCIPHER
  [CRYPTO] tcrypt: Add missing Kconfig dependency on BLKCIPHER
  [HIFN]: Fix invalid config ifdefs for RNG support
parents 86b7cbc9 c8620c25

crypto/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ config CRYPTO_XCBC 
config CRYPTO_NULL

	tristate "Null algorithms"

	select CRYPTO_ALGAPI

	select CRYPTO_BLKCIPHER

	help

	  These are 'Null' algorithms, used by IPsec, which do nothing.
@@ -567,6 +568,7 @@ config CRYPTO_TEST 
	depends on m

	select CRYPTO_ALGAPI

	select CRYPTO_AEAD

	select CRYPTO_BLKCIPHER

	help

	  Quick & dirty crypto test module.

drivers/crypto/hifn_795x.c

+3 −3
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ struct hifn_device 


	unsigned int		pk_clk_freq;



#ifdef CRYPTO_DEV_HIFN_795X_RNG

#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG

	unsigned int		rng_wait_time;

	ktime_t			rngtime;

	struct hwrng		rng;
@@ -795,7 +795,7 @@ static struct pci2id { 
	}

};



#ifdef CRYPTO_DEV_HIFN_795X_RNG

#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG

static int hifn_rng_data_present(struct hwrng *rng, int wait)

{

	struct hifn_device *dev = (struct hifn_device *)rng->priv;
@@ -880,7 +880,7 @@ static int hifn_init_pubrng(struct hifn_device *dev) 
	dprintk("Chip %s: RNG engine has been successfully initialised.\n",

			dev->name);



#ifdef CRYPTO_DEV_HIFN_795X_RNG

#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG

	/* First value must be discarded */

	hifn_read_1(dev, HIFN_1_RNG_DATA);

	dev->rngtime = ktime_get();