netdev-random-core-rml-2.4.18-1.patch

   1 diff -urN linux-2.4.18/Documentation/Configure.help linux/Documentation/Configure.help
   2 --- linux-2.4.18/Documentation/Configure.help   Mon Feb 18 16:41:04 2002
   3 +++ linux/Documentation/Configure.help  Thu Feb 21 00:00:39 2002
   4 @@ -9100,6 +9100,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.18/drivers/net/Config.in linux/drivers/net/Config.in
  26 --- linux-2.4.18/drivers/net/Config.in  Mon Feb 18 16:40:13 2002
  27 +++ linux/drivers/net/Config.in Thu Feb 21 00:00:39 2002
  28 @@ -9,6 +9,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.18/include/asm-alpha/signal.h linux/include/asm-alpha/signal.h
  37 --- linux-2.4.18/include/asm-alpha/signal.h     Mon Feb 18 16:39:58 2002
  38 +++ linux/include/asm-alpha/signal.h    Thu Feb 21 00:00:39 2002
  39 @@ -121,8 +121,15 @@
  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  #define SIG_SETMASK        3   /* for setting the signal mask */
  55 diff -urN linux-2.4.18/include/asm-arm/signal.h linux/include/asm-arm/signal.h
  56 --- linux-2.4.18/include/asm-arm/signal.h       Mon Feb 18 16:40:02 2002
  57 +++ linux/include/asm-arm/signal.h      Thu Feb 21 00:00:39 2002
  58 @@ -126,8 +126,15 @@
  59  #define SA_SAMPLE_RANDOM       0x10000000
  60  #define SA_IRQNOMASK           0x08000000
  61  #define SA_SHIRQ               0x04000000
  62 +
  63 +#ifdef CONFIG_NET_RANDOM
  64 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
  65 +#else
  66 +#define SA_NET_RANDOM  0
  67  #endif
  68
  69 +#endif /* __KERNEL__ */
  70 +
  71  #define SIG_BLOCK          0   /* for blocking signals */
  72  #define SIG_UNBLOCK        1   /* for unblocking signals */
  73  #define SIG_SETMASK        2   /* for setting the signal mask */
  74 diff -urN linux-2.4.18/include/asm-cris/signal.h linux/include/asm-cris/signal.h
  75 --- linux-2.4.18/include/asm-cris/signal.h      Mon Feb 18 16:40:04 2002
  76 +++ linux/include/asm-cris/signal.h     Thu Feb 21 00:00:39 2002
  77 @@ -120,8 +120,15 @@
  78  #define SA_PROBE               SA_ONESHOT
  79  #define SA_SAMPLE_RANDOM       SA_RESTART
  80  #define SA_SHIRQ               0x04000000
  81 +
  82 +#ifdef CONFIG_NET_RANDOM
  83 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
  84 +#else
  85 +#define SA_NET_RANDOM  0
  86  #endif
  87
  88 +#endif /* __KERNEL__ */
  89 +
  90  #define SIG_BLOCK          0   /* for blocking signals */
  91  #define SIG_UNBLOCK        1   /* for unblocking signals */
  92  #define SIG_SETMASK        2   /* for setting the signal mask */
  93 diff -urN linux-2.4.18/include/asm-i386/signal.h linux/include/asm-i386/signal.h
  94 --- linux-2.4.18/include/asm-i386/signal.h      Mon Feb 18 16:39:57 2002
  95 +++ linux/include/asm-i386/signal.h     Thu Feb 21 00:00:39 2002
  96 @@ -119,8 +119,15 @@
  97  #define SA_PROBE               SA_ONESHOT
  98  #define SA_SAMPLE_RANDOM       SA_RESTART
  99  #define SA_SHIRQ               0x04000000
 100 +
 101 +#ifdef CONFIG_NET_RANDOM
 102 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 103 +#else
 104 +#define SA_NET_RANDOM  0
 105  #endif
 106
 107 +#endif /* __KERNEL__ */
 108 +
 109  #define SIG_BLOCK          0   /* for blocking signals */
 110  #define SIG_UNBLOCK        1   /* for unblocking signals */
 111  #define SIG_SETMASK        2   /* for setting the signal mask */
 112 diff -urN linux-2.4.18/include/asm-ia64/signal.h linux/include/asm-ia64/signal.h
 113 --- linux-2.4.18/include/asm-ia64/signal.h      Mon Feb 18 16:40:02 2002
 114 +++ linux/include/asm-ia64/signal.h     Thu Feb 21 00:00:39 2002
 115 @@ -116,6 +116,12 @@
 116  #define SA_SAMPLE_RANDOM       SA_RESTART
 117  #define SA_SHIRQ               0x04000000
 118
 119 +#ifdef CONFIG_NET_RANDOM
 120 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 121 +#else
 122 +#define SA_NET_RANDOM  0
 123 +#endif
 124 +
 125  #endif /* __KERNEL__ */
 126
 127  #define SIG_BLOCK          0   /* for blocking signals */
 128 diff -urN linux-2.4.18/include/asm-m68k/signal.h linux/include/asm-m68k/signal.h
 129 --- linux-2.4.18/include/asm-m68k/signal.h      Mon Feb 18 16:39:58 2002
 130 +++ linux/include/asm-m68k/signal.h     Thu Feb 21 00:00:39 2002
 131 @@ -116,8 +116,15 @@
 132  #define SA_PROBE               SA_ONESHOT
 133  #define SA_SAMPLE_RANDOM       SA_RESTART
 134  #define SA_SHIRQ               0x04000000
 135 +
 136 +#ifdef CONFIG_NET_RANDOM
 137 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 138 +#else
 139 +#define SA_NET_RANDOM  0
 140  #endif
 141
 142 +#endif /* __KERNEL__ */
 143 +
 144  #define SIG_BLOCK          0   /* for blocking signals */
 145  #define SIG_UNBLOCK        1   /* for unblocking signals */
 146  #define SIG_SETMASK        2   /* for setting the signal mask */
 147 diff -urN linux-2.4.18/include/asm-mips/signal.h linux/include/asm-mips/signal.h
 148 --- linux-2.4.18/include/asm-mips/signal.h      Mon Feb 18 16:39:57 2002
 149 +++ linux/include/asm-mips/signal.h     Thu Feb 21 00:00:39 2002
 150 @@ -111,6 +111,12 @@
 151  #define SA_SAMPLE_RANDOM       SA_RESTART
 152  #define SA_SHIRQ               0x02000000
 153
 154 +#ifdef CONFIG_NET_RANDOM
 155 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 156 +#else
 157 +#define SA_NET_RANDOM  0
 158 +#endif
 159 +
 160  #endif /* __KERNEL__ */
 161
 162  #define SIG_BLOCK      1       /* for blocking signals */
 163 diff -urN linux-2.4.18/include/asm-mips64/signal.h linux/include/asm-mips64/signal.h
 164 --- linux-2.4.18/include/asm-mips64/signal.h    Mon Feb 18 16:40:03 2002
 165 +++ linux/include/asm-mips64/signal.h   Thu Feb 21 00:00:39 2002
 166 @@ -111,6 +111,12 @@
 167  #define SA_SAMPLE_RANDOM       SA_RESTART
 168  #define SA_SHIRQ               0x02000000
 169
 170 +#ifdef CONFIG_NET_RANDOM
 171 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 172 +#else
 173 +#define SA_NET_RANDOM  0
 174 +#endif
 175 +
 176  #endif /* __KERNEL__ */
 177
 178  #define SIG_BLOCK      1       /* for blocking signals */
 179 diff -urN linux-2.4.18/include/asm-parisc/signal.h linux/include/asm-parisc/signal.h
 180 --- linux-2.4.18/include/asm-parisc/signal.h    Mon Feb 18 16:40:03 2002
 181 +++ linux/include/asm-parisc/signal.h   Thu Feb 21 00:00:39 2002
 182 @@ -100,6 +100,12 @@
 183  #define SA_SAMPLE_RANDOM       SA_RESTART
 184  #define SA_SHIRQ               0x04000000
 185
 186 +#ifdef CONFIG_NET_RANDOM
 187 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 188 +#else
 189 +#define SA_NET_RANDOM  0
 190 +#endif
 191 +
 192  #endif /* __KERNEL__ */
 193
 194  #define SIG_BLOCK          0   /* for blocking signals */
 195 diff -urN linux-2.4.18/include/asm-ppc/signal.h linux/include/asm-ppc/signal.h
 196 --- linux-2.4.18/include/asm-ppc/signal.h       Mon Feb 18 16:39:58 2002
 197 +++ linux/include/asm-ppc/signal.h      Thu Feb 21 00:00:39 2002
 198 @@ -114,8 +114,15 @@
 199  #define SA_PROBE               SA_ONESHOT
 200  #define SA_SAMPLE_RANDOM       SA_RESTART
 201  #define SA_SHIRQ               0x04000000
 202 +
 203 +#ifdef CONFIG_NET_RANDOM
 204 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 205 +#else
 206 +#define SA_NET_RANDOM  0
 207  #endif
 208
 209 +#endif /* __KERNEL__ */
 210 +
 211  #define SIG_BLOCK          0   /* for blocking signals */
 212  #define SIG_UNBLOCK        1   /* for unblocking signals */
 213  #define SIG_SETMASK        2   /* for setting the signal mask */
 214 diff -urN linux-2.4.18/include/asm-s390/signal.h linux/include/asm-s390/signal.h
 215 --- linux-2.4.18/include/asm-s390/signal.h      Mon Feb 18 16:40:03 2002
 216 +++ linux/include/asm-s390/signal.h     Thu Feb 21 00:00:39 2002
 217 @@ -127,8 +127,15 @@
 218  #define SA_PROBE                SA_ONESHOT
 219  #define SA_SAMPLE_RANDOM        SA_RESTART
 220  #define SA_SHIRQ                0x04000000
 221 +
 222 +#ifdef CONFIG_NET_RANDOM
 223 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 224 +#else
 225 +#define SA_NET_RANDOM  0
 226  #endif
 227
 228 +#endif /* __KERNEL__ */
 229 +
 230  #define SIG_BLOCK          0    /* for blocking signals */
 231  #define SIG_UNBLOCK        1    /* for unblocking signals */
 232  #define SIG_SETMASK        2    /* for setting the signal mask */
 233 diff -urN linux-2.4.18/include/asm-s390x/signal.h linux/include/asm-s390x/signal.h
 234 --- linux-2.4.18/include/asm-s390x/signal.h     Mon Feb 18 16:40:04 2002
 235 +++ linux/include/asm-s390x/signal.h    Thu Feb 21 00:00:39 2002
 236 @@ -127,8 +127,15 @@
 237  #define SA_PROBE                SA_ONESHOT
 238  #define SA_SAMPLE_RANDOM        SA_RESTART
 239  #define SA_SHIRQ                0x04000000
 240 +
 241 +#ifdef CONFIG_NET_RANDOM
 242 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 243 +#else
 244 +#define SA_NET_RANDOM  0
 245  #endif
 246
 247 +#endif /* __KERNEL__ */
 248 +
 249  #define SIG_BLOCK          0    /* for blocking signals */
 250  #define SIG_UNBLOCK        1    /* for unblocking signals */
 251  #define SIG_SETMASK        2    /* for setting the signal mask */
 252 diff -urN linux-2.4.18/include/asm-sh/signal.h linux/include/asm-sh/signal.h
 253 --- linux-2.4.18/include/asm-sh/signal.h        Mon Feb 18 16:40:02 2002
 254 +++ linux/include/asm-sh/signal.h       Thu Feb 21 00:00:39 2002
 255 @@ -107,8 +107,15 @@
 256  #define SA_PROBE               SA_ONESHOT
 257  #define SA_SAMPLE_RANDOM       SA_RESTART
 258  #define SA_SHIRQ               0x04000000
 259 +
 260 +#ifdef CONFIG_NET_RANDOM
 261 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 262 +#else
 263 +#define SA_NET_RANDOM  0
 264  #endif
 265
 266 +#endif /* __KERNEL__ */
 267 +
 268  #define SIG_BLOCK          0   /* for blocking signals */
 269  #define SIG_UNBLOCK        1   /* for unblocking signals */
 270  #define SIG_SETMASK        2   /* for setting the signal mask */
 271 diff -urN linux-2.4.18/include/asm-sparc/signal.h linux/include/asm-sparc/signal.h
 272 --- linux-2.4.18/include/asm-sparc/signal.h     Mon Feb 18 16:39:58 2002
 273 +++ linux/include/asm-sparc/signal.h    Thu Feb 21 00:00:39 2002
 274 @@ -176,8 +176,15 @@
 275  #define SA_PROBE SA_ONESHOT
 276  #define SA_SAMPLE_RANDOM SA_RESTART
 277  #define SA_STATIC_ALLOC                0x80
 278 +
 279 +#ifdef CONFIG_NET_RANDOM
 280 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 281 +#else
 282 +#define SA_NET_RANDOM  0
 283  #endif
 284
 285 +#endif /* __KERNEL__ */
 286 +
 287  /* Type of a signal handler.  */
 288  #ifdef __KERNEL__
 289  typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
 290 diff -urN linux-2.4.18/include/asm-sparc64/signal.h linux/include/asm-sparc64/signal.h
 291 --- linux-2.4.18/include/asm-sparc64/signal.h   Mon Feb 18 16:39:59 2002
 292 +++ linux/include/asm-sparc64/signal.h  Thu Feb 21 00:00:39 2002
 293 @@ -192,8 +192,15 @@
 294  #define SA_PROBE SA_ONESHOT
 295  #define SA_SAMPLE_RANDOM SA_RESTART
 296  #define SA_STATIC_ALLOC                0x80
 297 +
 298 +#ifdef CONFIG_NET_RANDOM
 299 +#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
 300 +#else
 301 +#define SA_NET_RANDOM  0
 302  #endif
 303
 304 +#endif /* __KERNEL__ */
 305 +
 306  /* Type of a signal handler.  */
 307  #ifdef __KERNEL__
 308  typedef void (*__sighandler_t)(int, struct sigcontext *);