Home Explore Help
Sign In
OpenWrt
/
openwrt
mirror of https://github.com/openwrt/openwrt.git
2
0
Fork 0
Files Issues 0 Wiki
Tree: dfe741470a
Branches Tags
openwrt
/
target
/
linux
/
generic-2.4
/
patches
/
110-netdev_random_core.patch

110-netdev_random_core.patch 11 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323 
  1. Index: linux-2.4.35.4/Documentation/Configure.help
    2. 

  2. ===================================================================
    3. 

  3. --- linux-2.4.35.4.orig/Documentation/Configure.help
    4. 

  4. +++ linux-2.4.35.4/Documentation/Configure.help
    5. 

  5. @@ -10675,6 +10675,20 @@ CONFIG_TUN
    6. 

  6.  
    7. 

  7.    If you don't know what to use this for, you don't need it.
    8. 

  8.  
    9. 

  9. +Allow Net Devices to contribute to /dev/random
    10. 

  10. +CONFIG_NET_RANDOM
    11. 

  11. +  If you say Y here, network device interrupts will contribute to the
    12. 

  12. +  kernel entropy pool. Normally, block devices and some other devices
    13. 

  13. +  feed the pool. Some systems, such as those that are headless or diskless,
    14. 

  14. +  need additional entropy sources.  Some people, however, feel that network
    15. 

  15. +  devices should not contribute to /dev/random because an external attacker
    16. 

  16. +  could observe incoming packets in an attempt to learn the entropy pool's
    17. 

  17. +  state.  If you say N, no network device will contribute entropy.
    18. 

  18. +
    19. 

  19. +  If you believe there is a chance of your network packets being observed
    20. 

  20. +  and you doubt the security of the entropy pool's one-way hash, do not
    21. 

  21. +  enable this.  If unsure, say N.
    22. 

  22. +
    23. 

  23.  Ethertap network tap (OBSOLETE)
    24. 

  24.  CONFIG_ETHERTAP
    25. 

  25.    If you say Y here (and have said Y to "Kernel/User network link
    26. 

  26. Index: linux-2.4.35.4/drivers/net/Config.in
    27. 

  27. ===================================================================
    28. 

  28. --- linux-2.4.35.4.orig/drivers/net/Config.in
    29. 

  29. +++ linux-2.4.35.4/drivers/net/Config.in
    30. 

  30. @@ -8,6 +8,7 @@ tristate 'Dummy net driver support' CONF
    31. 

  31.  tristate 'Bonding driver support' CONFIG_BONDING
    32. 

  32.  tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
    33. 

  33.  tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
    34. 

  34. +bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM
    35. 

  35.  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    36. 

  36.     tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
    37. 

  37.  fi
    38. 

  38. Index: linux-2.4.35.4/include/asm-alpha/signal.h
    39. 

  39. ===================================================================
    40. 

  40. --- linux-2.4.35.4.orig/include/asm-alpha/signal.h
    41. 

  41. +++ linux-2.4.35.4/include/asm-alpha/signal.h
    42. 

  42. @@ -121,8 +121,15 @@ typedef unsigned long sigset_t;
    43. 

  43.  #define SA_PROBE		SA_ONESHOT
    44. 

  44.  #define SA_SAMPLE_RANDOM	SA_RESTART
    45. 

  45.  #define SA_SHIRQ		0x40000000
    46. 

  46. +
    47. 

  47. +#ifdef CONFIG_NET_RANDOM
    48. 

  48. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    49. 

  49. +#else
    50. 

  50. +#define SA_NET_RANDOM	0
    51. 

  51.  #endif
    52. 

  52.  
    53. 

  53. +#endif /* __KERNEL__ */
    54. 

  54. +
    55. 

  55.  #define SIG_BLOCK          1	/* for blocking signals */
    56. 

  56.  #define SIG_UNBLOCK        2	/* for unblocking signals */
    57. 

  57.  #define SIG_SETMASK        3	/* for setting the signal mask */
    58. 

  58. Index: linux-2.4.35.4/include/asm-arm/signal.h
    59. 

  59. ===================================================================
    60. 

  60. --- linux-2.4.35.4.orig/include/asm-arm/signal.h
    61. 

  61. +++ linux-2.4.35.4/include/asm-arm/signal.h
    62. 

  62. @@ -125,8 +125,15 @@ typedef unsigned long sigset_t;
    63. 

  63.  #define SA_PROBE		0x80000000
    64. 

  64.  #define SA_SAMPLE_RANDOM	0x10000000
    65. 

  65.  #define SA_SHIRQ		0x04000000
    66. 

  66. +
    67. 

  67. +#ifdef CONFIG_NET_RANDOM
    68. 

  68. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    69. 

  69. +#else
    70. 

  70. +#define SA_NET_RANDOM	0
    71. 

  71.  #endif
    72. 

  72.  
    73. 

  73. +#endif /* __KERNEL__ */
    74. 

  74. +
    75. 

  75.  #define SIG_BLOCK          0	/* for blocking signals */
    76. 

  76.  #define SIG_UNBLOCK        1	/* for unblocking signals */
    77. 

  77.  #define SIG_SETMASK        2	/* for setting the signal mask */
    78. 

  78. Index: linux-2.4.35.4/include/asm-cris/signal.h
    79. 

  79. ===================================================================
    80. 

  80. --- linux-2.4.35.4.orig/include/asm-cris/signal.h
    81. 

  81. +++ linux-2.4.35.4/include/asm-cris/signal.h
    82. 

  82. @@ -120,8 +120,15 @@ typedef unsigned long sigset_t;
    83. 

  83.  #define SA_PROBE		SA_ONESHOT
    84. 

  84.  #define SA_SAMPLE_RANDOM	SA_RESTART
    85. 

  85.  #define SA_SHIRQ		0x04000000
    86. 

  86. +
    87. 

  87. +#ifdef CONFIG_NET_RANDOM
    88. 

  88. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    89. 

  89. +#else
    90. 

  90. +#define SA_NET_RANDOM	0
    91. 

  91.  #endif
    92. 

  92.  
    93. 

  93. +#endif /* __KERNEL__ */
    94. 

  94. +
    95. 

  95.  #define SIG_BLOCK          0	/* for blocking signals */
    96. 

  96.  #define SIG_UNBLOCK        1	/* for unblocking signals */
    97. 

  97.  #define SIG_SETMASK        2	/* for setting the signal mask */
    98. 

  98. Index: linux-2.4.35.4/include/asm-i386/signal.h
    99. 

  99. ===================================================================
    100. 

  100. --- linux-2.4.35.4.orig/include/asm-i386/signal.h
    101. 

  101. +++ linux-2.4.35.4/include/asm-i386/signal.h
    102. 

  102. @@ -119,8 +119,15 @@ typedef unsigned long sigset_t;
    103. 

  103.  #define SA_PROBE		SA_ONESHOT
    104. 

  104.  #define SA_SAMPLE_RANDOM	SA_RESTART
    105. 

  105.  #define SA_SHIRQ		0x04000000
    106. 

  106. +
    107. 

  107. +#ifdef CONFIG_NET_RANDOM
    108. 

  108. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    109. 

  109. +#else
    110. 

  110. +#define SA_NET_RANDOM	0
    111. 

  111.  #endif
    112. 

  112.  
    113. 

  113. +#endif /* __KERNEL__ */
    114. 

  114. +
    115. 

  115.  #define SIG_BLOCK          0	/* for blocking signals */
    116. 

  116.  #define SIG_UNBLOCK        1	/* for unblocking signals */
    117. 

  117.  #define SIG_SETMASK        2	/* for setting the signal mask */
    118. 

  118. Index: linux-2.4.35.4/include/asm-ia64/signal.h
    119. 

  119. ===================================================================
    120. 

  120. --- linux-2.4.35.4.orig/include/asm-ia64/signal.h
    121. 

  121. +++ linux-2.4.35.4/include/asm-ia64/signal.h
    122. 

  122. @@ -117,6 +117,12 @@
    123. 

  123.  #define SA_SHIRQ		0x04000000
    124. 

  124.  #define SA_PERCPU_IRQ		0x02000000
    125. 

  125.  
    126. 

  126. +#ifdef CONFIG_NET_RANDOM
    127. 

  127. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    128. 

  128. +#else
    129. 

  129. +#define SA_NET_RANDOM	0
    130. 

  130. +#endif
    131. 

  131. +
    132. 

  132.  #endif /* __KERNEL__ */
    133. 

  133.  
    134. 

  134.  #define SIG_BLOCK          0	/* for blocking signals */
    135. 

  135. Index: linux-2.4.35.4/include/asm-m68k/signal.h
    136. 

  136. ===================================================================
    137. 

  137. --- linux-2.4.35.4.orig/include/asm-m68k/signal.h
    138. 

  138. +++ linux-2.4.35.4/include/asm-m68k/signal.h
    139. 

  139. @@ -116,8 +116,15 @@ typedef unsigned long sigset_t;
    140. 

  140.  #define SA_PROBE		SA_ONESHOT
    141. 

  141.  #define SA_SAMPLE_RANDOM	SA_RESTART
    142. 

  142.  #define SA_SHIRQ		0x04000000
    143. 

  143. +
    144. 

  144. +#ifdef CONFIG_NET_RANDOM
    145. 

  145. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    146. 

  146. +#else
    147. 

  147. +#define SA_NET_RANDOM	0
    148. 

  148.  #endif
    149. 

  149.  
    150. 

  150. +#endif /* __KERNEL__ */
    151. 

  151. +
    152. 

  152.  #define SIG_BLOCK          0	/* for blocking signals */
    153. 

  153.  #define SIG_UNBLOCK        1	/* for unblocking signals */
    154. 

  154.  #define SIG_SETMASK        2	/* for setting the signal mask */
    155. 

  155. Index: linux-2.4.35.4/include/asm-mips/signal.h
    156. 

  156. ===================================================================
    157. 

  157. --- linux-2.4.35.4.orig/include/asm-mips/signal.h
    158. 

  158. +++ linux-2.4.35.4/include/asm-mips/signal.h
    159. 

  159. @@ -111,6 +111,12 @@ typedef unsigned long old_sigset_t;		/* 
    160. 

  160.  #define SA_SAMPLE_RANDOM	SA_RESTART
    161. 

  161.  #define SA_SHIRQ		0x02000000
    162. 

  162.  
    163. 

  163. +#ifdef CONFIG_NET_RANDOM
    164. 

  164. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    165. 

  165. +#else
    166. 

  166. +#define SA_NET_RANDOM	0
    167. 

  167. +#endif
    168. 

  168. +
    169. 

  169.  #endif /* __KERNEL__ */
    170. 

  170.  
    171. 

  171.  #define SIG_BLOCK	1	/* for blocking signals */
    172. 

  172. Index: linux-2.4.35.4/include/asm-mips64/signal.h
    173. 

  173. ===================================================================
    174. 

  174. --- linux-2.4.35.4.orig/include/asm-mips64/signal.h
    175. 

  175. +++ linux-2.4.35.4/include/asm-mips64/signal.h
    176. 

  176. @@ -119,6 +119,12 @@ typedef unsigned int old_sigset_t32;
    177. 

  177.  #define SA_SAMPLE_RANDOM	SA_RESTART
    178. 

  178.  #define SA_SHIRQ		0x02000000
    179. 

  179.  
    180. 

  180. +#ifdef CONFIG_NET_RANDOM
    181. 

  181. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    182. 

  182. +#else
    183. 

  183. +#define SA_NET_RANDOM	0
    184. 

  184. +#endif
    185. 

  185. +
    186. 

  186.  #endif /* __KERNEL__ */
    187. 

  187.  
    188. 

  188.  #define SIG_BLOCK	1	/* for blocking signals */
    189. 

  189. Index: linux-2.4.35.4/include/asm-parisc/signal.h
    190. 

  190. ===================================================================
    191. 

  191. --- linux-2.4.35.4.orig/include/asm-parisc/signal.h
    192. 

  192. +++ linux-2.4.35.4/include/asm-parisc/signal.h
    193. 

  193. @@ -100,6 +100,12 @@
    194. 

  194.  #define SA_SAMPLE_RANDOM	SA_RESTART
    195. 

  195.  #define SA_SHIRQ		0x04000000
    196. 

  196.  
    197. 

  197. +#ifdef CONFIG_NET_RANDOM
    198. 

  198. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    199. 

  199. +#else
    200. 

  200. +#define SA_NET_RANDOM	0
    201. 

  201. +#endif
    202. 

  202. +
    203. 

  203.  #endif /* __KERNEL__ */
    204. 

  204.  
    205. 

  205.  #define SIG_BLOCK          0	/* for blocking signals */
    206. 

  206. Index: linux-2.4.35.4/include/asm-ppc/signal.h
    207. 

  207. ===================================================================
    208. 

  208. --- linux-2.4.35.4.orig/include/asm-ppc/signal.h
    209. 

  209. +++ linux-2.4.35.4/include/asm-ppc/signal.h
    210. 

  210. @@ -111,6 +111,13 @@ typedef struct {
    211. 

  211.  #define SA_PROBE		SA_ONESHOT
    212. 

  212.  #define SA_SAMPLE_RANDOM	SA_RESTART
    213. 

  213.  #define SA_SHIRQ		0x04000000
    214. 

  214. + 
    215. 

  215. +#ifdef CONFIG_NET_RANDOM
    216. 

  216. +#define SA_NET_RANDOM SA_SAMPLE_RANDOM
    217. 

  217. +#else
    218. 

  218. +#define SA_NET_RANDOM 0
    219. 

  219. +#endif
    220. 

  220. +  
    221. 

  221.  #endif /* __KERNEL__ */
    222. 

  222.  
    223. 

  223.  #define SIG_BLOCK          0	/* for blocking signals */
    224. 

  224. Index: linux-2.4.35.4/include/asm-s390/signal.h
    225. 

  225. ===================================================================
    226. 

  226. --- linux-2.4.35.4.orig/include/asm-s390/signal.h
    227. 

  227. +++ linux-2.4.35.4/include/asm-s390/signal.h
    228. 

  228. @@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
    229. 

  229.  #define SA_SHIRQ                0x04000000
    230. 

  230.  #define SA_DOPATHGROUP          0x00100000
    231. 

  231.  #define SA_FORCE                0x00200000
    232. 

  232. +
    233. 

  233. +#ifdef CONFIG_NET_RANDOM
    234. 

  234. +#define SA_NET_RANDOM		SA_SAMPLE_RANDOM
    235. 

  235. +#else
    236. 

  236. +#define SA_NET_RANDOM		0
    237. 

  237.  #endif
    238. 

  238.  
    239. 

  239. +#endif /* __KERNEL__ */
    240. 

  240. +
    241. 

  241.  #define SIG_BLOCK          0    /* for blocking signals */
    242. 

  242.  #define SIG_UNBLOCK        1    /* for unblocking signals */
    243. 

  243.  #define SIG_SETMASK        2    /* for setting the signal mask */
    244. 

  244. Index: linux-2.4.35.4/include/asm-s390x/signal.h
    245. 

  245. ===================================================================
    246. 

  246. --- linux-2.4.35.4.orig/include/asm-s390x/signal.h
    247. 

  247. +++ linux-2.4.35.4/include/asm-s390x/signal.h
    248. 

  248. @@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
    249. 

  249.  #define SA_SHIRQ                0x04000000
    250. 

  250.  #define SA_DOPATHGROUP          0x00100000
    251. 

  251.  #define SA_FORCE                0x00200000
    252. 

  252. +
    253. 

  253. +#ifdef CONFIG_NET_RANDOM
    254. 

  254. +#define SA_NET_RANDOM		SA_SAMPLE_RANDOM
    255. 

  255. +#else
    256. 

  256. +#define SA_NET_RANDOM		0
    257. 

  257.  #endif
    258. 

  258.  
    259. 

  259. +#endif /* __KERNEL__ */
    260. 

  260. +
    261. 

  261.  #define SIG_BLOCK          0    /* for blocking signals */
    262. 

  262.  #define SIG_UNBLOCK        1    /* for unblocking signals */
    263. 

  263.  #define SIG_SETMASK        2    /* for setting the signal mask */
    264. 

  264. Index: linux-2.4.35.4/include/asm-sh/signal.h
    265. 

  265. ===================================================================
    266. 

  266. --- linux-2.4.35.4.orig/include/asm-sh/signal.h
    267. 

  267. +++ linux-2.4.35.4/include/asm-sh/signal.h
    268. 

  268. @@ -107,8 +107,15 @@ typedef struct {
    269. 

  269.  #define SA_PROBE		SA_ONESHOT
    270. 

  270.  #define SA_SAMPLE_RANDOM	SA_RESTART
    271. 

  271.  #define SA_SHIRQ		0x04000000
    272. 

  272. +
    273. 

  273. +#ifdef CONFIG_NET_RANDOM
    274. 

  274. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    275. 

  275. +#else
    276. 

  276. +#define SA_NET_RANDOM	0
    277. 

  277.  #endif
    278. 

  278.  
    279. 

  279. +#endif /* __KERNEL__ */
    280. 

  280. +
    281. 

  281.  #define SIG_BLOCK          0	/* for blocking signals */
    282. 

  282.  #define SIG_UNBLOCK        1	/* for unblocking signals */
    283. 

  283.  #define SIG_SETMASK        2	/* for setting the signal mask */
    284. 

  284. Index: linux-2.4.35.4/include/asm-sparc/signal.h
    285. 

  285. ===================================================================
    286. 

  286. --- linux-2.4.35.4.orig/include/asm-sparc/signal.h
    287. 

  287. +++ linux-2.4.35.4/include/asm-sparc/signal.h
    288. 

  288. @@ -176,8 +176,15 @@ struct sigstack {
    289. 

  289.  #define SA_PROBE SA_ONESHOT
    290. 

  290.  #define SA_SAMPLE_RANDOM SA_RESTART
    291. 

  291.  #define SA_STATIC_ALLOC		0x80
    292. 

  292. +
    293. 

  293. +#ifdef CONFIG_NET_RANDOM
    294. 

  294. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    295. 

  295. +#else
    296. 

  296. +#define SA_NET_RANDOM	0
    297. 

  297.  #endif
    298. 

  298.  
    299. 

  299. +#endif /* __KERNEL__ */
    300. 

  300. +
    301. 

  301.  /* Type of a signal handler.  */
    302. 

  302.  #ifdef __KERNEL__
    303. 

  303.  typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
    304. 

  304. Index: linux-2.4.35.4/include/asm-sparc64/signal.h
    305. 

  305. ===================================================================
    306. 

  306. --- linux-2.4.35.4.orig/include/asm-sparc64/signal.h
    307. 

  307. +++ linux-2.4.35.4/include/asm-sparc64/signal.h
    308. 

  308. @@ -192,8 +192,15 @@ struct sigstack {
    309. 

  309.  #define SA_PROBE SA_ONESHOT
    310. 

  310.  #define SA_SAMPLE_RANDOM SA_RESTART
    311. 

  311.  #define SA_STATIC_ALLOC		0x80
    312. 

  312. +
    313. 

  313. +#ifdef CONFIG_NET_RANDOM
    314. 

  314. +#define SA_NET_RANDOM	SA_SAMPLE_RANDOM
    315. 

  315. +#else
    316. 

  316. +#define SA_NET_RANDOM	0
    317. 

  317.  #endif
    318. 

  318.  
    319. 

  319. +#endif /* __KERNEL__ */
    320. 

  320. +
    321. 

  321.  /* Type of a signal handler.  */
    322. 

  322.  #ifdef __KERNEL__
    323. 

  323.  typedef void (*__sighandler_t)(int, struct sigcontext *);
    324.