1 diff -urN linux-2.4.10/Documentation/Configure.help linux/Documentation/Configure.help
2 --- linux-2.4.10/Documentation/Configure.help Wed Sep 19 02:47:21 2001
3 +++ linux/Documentation/Configure.help Wed Sep 19 02:57:55 2001
6 If you don't know what to use this for, you don't need it.
8 +Allow Net Devices to contribute to /dev/random
10 + If you say Y here, network device interrupts will contribute to the
11 + kernel entropy pool at /dev/random. Normally, block devices and
12 + some other devices (keyboard, mouse) add to the pool. Some systems, such
13 + as those that are headless or diskless, need additional entropy sources.
14 + Some people, however, feel that network devices should not contribute to
15 + /dev/random because an external attacker could observe incoming packets
16 + in an attempt to learn the entropy pool's state. Note this is completely
19 + If you believe there is a chance of your network packets being observed
20 + and you doubt the security of the entropy pool's one-way hash, do not
23 Ethertap network tap (OBSOLETE)
25 If you say Y here (and have said Y to "Kernel/User network link
26 diff -urN linux-2.4.10/drivers/net/Config.in linux/drivers/net/Config.in
27 --- linux-2.4.10/drivers/net/Config.in Wed Sep 19 02:46:33 2001
28 +++ linux/drivers/net/Config.in Wed Sep 19 02:57:55 2001
30 tristate 'Bonding driver support' CONFIG_BONDING
31 tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
32 tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
33 +bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM
34 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
35 if [ "$CONFIG_NETLINK" = "y" ]; then
36 tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
37 diff -urN linux-2.4.10/include/asm-alpha/signal.h linux/include/asm-alpha/signal.h
38 --- linux-2.4.10/include/asm-alpha/signal.h Wed Sep 19 02:46:23 2001
39 +++ linux/include/asm-alpha/signal.h Wed Sep 19 02:57:55 2001
41 #define SA_PROBE SA_ONESHOT
42 #define SA_SAMPLE_RANDOM SA_RESTART
43 #define SA_SHIRQ 0x40000000
46 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
47 + * contribute to the kernel entropy pool if users want that
50 +#ifdef CONFIG_NET_RANDOM
51 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
53 +#define SA_SAMPLE_NET_RANDOM 0
56 +#endif /* __KERNEL__ */
58 #define SIG_BLOCK 1 /* for blocking signals */
59 #define SIG_UNBLOCK 2 /* for unblocking signals */
60 #define SIG_SETMASK 3 /* for setting the signal mask */
61 diff -urN linux-2.4.10/include/asm-arm/signal.h linux/include/asm-arm/signal.h
62 --- linux-2.4.10/include/asm-arm/signal.h Wed Sep 19 02:46:24 2001
63 +++ linux/include/asm-arm/signal.h Wed Sep 19 02:57:55 2001
65 #define SA_SAMPLE_RANDOM 0x10000000
66 #define SA_IRQNOMASK 0x08000000
67 #define SA_SHIRQ 0x04000000
70 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
71 + * contribute to the kernel entropy pool if users want that
74 +#ifdef CONFIG_NET_RANDOM
75 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
77 +#define SA_SAMPLE_NET_RANDOM 0
80 +#endif /* __KERNEL__ */
82 #define SIG_BLOCK 0 /* for blocking signals */
83 #define SIG_UNBLOCK 1 /* for unblocking signals */
84 #define SIG_SETMASK 2 /* for setting the signal mask */
85 diff -urN linux-2.4.10/include/asm-cris/signal.h linux/include/asm-cris/signal.h
86 --- linux-2.4.10/include/asm-cris/signal.h Wed Sep 19 02:46:25 2001
87 +++ linux/include/asm-cris/signal.h Wed Sep 19 02:57:55 2001
89 #define SA_PROBE SA_ONESHOT
90 #define SA_SAMPLE_RANDOM SA_RESTART
91 #define SA_SHIRQ 0x04000000
94 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
95 + * contribute to the kernel entropy pool if users want that
98 +#ifdef CONFIG_NET_RANDOM
99 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
101 +#define SA_SAMPLE_NET_RANDOM 0
104 +#endif /* __KERNEL__ */
106 #define SIG_BLOCK 0 /* for blocking signals */
107 #define SIG_UNBLOCK 1 /* for unblocking signals */
108 #define SIG_SETMASK 2 /* for setting the signal mask */
109 diff -urN linux-2.4.10/include/asm-i386/signal.h linux/include/asm-i386/signal.h
110 --- linux-2.4.10/include/asm-i386/signal.h Wed Sep 19 02:46:23 2001
111 +++ linux/include/asm-i386/signal.h Wed Sep 19 02:57:55 2001
113 #define SA_PROBE SA_ONESHOT
114 #define SA_SAMPLE_RANDOM SA_RESTART
115 #define SA_SHIRQ 0x04000000
118 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
119 + * contribute to the kernel entropy pool if users want that
122 +#ifdef CONFIG_NET_RANDOM
123 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
125 +#define SA_SAMPLE_NET_RANDOM 0
128 +#endif /* __KERNEL__ */
130 #define SIG_BLOCK 0 /* for blocking signals */
131 #define SIG_UNBLOCK 1 /* for unblocking signals */
132 #define SIG_SETMASK 2 /* for setting the signal mask */
133 diff -urN linux-2.4.10/include/asm-ia64/signal.h linux/include/asm-ia64/signal.h
134 --- linux-2.4.10/include/asm-ia64/signal.h Wed Sep 19 02:46:24 2001
135 +++ linux/include/asm-ia64/signal.h Wed Sep 19 02:57:55 2001
137 #define SA_SAMPLE_RANDOM SA_RESTART
138 #define SA_SHIRQ 0x04000000
141 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
142 + * contribute to the kernel entropy pool if users want that
145 +#ifdef CONFIG_NET_RANDOM
146 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
148 +#define SA_SAMPLE_NET_RANDOM 0
151 #endif /* __KERNEL__ */
153 #define SIG_BLOCK 0 /* for blocking signals */
154 diff -urN linux-2.4.10/include/asm-m68k/signal.h linux/include/asm-m68k/signal.h
155 --- linux-2.4.10/include/asm-m68k/signal.h Wed Sep 19 02:46:23 2001
156 +++ linux/include/asm-m68k/signal.h Wed Sep 19 02:57:55 2001
158 #define SA_PROBE SA_ONESHOT
159 #define SA_SAMPLE_RANDOM SA_RESTART
160 #define SA_SHIRQ 0x04000000
163 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
164 + * contribute to the kernel entropy pool if users want that
167 +#ifdef CONFIG_NET_RANDOM
168 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
170 +#define SA_SAMPLE_NET_RANDOM 0
173 +#endif /* __KERNEL__ */
175 #define SIG_BLOCK 0 /* for blocking signals */
176 #define SIG_UNBLOCK 1 /* for unblocking signals */
177 #define SIG_SETMASK 2 /* for setting the signal mask */
178 diff -urN linux-2.4.10/include/asm-mips/signal.h linux/include/asm-mips/signal.h
179 --- linux-2.4.10/include/asm-mips/signal.h Wed Sep 19 02:46:23 2001
180 +++ linux/include/asm-mips/signal.h Wed Sep 19 02:57:55 2001
182 #define SA_SAMPLE_RANDOM SA_RESTART
183 #define SA_SHIRQ 0x02000000
186 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
187 + * contribute to the kernel entropy pool if users want that
190 +#ifdef CONFIG_NET_RANDOM
191 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
193 +#define SA_SAMPLE_NET_RANDOM 0
196 #endif /* __KERNEL__ */
198 #define SIG_BLOCK 1 /* for blocking signals */
199 diff -urN linux-2.4.10/include/asm-mips64/signal.h linux/include/asm-mips64/signal.h
200 --- linux-2.4.10/include/asm-mips64/signal.h Wed Sep 19 02:46:25 2001
201 +++ linux/include/asm-mips64/signal.h Wed Sep 19 02:57:55 2001
203 #define SA_SAMPLE_RANDOM SA_RESTART
204 #define SA_SHIRQ 0x02000000
207 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
208 + * contribute to the kernel entropy pool if users want that
211 +#ifdef CONFIG_NET_RANDOM
212 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
214 +#define SA_SAMPLE_NET_RANDOM 0
217 #endif /* __KERNEL__ */
219 #define SIG_BLOCK 1 /* for blocking signals */
220 diff -urN linux-2.4.10/include/asm-parisc/signal.h linux/include/asm-parisc/signal.h
221 --- linux-2.4.10/include/asm-parisc/signal.h Wed Sep 19 02:46:25 2001
222 +++ linux/include/asm-parisc/signal.h Wed Sep 19 02:57:55 2001
224 #define SA_SAMPLE_RANDOM SA_RESTART
225 #define SA_SHIRQ 0x04000000
228 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
229 + * contribute to the kernel entropy pool if users want that
232 +#ifdef CONFIG_NET_RANDOM
233 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
235 +#define SA_SAMPLE_NET_RANDOM 0
238 #endif /* __KERNEL__ */
240 #define SIG_BLOCK 0 /* for blocking signals */
241 diff -urN linux-2.4.10/include/asm-ppc/signal.h linux/include/asm-ppc/signal.h
242 --- linux-2.4.10/include/asm-ppc/signal.h Wed Sep 19 02:46:24 2001
243 +++ linux/include/asm-ppc/signal.h Wed Sep 19 02:57:55 2001
245 #define SA_PROBE SA_ONESHOT
246 #define SA_SAMPLE_RANDOM SA_RESTART
247 #define SA_SHIRQ 0x04000000
250 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
251 + * contribute to the kernel entropy pool if users want that
254 +#ifdef CONFIG_NET_RANDOM
255 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
257 +#define SA_SAMPLE_NET_RANDOM 0
260 +#endif /* __KERNEL__ */
262 #define SIG_BLOCK 0 /* for blocking signals */
263 #define SIG_UNBLOCK 1 /* for unblocking signals */
264 #define SIG_SETMASK 2 /* for setting the signal mask */
265 diff -urN linux-2.4.10/include/asm-s390/signal.h linux/include/asm-s390/signal.h
266 --- linux-2.4.10/include/asm-s390/signal.h Wed Sep 19 02:46:25 2001
267 +++ linux/include/asm-s390/signal.h Wed Sep 19 02:57:55 2001
269 #define SA_PROBE SA_ONESHOT
270 #define SA_SAMPLE_RANDOM SA_RESTART
271 #define SA_SHIRQ 0x04000000
274 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
275 + * contribute to the kernel entropy pool if users want that
278 +#ifdef CONFIG_NET_RANDOM
279 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
281 +#define SA_SAMPLE_NET_RANDOM 0
284 +#endif /* __KERNEL__ */
286 #define SIG_BLOCK 0 /* for blocking signals */
287 #define SIG_UNBLOCK 1 /* for unblocking signals */
288 #define SIG_SETMASK 2 /* for setting the signal mask */
289 diff -urN linux-2.4.10/include/asm-s390x/signal.h linux/include/asm-s390x/signal.h
290 --- linux-2.4.10/include/asm-s390x/signal.h Wed Sep 19 02:46:25 2001
291 +++ linux/include/asm-s390x/signal.h Wed Sep 19 02:57:55 2001
293 #define SA_PROBE SA_ONESHOT
294 #define SA_SAMPLE_RANDOM SA_RESTART
295 #define SA_SHIRQ 0x04000000
298 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
299 + * contribute to the kernel entropy pool if users want that
302 +#ifdef CONFIG_NET_RANDOM
303 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
305 +#define SA_SAMPLE_NET_RANDOM 0
308 +#endif /* __KERNEL__ */
310 #define SIG_BLOCK 0 /* for blocking signals */
311 #define SIG_UNBLOCK 1 /* for unblocking signals */
312 #define SIG_SETMASK 2 /* for setting the signal mask */
313 diff -urN linux-2.4.10/include/asm-sh/signal.h linux/include/asm-sh/signal.h
314 --- linux-2.4.10/include/asm-sh/signal.h Wed Sep 19 02:46:24 2001
315 +++ linux/include/asm-sh/signal.h Wed Sep 19 02:57:55 2001
317 #define SA_PROBE SA_ONESHOT
318 #define SA_SAMPLE_RANDOM SA_RESTART
319 #define SA_SHIRQ 0x04000000
322 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
323 + * contribute to the kernel entropy pool if users want that
326 +#ifdef CONFIG_NET_RANDOM
327 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
329 +#define SA_SAMPLE_NET_RANDOM 0
332 +#endif /* __KERNEL__ */
334 #define SIG_BLOCK 0 /* for blocking signals */
335 #define SIG_UNBLOCK 1 /* for unblocking signals */
336 #define SIG_SETMASK 2 /* for setting the signal mask */
337 diff -urN linux-2.4.10/include/asm-sparc/signal.h linux/include/asm-sparc/signal.h
338 --- linux-2.4.10/include/asm-sparc/signal.h Wed Sep 19 02:46:23 2001
339 +++ linux/include/asm-sparc/signal.h Wed Sep 19 02:57:55 2001
341 #define SA_PROBE SA_ONESHOT
342 #define SA_SAMPLE_RANDOM SA_RESTART
343 #define SA_STATIC_ALLOC 0x80
346 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
347 + * contribute to the kernel entropy pool if users want that
350 +#ifdef CONFIG_NET_RANDOM
351 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
353 +#define SA_SAMPLE_NET_RANDOM 0
356 +#endif /* __KERNEL__ */
358 /* Type of a signal handler. */
360 typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
361 diff -urN linux-2.4.10/include/asm-sparc64/signal.h linux/include/asm-sparc64/signal.h
362 --- linux-2.4.10/include/asm-sparc64/signal.h Wed Sep 19 02:46:24 2001
363 +++ linux/include/asm-sparc64/signal.h Wed Sep 19 02:57:55 2001
365 #define SA_PROBE SA_ONESHOT
366 #define SA_SAMPLE_RANDOM SA_RESTART
367 #define SA_STATIC_ALLOC 0x80
370 + * Net Devices can use SA_SAMPLE_NET_RANDOM and thus only
371 + * contribute to the kernel entropy pool if users want that
374 +#ifdef CONFIG_NET_RANDOM
375 +#define SA_SAMPLE_NET_RANDOM SA_SAMPLE_RANDOM
377 +#define SA_SAMPLE_NET_RANDOM 0
380 +#endif /* __KERNEL__ */
382 /* Type of a signal handler. */
384 typedef void (*__sighandler_t)(int, struct sigcontext *);