diff options
| author | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-11 23:38:14 +0000 |
|---|---|---|
| committer | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-11 23:38:14 +0000 |
| commit | 94a17b96c4b537258b3d338ac00c0757c4936c01 (patch) | |
| tree | f6fa906f2e09844443b41ca345686f6d4047296c /target/linux/generic/patches-3.3 | |
| parent | 8ad915e15787ddfdb4f87a04b58f148629d2affd (diff) | |
ocf: update to version 20120127
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32672 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3')
| -rw-r--r-- | target/linux/generic/patches-3.3/941-ocf_20120127.patch (renamed from target/linux/generic/patches-3.3/941-ocf_20110720.patch) | 53 |
1 files changed, 42 insertions, 11 deletions
diff --git a/target/linux/generic/patches-3.3/941-ocf_20110720.patch b/target/linux/generic/patches-3.3/941-ocf_20120127.patch index 5ff399ef6..366a2586d 100644 --- a/target/linux/generic/patches-3.3/941-ocf_20110720.patch +++ b/target/linux/generic/patches-3.3/941-ocf_20120127.patch @@ -1,13 +1,3 @@ ---- a/kernel/pid.c -+++ b/kernel/pid.c -@@ -430,6 +430,7 @@ struct task_struct *find_task_by_vpid(pi - { - return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns); - } -+EXPORT_SYMBOL(find_task_by_vpid); - - struct pid *get_task_pid(struct task_struct *task, enum pid_type type) - { --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -130,6 +130,9 @@ @@ -120,7 +110,38 @@ #define RTC_MINOR 135 --- a/include/linux/random.h +++ b/include/linux/random.h -@@ -54,6 +54,10 @@ extern void add_input_randomness(unsigne +@@ -34,6 +34,30 @@ + /* Clear the entropy pool and associated counters. (Superuser only.) */ + #define RNDCLEARPOOL _IO( 'R', 0x06 ) + ++#ifdef CONFIG_FIPS_RNG ++ ++/* Size of seed value - equal to AES blocksize */ ++#define AES_BLOCK_SIZE_BYTES 16 ++#define SEED_SIZE_BYTES AES_BLOCK_SIZE_BYTES ++/* Size of AES key */ ++#define KEY_SIZE_BYTES 16 ++ ++/* ioctl() structure used by FIPS 140-2 Tests */ ++struct rand_fips_test { ++ unsigned char key[KEY_SIZE_BYTES]; /* Input */ ++ unsigned char datetime[SEED_SIZE_BYTES]; /* Input */ ++ unsigned char seed[SEED_SIZE_BYTES]; /* Input */ ++ unsigned char result[SEED_SIZE_BYTES]; /* Output */ ++}; ++ ++/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */ ++#define RNDFIPSVST _IOWR('R', 0x10, struct rand_fips_test) ++ ++/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */ ++#define RNDFIPSMCT _IOWR('R', 0x11, struct rand_fips_test) ++ ++#endif /* #ifdef CONFIG_FIPS_RNG */ ++ + struct rand_pool_info { + int entropy_count; + int buf_size; +@@ -54,6 +78,10 @@ extern void add_input_randomness(unsigne unsigned int value); extern void add_interrupt_randomness(int irq); @@ -131,3 +152,13 @@ extern void get_random_bytes(void *buf, int nbytes); void generate_random_uuid(unsigned char uuid_out[16]); +--- a/kernel/pid.c ++++ b/kernel/pid.c +@@ -430,6 +430,7 @@ struct task_struct *find_task_by_vpid(pi + { + return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns); + } ++EXPORT_SYMBOL(find_task_by_vpid); + + struct pid *get_task_pid(struct task_struct *task, enum pid_type type) + { |