diff -uNr linux-2.4.24.orig/Documentation/Configure.help linux-2.4.24-netdev-core/Documentation/Configure.help --- linux-2.4.24.orig/Documentation/Configure.help 2003-11-28 19:26:19.000000000 +0100 +++ linux-2.4.24-netdev-core/Documentation/Configure.help 2004-01-05 17:39:38.000000000 +0100 @@ -10298,6 +10298,20 @@ If you don't know what to use this for, you don't need it. +Allow Net Devices to contribute to /dev/random +CONFIG_NET_RANDOM + If you say Y here, network device interrupts will contribute to the + kernel entropy pool. Normally, block devices and some other devices + feed the pool. Some systems, such as those that are headless or diskless, + need additional entropy sources. Some people, however, feel that network + devices should not contribute to /dev/random because an external attacker + could observe incoming packets in an attempt to learn the entropy pool's + state. If you say N, no network device will contribute entropy. + + If you believe there is a chance of your network packets being observed + and you doubt the security of the entropy pool's one-way hash, do not + enable this. If unsure, say N. + Ethertap network tap (OBSOLETE) CONFIG_ETHERTAP If you say Y here (and have said Y to "Kernel/User network link diff -uNr linux-2.4.24.orig/drivers/net/Config.in linux-2.4.24-netdev-core/drivers/net/Config.in --- linux-2.4.24.orig/drivers/net/Config.in 2003-11-28 19:26:20.000000000 +0100 +++ linux-2.4.24-netdev-core/drivers/net/Config.in 2004-01-05 17:39:38.000000000 +0100 @@ -8,6 +8,7 @@ tristate 'Bonding driver support' CONFIG_BONDING tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER tristate 'Universal TUN/TAP device driver support' CONFIG_TUN +bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP fi diff -uNr linux-2.4.24.orig/include/asm-alpha/signal.h linux-2.4.24-netdev-core/include/asm-alpha/signal.h --- linux-2.4.24.orig/include/asm-alpha/signal.h 1998-06-24 23:30:11.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-alpha/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -121,8 +121,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x40000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + #define SIG_BLOCK 1 /* for blocking signals */ #define SIG_UNBLOCK 2 /* for unblocking signals */ #define SIG_SETMASK 3 /* for setting the signal mask */ diff -uNr linux-2.4.24.orig/include/asm-arm/signal.h linux-2.4.24-netdev-core/include/asm-arm/signal.h --- linux-2.4.24.orig/include/asm-arm/signal.h 2003-08-25 13:44:43.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-arm/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -125,8 +125,15 @@ #define SA_PROBE 0x80000000 #define SA_SAMPLE_RANDOM 0x10000000 #define SA_SHIRQ 0x04000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ diff -uNr linux-2.4.24.orig/include/asm-cris/signal.h linux-2.4.24-netdev-core/include/asm-cris/signal.h --- linux-2.4.24.orig/include/asm-cris/signal.h 2001-02-09 01:32:44.000000000 +0100 +++ linux-2.4.24-netdev-core/include/asm-cris/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -120,8 +120,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ diff -uNr linux-2.4.24.orig/include/asm-i386/signal.h linux-2.4.24-netdev-core/include/asm-i386/signal.h --- linux-2.4.24.orig/include/asm-i386/signal.h 2001-11-22 20:46:18.000000000 +0100 +++ linux-2.4.24-netdev-core/include/asm-i386/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -119,8 +119,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ diff -uNr linux-2.4.24.orig/include/asm-ia64/signal.h linux-2.4.24-netdev-core/include/asm-ia64/signal.h --- linux-2.4.24.orig/include/asm-ia64/signal.h 2002-08-03 02:39:45.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-ia64/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -117,6 +117,12 @@ #define SA_SHIRQ 0x04000000 #define SA_PERCPU_IRQ 0x02000000 +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 +#endif + #endif /* __KERNEL__ */ #define SIG_BLOCK 0 /* for blocking signals */ diff -uNr linux-2.4.24.orig/include/asm-m68k/signal.h linux-2.4.24-netdev-core/include/asm-m68k/signal.h --- linux-2.4.24.orig/include/asm-m68k/signal.h 1999-11-19 04:37:03.000000000 +0100 +++ linux-2.4.24-netdev-core/include/asm-m68k/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -116,8 +116,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ diff -uNr linux-2.4.24.orig/include/asm-mips/signal.h linux-2.4.24-netdev-core/include/asm-mips/signal.h --- linux-2.4.24.orig/include/asm-mips/signal.h 2003-08-25 13:44:44.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-mips/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -111,6 +111,12 @@ #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x02000000 +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 +#endif + #endif /* __KERNEL__ */ #define SIG_BLOCK 1 /* for blocking signals */ diff -uNr linux-2.4.24.orig/include/asm-mips64/signal.h linux-2.4.24-netdev-core/include/asm-mips64/signal.h --- linux-2.4.24.orig/include/asm-mips64/signal.h 2003-08-25 13:44:44.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-mips64/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -119,6 +119,12 @@ #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x02000000 +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 +#endif + #endif /* __KERNEL__ */ #define SIG_BLOCK 1 /* for blocking signals */ diff -uNr linux-2.4.24.orig/include/asm-parisc/signal.h linux-2.4.24-netdev-core/include/asm-parisc/signal.h --- linux-2.4.24.orig/include/asm-parisc/signal.h 2000-12-05 21:29:39.000000000 +0100 +++ linux-2.4.24-netdev-core/include/asm-parisc/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -100,6 +100,12 @@ #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 +#endif + #endif /* __KERNEL__ */ #define SIG_BLOCK 0 /* for blocking signals */ diff -uNr linux-2.4.24.orig/include/asm-ppc/signal.h linux-2.4.24-netdev-core/include/asm-ppc/signal.h --- linux-2.4.24.orig/include/asm-ppc/signal.h 2003-08-25 13:44:44.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-ppc/signal.h 2004-01-05 17:41:21.000000000 +0100 @@ -111,6 +111,13 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 +#endif + #endif /* __KERNEL__ */ #define SIG_BLOCK 0 /* for blocking signals */ diff -uNr linux-2.4.24.orig/include/asm-s390/signal.h linux-2.4.24-netdev-core/include/asm-s390/signal.h --- linux-2.4.24.orig/include/asm-s390/signal.h 2001-04-12 04:02:28.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-s390/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -127,8 +127,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ diff -uNr linux-2.4.24.orig/include/asm-s390x/signal.h linux-2.4.24-netdev-core/include/asm-s390x/signal.h --- linux-2.4.24.orig/include/asm-s390x/signal.h 2001-07-25 23:12:02.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-s390x/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -127,8 +127,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ diff -uNr linux-2.4.24.orig/include/asm-sh/signal.h linux-2.4.24-netdev-core/include/asm-sh/signal.h --- linux-2.4.24.orig/include/asm-sh/signal.h 1999-11-19 04:37:03.000000000 +0100 +++ linux-2.4.24-netdev-core/include/asm-sh/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -107,8 +107,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ diff -uNr linux-2.4.24.orig/include/asm-sparc/signal.h linux-2.4.24-netdev-core/include/asm-sparc/signal.h --- linux-2.4.24.orig/include/asm-sparc/signal.h 1999-09-08 20:14:32.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-sparc/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -176,8 +176,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_STATIC_ALLOC 0x80 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + /* Type of a signal handler. */ #ifdef __KERNEL__ typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *); diff -uNr linux-2.4.24.orig/include/asm-sparc64/signal.h linux-2.4.24-netdev-core/include/asm-sparc64/signal.h --- linux-2.4.24.orig/include/asm-sparc64/signal.h 1999-09-08 20:14:32.000000000 +0200 +++ linux-2.4.24-netdev-core/include/asm-sparc64/signal.h 2004-01-05 17:39:38.000000000 +0100 @@ -192,8 +192,15 @@ #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_STATIC_ALLOC 0x80 + +#ifdef CONFIG_NET_RANDOM +#define SA_NET_RANDOM SA_SAMPLE_RANDOM +#else +#define SA_NET_RANDOM 0 #endif +#endif /* __KERNEL__ */ + /* Type of a signal handler. */ #ifdef __KERNEL__ typedef void (*__sighandler_t)(int, struct sigcontext *);