aboutsummaryrefslogtreecommitdiffstats
path: root/package/hostapd/patches
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-12 17:30:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-12 17:30:16 +0000
commit768877966df40082d0b8b38bfd7022d713d4e518 (patch)
treed0e8c7afd679a4cf20247dc66c6d24ab6b1cf078 /package/hostapd/patches
parent966dee23c366bd3438f1de99ed2bb6081ceddc4c (diff)
downloadupstream-768877966df40082d0b8b38bfd7022d713d4e518.tar.gz
upstream-768877966df40082d0b8b38bfd7022d713d4e518.tar.bz2
upstream-768877966df40082d0b8b38bfd7022d713d4e518.zip
hostapd: properly mark random data as ready if initialization succeeds without reassociation (#9222)
SVN-Revision: 26611
Diffstat (limited to 'package/hostapd/patches')
-rw-r--r--package/hostapd/patches/700-random_pool_add_kernel.patch36
1 files changed, 33 insertions, 3 deletions
diff --git a/package/hostapd/patches/700-random_pool_add_kernel.patch b/package/hostapd/patches/700-random_pool_add_kernel.patch
index 8ba40e5deb..84e556b458 100644
--- a/package/hostapd/patches/700-random_pool_add_kernel.patch
+++ b/package/hostapd/patches/700-random_pool_add_kernel.patch
@@ -27,7 +27,7 @@
{
struct os_time t;
static unsigned int count = 0;
-@@ -191,9 +195,13 @@ int random_get_bytes(void *buf, size_t l
+@@ -191,16 +195,22 @@ int random_get_bytes(void *buf, size_t l
int random_pool_ready(void)
{
#ifdef __linux__
@@ -41,7 +41,37 @@
/*
* Make sure that there is reasonable entropy available before allowing
* some key derivation operations to proceed.
-@@ -258,9 +266,15 @@ int random_pool_ready(void)
+ */
+
+- 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
+@@ -232,8 +242,10 @@ int random_pool_ready(void)
+ dummy_key_avail += res;
+ close(fd);
+
+- if (dummy_key_avail == sizeof(dummy_key))
++ if (dummy_key_avail == sizeof(dummy_key)) {
++ random_mark_pool_ready();
+ return 1;
++ }
+
+ wpa_printf(MSG_INFO, "random: Only %u/%u bytes of strong "
+ "random data available from /dev/random",
+@@ -243,6 +255,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;
+ }
+
+@@ -258,9 +271,15 @@ int random_pool_ready(void)
void random_mark_pool_ready(void)
{
@@ -57,7 +87,7 @@
}
-@@ -335,3 +349,22 @@ void random_deinit(void)
+@@ -335,3 +354,22 @@ void random_deinit(void)
random_close_fd();
#endif /* __linux__ */
}