leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Linus Torvalds 2008-02-18 15:46:03 -08:00
commit 0eddf038ad
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/Kconfig
View File

@ -74,6 +74,7 @@ config CRYPTO_XCBC
config CRYPTO_NULL config CRYPTO_NULL
tristate "Null algorithms" tristate "Null algorithms"
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
select CRYPTO_BLKCIPHER
help help
These are 'Null' algorithms, used by IPsec, which do nothing. These are 'Null' algorithms, used by IPsec, which do nothing.
@ -567,6 +568,7 @@ config CRYPTO_TEST
depends on m depends on m
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
select CRYPTO_AEAD select CRYPTO_AEAD
select CRYPTO_BLKCIPHER
help help
Quick & dirty crypto test module. Quick & dirty crypto test module.

6
drivers/crypto/hifn_795x.c
View File

@ -463,7 +463,7 @@ struct hifn_device
unsigned int pk_clk_freq; unsigned int pk_clk_freq;
#ifdef CRYPTO_DEV_HIFN_795X_RNG #ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG
unsigned int rng_wait_time; unsigned int rng_wait_time;
ktime_t rngtime; ktime_t rngtime;
struct hwrng rng; 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) static int hifn_rng_data_present(struct hwrng *rng, int wait)
{ {
struct hifn_device *dev = (struct hifn_device *)rng->priv; 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", dprintk("Chip %s: RNG engine has been successfully initialised.\n",
dev->name); dev->name);
#ifdef CRYPTO_DEV_HIFN_795X_RNG #ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG
/* First value must be discarded */ /* First value must be discarded */
hifn_read_1(dev, HIFN_1_RNG_DATA); hifn_read_1(dev, HIFN_1_RNG_DATA);
dev->rngtime = ktime_get(); dev->rngtime = ktime_get();