summaryrefslogtreecommitdiffstats
path: root/package/hostapd/patches/500-random_pool_add_kernel.patch
blob: e54e881d8e73a4ee6c38272c41aad511f5df2f15 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
--- a/src/crypto/random.c
+++ b/src/crypto/random.c
@@ -33,6 +33,8 @@
 #include "sha1.h"
 #include "random.h"
 
+#define RANDOM_STAMPFILE "/var/run/.random_available"
+
 #define POOL_WORDS 32
 #define POOL_WORDS_MASK (POOL_WORDS - 1)
 #define POOL_TAP1 26
@@ -43,6 +45,8 @@
 #define EXTRACT_LEN 16
 #define MIN_READY_MARK 2
 
+#ifndef CONFIG_NO_RANDOM_POOL
+
 static u32 pool[POOL_WORDS];
 static unsigned int input_rotate = 0;
 static unsigned int pool_pos = 0;
@@ -123,7 +127,7 @@ static void random_extract(u8 *out)
 }
 
 
-void random_add_randomness(const void *buf, size_t len)
+static void random_pool_add_randomness(const void *buf, size_t len)
 {
 	struct os_time t;
 	static unsigned int count = 0;
@@ -213,16 +217,22 @@ int random_get_bytes(void *buf, size_t l
 int random_pool_ready(void)
 {
 #ifdef __linux__
+	struct stat st;
 	int fd;
 	ssize_t res;
 
+	if (stat(RANDOM_STAMPFILE, &st) == 0)
+		return 1;
+
 	/*
 	 * Make sure that there is reasonable entropy available before allowing
 	 * some key derivation operations to proceed.
 	 */
 
-	if (dummy_key_avail == sizeof(dummy_key))
+	if (dummy_key_avail == sizeof(dummy_key)) {
+		random_mark_pool_ready();
 		return 1; /* Already initialized - good to continue */
+	}
 
 	/*
 	 * Try to fetch some more data from the kernel high quality
@@ -257,6 +267,7 @@ int random_pool_ready(void)
 	if (dummy_key_avail == sizeof(dummy_key)) {
 		if (own_pool_ready < MIN_READY_MARK)
 			own_pool_ready = MIN_READY_MARK;
+		random_mark_pool_ready();
 		random_write_entropy();
 		return 1;
 	}
@@ -269,6 +280,7 @@ int random_pool_ready(void)
 	    total_collected + 10 * own_pool_ready > MIN_COLLECT_ENTROPY) {
 		wpa_printf(MSG_INFO, "random: Allow operation to proceed "
 			   "based on internal entropy");
+		random_mark_pool_ready();
 		return 1;
 	}
 
@@ -284,10 +296,16 @@ int random_pool_ready(void)
 
 void random_mark_pool_ready(void)
 {
+	int fd;
+
 	own_pool_ready++;
 	wpa_printf(MSG_DEBUG, "random: Mark internal entropy pool to be "
 		   "ready (count=%u/%u)", own_pool_ready, MIN_READY_MARK);
 	random_write_entropy();
+
+	fd = open(RANDOM_STAMPFILE, O_CREAT | O_WRONLY | O_EXCL | O_NOFOLLOW, 0600);
+	if (fd >= 0)
+		close(fd);
 }
 
 
@@ -444,3 +462,22 @@ void random_deinit(void)
 	os_free(random_entropy_file);
 	random_entropy_file = NULL;
 }
+
+#endif /* CONFIG_NO_RANDOM_POOL */
+
+
+void random_add_randomness(const void *buf, size_t len)
+{
+#ifdef __linux__
+	int fd;
+
+	fd = open("/dev/random", O_RDWR);
+	if (fd >= 0) {
+		write(fd, buf, len);
+		close(fd);
+	}
+#endif
+#ifndef CONFIG_NO_RANDOM_POOL
+	random_pool_add_randomness(buf, len);
+#endif
+}
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1217,9 +1217,8 @@ endif
 
 ifdef CONFIG_NO_RANDOM_POOL
 CFLAGS += -DCONFIG_NO_RANDOM_POOL
-else
-OBJS += ../src/crypto/random.o
 endif
+OBJS += ../src/crypto/random.o
 
 ifdef CONFIG_CTRL_IFACE
 ifeq ($(CONFIG_CTRL_IFACE), y)
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1161,9 +1161,8 @@ endif
 
 ifdef CONFIG_NO_RANDOM_POOL
 L_CFLAGS += -DCONFIG_NO_RANDOM_POOL
-else
-OBJS += src/crypto/random.c
 endif
+OBJS += src/crypto/random.c
 
 ifdef CONFIG_CTRL_IFACE
 ifeq ($(CONFIG_CTRL_IFACE), y)
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -748,11 +748,11 @@ endif
 ifdef CONFIG_NO_RANDOM_POOL
 L_CFLAGS += -DCONFIG_NO_RANDOM_POOL
 else
-OBJS += src/crypto/random.c
-HOBJS += src/crypto/random.c
 HOBJS += $(SHA1OBJS)
 HOBJS += src/crypto/md5.c
 endif
+OBJS += src/crypto/random.c
+HOBJS += src/crypto/random.c
 
 ifdef CONFIG_RADIUS_SERVER
 L_CFLAGS += -DRADIUS_SERVER
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -755,12 +755,12 @@ endif
 ifdef CONFIG_NO_RANDOM_POOL
 CFLAGS += -DCONFIG_NO_RANDOM_POOL
 else
-OBJS += ../src/crypto/random.o
-HOBJS += ../src/crypto/random.o
 HOBJS += ../src/utils/eloop.o
 HOBJS += $(SHA1OBJS)
 HOBJS += ../src/crypto/md5.o
 endif
+OBJS += ../src/crypto/random.o
+HOBJS += ../src/crypto/random.o
 
 ifdef CONFIG_RADIUS_SERVER
 CFLAGS += -DRADIUS_SERVER