openwrt/target/linux/linux-2.4/patches/generic/110-netdev_random_core.patch

   1 diff -urN linux-2.4.26-pre5/Documentation/Configure.help linux-2.4.26-pre5-netdev-core/Documentation/Configure.help
   2 --- linux-2.4.26-pre5/Documentation/Configure.help      Sat Mar 20 10:08:18 2004
   3 +++ linux-2.4.26-pre5-netdev-core/Documentation/Configure.help  Sun Mar 21 10:16:14 2004
   4 @@ -10419,6 +10419,20 @@
   5
   6    If you don't know what to use this for, you don't need it.
   7
   8 +Allow Net Devices to contribute to /dev/random
   9 +CONFIG_NET_RANDOM
  10 +  If you say Y here, network device interrupts will contribute to the
  11 +  kernel entropy pool. Normally, block devices and some other devices
  12 +  feed the pool. Some systems, such as those that are headless or diskless,
  13 +  need additional entropy sources.  Some people, however, feel that network
  14 +  devices should not contribute to /dev/random because an external attacker
  15 +  could observe incoming packets in an attempt to learn the entropy pool's
  16 +  state.  If you say N, no network device will contribute entropy.
  17 +
  18 +  If you believe there is a chance of your network packets being observed
  19 +  and you doubt the security of the entropy pool's one-way hash, do not
  20 +  enable this.  If unsure, say N.
  21 +
  22  Ethertap network tap (OBSOLETE)
  23  CONFIG_ETHERTAP
  24    If you say Y here (and have said Y to "Kernel/User network link
  25 diff -urN linux-2.4.26-pre5/drivers/net/Config.in linux-2.4.26-pre5-netdev-core/drivers/net/Config.in
  26 --- linux-2.4.26-pre5/drivers/net/Config.in     Sat Mar 20 10:08:18 2004
  27 +++ linux-2.4.26-pre5-netdev-core/drivers/net/Config.in Sun Mar 21 10:16:14 2004
  28 @@ -8,6 +8,7 @@
  29  tristate 'Bonding driver support' CONFIG_BONDING
  30  tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
  31  tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
  32 +bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM
  33  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
  34     tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
  35  fi
  36 diff -urN linux-2.4.26-pre5/include/asm-alpha/signal.h linux-2.4.26-pre5-netdev-core/include/asm-alpha/signal.h
  37 --- linux-2.4.26-pre5/include/asm-alpha/signal.h        Sat Dec  1 18:27:14 2001
  38 +++ linux-2.4.26-pre5-netdev-core/include/asm-alpha/signal.h    Sun Mar 21 10:16:14 2004
  39 @@ -121,7 +121,14 @@
  40  #define SA_PROBE               SA_ONESHOT
  41  #define SA_SAMPLE_RANDOM       SA_RESTART
  42  #define SA_SHIRQ               0x40000000
  43 +
  44 +#ifdef CONFIG_NET_RANDOM
  45 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
  46 +#else
  47 +#define SA_NET_RANDOM  0
  48  #endif
  49 +
  50 +#endif /* __KERNEL__ */
  51
  52  #define SIG_BLOCK          1   /* for blocking signals */
  53  #define SIG_UNBLOCK        2   /* for unblocking signals */
  54 diff -urN linux-2.4.26-pre5/include/asm-arm/signal.h linux-2.4.26-pre5-netdev-core/include/asm-arm/signal.h
  55 --- linux-2.4.26-pre5/include/asm-arm/signal.h  Sat Sep 13 07:57:29 2003
  56 +++ linux-2.4.26-pre5-netdev-core/include/asm-arm/signal.h      Sun Mar 21 10:16:14 2004
  57 @@ -125,7 +125,14 @@
  58  #define SA_PROBE               0x80000000
  59  #define SA_SAMPLE_RANDOM       0x10000000
  60  #define SA_SHIRQ               0x04000000
  61 +
  62 +#ifdef CONFIG_NET_RANDOM
  63 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
  64 +#else
  65 +#define SA_NET_RANDOM  0
  66  #endif
  67 +
  68 +#endif /* __KERNEL__ */
  69
  70  #define SIG_BLOCK          0   /* for blocking signals */
  71  #define SIG_UNBLOCK        1   /* for unblocking signals */
  72 diff -urN linux-2.4.26-pre5/include/asm-cris/signal.h linux-2.4.26-pre5-netdev-core/include/asm-cris/signal.h
  73 --- linux-2.4.26-pre5/include/asm-cris/signal.h Sat Dec  1 18:27:14 2001
  74 +++ linux-2.4.26-pre5-netdev-core/include/asm-cris/signal.h     Sun Mar 21 10:16:14 2004
  75 @@ -120,7 +120,14 @@
  76  #define SA_PROBE               SA_ONESHOT
  77  #define SA_SAMPLE_RANDOM       SA_RESTART
  78  #define SA_SHIRQ               0x04000000
  79 +
  80 +#ifdef CONFIG_NET_RANDOM
  81 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
  82 +#else
  83 +#define SA_NET_RANDOM  0
  84  #endif
  85 +
  86 +#endif /* __KERNEL__ */
  87
  88  #define SIG_BLOCK          0   /* for blocking signals */
  89  #define SIG_UNBLOCK        1   /* for unblocking signals */
  90 diff -urN linux-2.4.26-pre5/include/asm-i386/signal.h linux-2.4.26-pre5-netdev-core/include/asm-i386/signal.h
  91 --- linux-2.4.26-pre5/include/asm-i386/signal.h Sun Mar 21 00:00:43 2004
  92 +++ linux-2.4.26-pre5-netdev-core/include/asm-i386/signal.h     Sun Mar 21 10:16:14 2004
  93 @@ -119,7 +119,14 @@
  94  #define SA_PROBE               SA_ONESHOT
  95  #define SA_SAMPLE_RANDOM       SA_RESTART
  96  #define SA_SHIRQ               0x04000000
  97 +
  98 +#ifdef CONFIG_NET_RANDOM
  99 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 100 +#else
 101 +#define SA_NET_RANDOM  0
 102  #endif
 103 +
 104 +#endif /* __KERNEL__ */
 105
 106  #define SIG_BLOCK          0   /* for blocking signals */
 107  #define SIG_UNBLOCK        1   /* for unblocking signals */
 108 diff -urN linux-2.4.26-pre5/include/asm-ia64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-ia64/signal.h
 109 --- linux-2.4.26-pre5/include/asm-ia64/signal.h Sat Mar 20 10:08:20 2004
 110 +++ linux-2.4.26-pre5-netdev-core/include/asm-ia64/signal.h     Sun Mar 21 10:16:14 2004
 111 @@ -117,6 +117,12 @@
 112  #define SA_SHIRQ               0x04000000
 113  #define SA_PERCPU_IRQ          0x02000000
 114
 115 +#ifdef CONFIG_NET_RANDOM
 116 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 117 +#else
 118 +#define SA_NET_RANDOM  0
 119 +#endif
 120 +
 121  #endif /* __KERNEL__ */
 122
 123  #define SIG_BLOCK          0   /* for blocking signals */
 124 diff -urN linux-2.4.26-pre5/include/asm-m68k/signal.h linux-2.4.26-pre5-netdev-core/include/asm-m68k/signal.h
 125 --- linux-2.4.26-pre5/include/asm-m68k/signal.h Fri Feb 20 07:38:33 2004
 126 +++ linux-2.4.26-pre5-netdev-core/include/asm-m68k/signal.h     Sun Mar 21 10:16:14 2004
 127 @@ -116,7 +116,14 @@
 128  #define SA_PROBE               SA_ONESHOT
 129  #define SA_SAMPLE_RANDOM       SA_RESTART
 130  #define SA_SHIRQ               0x04000000
 131 +
 132 +#ifdef CONFIG_NET_RANDOM
 133 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 134 +#else
 135 +#define SA_NET_RANDOM  0
 136  #endif
 137 +
 138 +#endif /* __KERNEL__ */
 139
 140  #define SIG_BLOCK          0   /* for blocking signals */
 141  #define SIG_UNBLOCK        1   /* for unblocking signals */
 142 diff -urN linux-2.4.26-pre5/include/asm-mips/signal.h linux-2.4.26-pre5-netdev-core/include/asm-mips/signal.h
 143 --- linux-2.4.26-pre5/include/asm-mips/signal.h Sat Sep 13 07:57:31 2003
 144 +++ linux-2.4.26-pre5-netdev-core/include/asm-mips/signal.h     Sun Mar 21 10:16:14 2004
 145 @@ -111,6 +111,12 @@
 146  #define SA_SAMPLE_RANDOM       SA_RESTART
 147  #define SA_SHIRQ               0x02000000
 148
 149 +#ifdef CONFIG_NET_RANDOM
 150 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 151 +#else
 152 +#define SA_NET_RANDOM  0
 153 +#endif
 154 +
 155  #endif /* __KERNEL__ */
 156
 157  #define SIG_BLOCK      1       /* for blocking signals */
 158 diff -urN linux-2.4.26-pre5/include/asm-mips64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-mips64/signal.h
 159 --- linux-2.4.26-pre5/include/asm-mips64/signal.h       Sat Sep 13 07:57:32 2003
 160 +++ linux-2.4.26-pre5-netdev-core/include/asm-mips64/signal.h   Sun Mar 21 10:16:14 2004
 161 @@ -119,6 +119,12 @@
 162  #define SA_SAMPLE_RANDOM       SA_RESTART
 163  #define SA_SHIRQ               0x02000000
 164
 165 +#ifdef CONFIG_NET_RANDOM
 166 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 167 +#else
 168 +#define SA_NET_RANDOM  0
 169 +#endif
 170 +
 171  #endif /* __KERNEL__ */
 172
 173  #define SIG_BLOCK      1       /* for blocking signals */
 174 diff -urN linux-2.4.26-pre5/include/asm-parisc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-parisc/signal.h
 175 --- linux-2.4.26-pre5/include/asm-parisc/signal.h       Sun Jan 11 18:48:21 2004
 176 +++ linux-2.4.26-pre5-netdev-core/include/asm-parisc/signal.h   Sun Mar 21 10:16:14 2004
 177 @@ -100,6 +100,12 @@
 178  #define SA_SAMPLE_RANDOM       SA_RESTART
 179  #define SA_SHIRQ               0x04000000
 180
 181 +#ifdef CONFIG_NET_RANDOM
 182 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 183 +#else
 184 +#define SA_NET_RANDOM  0
 185 +#endif
 186 +
 187  #endif /* __KERNEL__ */
 188
 189  #define SIG_BLOCK          0   /* for blocking signals */
 190 diff -urN linux-2.4.26-pre5/include/asm-ppc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-ppc/signal.h
 191 --- linux-2.4.26-pre5/include/asm-ppc/signal.h  Sat Sep 13 07:57:32 2003
 192 +++ linux-2.4.26-pre5-netdev-core/include/asm-ppc/signal.h      Sun Mar 21 10:16:14 2004
 193 @@ -111,6 +111,13 @@
 194  #define SA_PROBE               SA_ONESHOT
 195  #define SA_SAMPLE_RANDOM       SA_RESTART
 196  #define SA_SHIRQ               0x04000000
 197 +
 198 +#ifdef CONFIG_NET_RANDOM
 199 +#define SA_NET_RANDOM SA_SAMPLE_RANDOM
 200 +#else
 201 +#define SA_NET_RANDOM 0
 202 +#endif
 203 +
 204  #endif /* __KERNEL__ */
 205
 206  #define SIG_BLOCK          0   /* for blocking signals */
 207 diff -urN linux-2.4.26-pre5/include/asm-s390/signal.h linux-2.4.26-pre5-netdev-core/include/asm-s390/signal.h
 208 --- linux-2.4.26-pre5/include/asm-s390/signal.h Fri Feb 20 07:38:34 2004
 209 +++ linux-2.4.26-pre5-netdev-core/include/asm-s390/signal.h     Sun Mar 21 10:16:14 2004
 210 @@ -129,7 +129,14 @@
 211  #define SA_SHIRQ                0x04000000
 212  #define SA_DOPATHGROUP          0x00100000
 213  #define SA_FORCE                0x00200000
 214 +
 215 +#ifdef CONFIG_NET_RANDOM
 216 +#define SA_NET_RANDOM          SA_SAMPLE_RANDOM
 217 +#else
 218 +#define SA_NET_RANDOM          0
 219  #endif
 220 +
 221 +#endif /* __KERNEL__ */
 222
 223  #define SIG_BLOCK          0    /* for blocking signals */
 224  #define SIG_UNBLOCK        1    /* for unblocking signals */
 225 diff -urN linux-2.4.26-pre5/include/asm-s390x/signal.h linux-2.4.26-pre5-netdev-core/include/asm-s390x/signal.h
 226 --- linux-2.4.26-pre5/include/asm-s390x/signal.h        Fri Feb 20 07:38:34 2004
 227 +++ linux-2.4.26-pre5-netdev-core/include/asm-s390x/signal.h    Sun Mar 21 10:16:14 2004
 228 @@ -129,7 +129,14 @@
 229  #define SA_SHIRQ                0x04000000
 230  #define SA_DOPATHGROUP          0x00100000
 231  #define SA_FORCE                0x00200000
 232 +
 233 +#ifdef CONFIG_NET_RANDOM
 234 +#define SA_NET_RANDOM          SA_SAMPLE_RANDOM
 235 +#else
 236 +#define SA_NET_RANDOM          0
 237  #endif
 238 +
 239 +#endif /* __KERNEL__ */
 240
 241  #define SIG_BLOCK          0    /* for blocking signals */
 242  #define SIG_UNBLOCK        1    /* for unblocking signals */
 243 diff -urN linux-2.4.26-pre5/include/asm-sh/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sh/signal.h
 244 --- linux-2.4.26-pre5/include/asm-sh/signal.h   Sat Dec  1 18:27:13 2001
 245 +++ linux-2.4.26-pre5-netdev-core/include/asm-sh/signal.h       Sun Mar 21 10:16:14 2004
 246 @@ -107,7 +107,14 @@
 247  #define SA_PROBE               SA_ONESHOT
 248  #define SA_SAMPLE_RANDOM       SA_RESTART
 249  #define SA_SHIRQ               0x04000000
 250 +
 251 +#ifdef CONFIG_NET_RANDOM
 252 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 253 +#else
 254 +#define SA_NET_RANDOM  0
 255  #endif
 256 +
 257 +#endif /* __KERNEL__ */
 258
 259  #define SIG_BLOCK          0   /* for blocking signals */
 260  #define SIG_UNBLOCK        1   /* for unblocking signals */
 261 diff -urN linux-2.4.26-pre5/include/asm-sparc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sparc/signal.h
 262 --- linux-2.4.26-pre5/include/asm-sparc/signal.h        Sat Dec  1 18:27:14 2001
 263 +++ linux-2.4.26-pre5-netdev-core/include/asm-sparc/signal.h    Sun Mar 21 10:16:14 2004
 264 @@ -176,7 +176,14 @@
 265  #define SA_PROBE SA_ONESHOT
 266  #define SA_SAMPLE_RANDOM SA_RESTART
 267  #define SA_STATIC_ALLOC                0x80
 268 +
 269 +#ifdef CONFIG_NET_RANDOM
 270 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 271 +#else
 272 +#define SA_NET_RANDOM  0
 273  #endif
 274 +
 275 +#endif /* __KERNEL__ */
 276
 277  /* Type of a signal handler.  */
 278  #ifdef __KERNEL__
 279 diff -urN linux-2.4.26-pre5/include/asm-sparc64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sparc64/signal.h
 280 --- linux-2.4.26-pre5/include/asm-sparc64/signal.h      Sat Dec  1 18:27:14 2001
 281 +++ linux-2.4.26-pre5-netdev-core/include/asm-sparc64/signal.h  Sun Mar 21 10:16:14 2004
 282 @@ -192,7 +192,14 @@
 283  #define SA_PROBE SA_ONESHOT
 284  #define SA_SAMPLE_RANDOM SA_RESTART
 285  #define SA_STATIC_ALLOC                0x80
 286 +
 287 +#ifdef CONFIG_NET_RANDOM
 288 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 289 +#else
 290 +#define SA_NET_RANDOM  0
 291  #endif
 292 +
 293 +#endif /* __KERNEL__ */
 294
 295  /* Type of a signal handler.  */
 296  #ifdef __KERNEL__