qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

hostapd: update to latest trunk version (merge r26414, r26415)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26416 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2011-04-02 19:45:56 +00:00
parent 3e9da9b162
commit 89d66a66d5
14 changed files with 132 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
package/hostapd/patches/700-random_pool_add_kernel.patch
View File

@@ -1,6 +1,15 @@
--- a/src/crypto/random.c
+++ b/src/crypto/random.c
@@ -47,6 +47,8 @@
@@ -38,6 +38,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
@@ -48,6 +50,8 @@
#define EXTRACT_LEN 16
#define MIN_READY_MARK 2
@@ -9,7 +18,7 @@
static u32 pool[POOL_WORDS];
static unsigned int input_rotate = 0;
static unsigned int pool_pos = 0;
@@ -120,7 +122,7 @@ static void random_extract(u8 *out)
@@ -122,7 +126,7 @@ static void random_extract(u8 *out)
}
@@ -18,9 +27,39 @@
{
struct os_time t;
static unsigned int count = 0;
@@ -260,3 +262,22 @@ void random_mark_pool_ready(void)
@@ -191,9 +195,13 @@ 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.
@@ -258,9 +266,15 @@ 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);
+
+ fd = open(RANDOM_STAMPFILE, O_CREAT | O_WRONLY | O_EXCL | O_NOFOLLOW, 0600);
+ if (fd >= 0)
+ close(fd);
}
@@ -335,3 +349,22 @@ void random_deinit(void)
random_close_fd();
#endif /* __linux__ */
}
+
+#endif /* CONFIG_NO_RANDOM_POOL */
@@ -101,15 +140,17 @@
L_CFLAGS += -DRADIUS_SERVER
--- a/src/crypto/random.h
+++ b/src/crypto/random.h
@@ -16,15 +16,14 @@
#define RANDOM_H
@@ -18,17 +18,16 @@
#ifdef CONFIG_NO_RANDOM_POOL
#define random_init() do { } while (0)
#define random_deinit() do { } while (0)
-#define random_add_randomness(b, l) do { } while (0)
#define random_get_bytes(b, l) os_get_random((b), (l))
#define random_pool_ready() 1
#define random_mark_pool_ready() do { } while (0)
#else /* CONFIG_NO_RANDOM_POOL */
void random_init(void);
void random_deinit(void);
-void random_add_randomness(const void *buf, size_t len);
int random_get_bytes(void *buf, size_t len);
int random_pool_ready(void);