Ignore:
Timestamp:
2011-07-24T16:17:58+02:00 (5 years ago)
Author:
hauke
Message:

ocf-linux: version bump to 20110720

Fixes problem with TFM allocation in cryptosoft.c

Signed-off-by: Philip Prindeville <philipp@…>

Hauke:

  • remove ubsec_ssb package and take it from ocf-linux
  • use patches from ocf-linux package
  • refresh all patches
  • readd some build fixes for OpenWrt.
  • readd CRYPTO_MANAGER dependency
File:
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.30/971-ocf_20110720.patch

    r27750 r27753  
     1 
    12--- a/drivers/char/random.c 
    23+++ b/drivers/char/random.c 
     
    2526  * particular randomness source.  They do this by keeping track of the 
    2627  * first and second order deltas of the event timings. 
    27 @@ -712,6 +722,61 @@ void add_disk_randomness(struct gendisk  
     28@@ -712,6 +722,61 @@ void add_disk_randomness(struct gendisk 
    2829 } 
    2930 #endif 
     
    8990--- a/fs/fcntl.c 
    9091+++ b/fs/fcntl.c 
    91 @@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde 
    92         } 
    93         return ret; 
     92@@ -196,6 +196,7 @@ static int setfl(int fd, struct file * f 
     93  out: 
     94        return error; 
    9495 } 
    9596+EXPORT_SYMBOL(sys_dup); 
    9697  
    97  #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) 
    98   
     98 static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, 
     99                      uid_t uid, uid_t euid, int force) 
    99100--- a/include/linux/miscdevice.h 
    100101+++ b/include/linux/miscdevice.h 
     
    109110--- a/include/linux/random.h 
    110111+++ b/include/linux/random.h 
    111 @@ -9,6 +9,7 @@ 
    112   
    113  #include <linux/types.h> 
    114  #include <linux/ioctl.h> 
    115 +#include <linux/types.h> /* for __u32 in user space */ 
    116  #include <linux/irqnr.h> 
    117   
    118  /* ioctl()'s for the random number generator */ 
    119 @@ -34,6 +35,30 @@ 
    120  /* Clear the entropy pool and associated counters.  (Superuser only.) */ 
    121  #define RNDCLEARPOOL   _IO( 'R', 0x06 ) 
    122   
    123 +#ifdef CONFIG_FIPS_RNG 
    124 + 
    125 +/* Size of seed value - equal to AES blocksize */ 
    126 +#define AES_BLOCK_SIZE_BYTES   16 
    127 +#define SEED_SIZE_BYTES                        AES_BLOCK_SIZE_BYTES 
    128 +/* Size of AES key */ 
    129 +#define KEY_SIZE_BYTES         16 
    130 + 
    131 +/* ioctl() structure used by FIPS 140-2 Tests */ 
    132 +struct rand_fips_test { 
    133 +       unsigned char key[KEY_SIZE_BYTES];                      /* Input */ 
    134 +       unsigned char datetime[SEED_SIZE_BYTES];        /* Input */ 
    135 +       unsigned char seed[SEED_SIZE_BYTES];            /* Input */ 
    136 +       unsigned char result[SEED_SIZE_BYTES];          /* Output */ 
    137 +}; 
    138 + 
    139 +/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */ 
    140 +#define RNDFIPSVST     _IOWR('R', 0x10, struct rand_fips_test) 
    141 + 
    142 +/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */ 
    143 +#define RNDFIPSMCT     _IOWR('R', 0x11, struct rand_fips_test) 
    144 + 
    145 +#endif /* #ifdef CONFIG_FIPS_RNG */ 
    146 + 
    147  struct rand_pool_info { 
    148         int     entropy_count; 
    149         int     buf_size; 
    150 @@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne 
     112@@ -50,6 +50,10 @@ extern void add_input_randomness(unsigne 
    151113                                 unsigned int value); 
    152114 extern void add_interrupt_randomness(int irq); 
     
    159121 void generate_random_uuid(unsigned char uuid_out[16]); 
    160122  
     123--- a/kernel/pid.c 
     124+++ b/kernel/pid.c 
     125@@ -383,6 +383,7 @@ struct task_struct *find_task_by_pid_typ 
     126 { 
     127        return pid_task(find_pid_ns(nr, ns), type); 
     128 } 
     129+EXPORT_SYMBOL(find_task_by_vpid); 
     130  
     131 EXPORT_SYMBOL(find_task_by_pid_type_ns); 
     132  
Note: See TracChangeset for help on using the changeset viewer.