blob: a19490daa5e5160cb058af2b375c6d31a556fcbc (
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
|
--- dropbear-0.45/options.h
+++ dropbear-0.45/options.h
@@ -148,6 +148,10 @@
/* prngd must be manually set up to produce output */
/*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/
+/* If the normal random source would block for a while, fall back to
+ * the urandom source so that connections don't hang forever. */
+#define DROPBEAR_URANDOM_DEV "/dev/urandom"
+
/* Specify the number of clients we will allow to be connected but
* not yet authenticated. After this limit, connections are rejected */
#ifndef MAX_UNAUTH_CLIENTS
--- dropbear-0.45/random.c
+++ dropbear-0.45/random.c
@@ -57,9 +57,14 @@
struct sockaddr_un egdsock;
char egdcmd[2];
#endif
+ mode_t readmode = O_RDONLY;
+#ifdef DROPBEAR_URANDOM_DEV
+ unsigned int readtries = 0;
+ readmode |= O_NONBLOCK;
+#endif
#ifdef DROPBEAR_RANDOM_DEV
- readfd = open(DROPBEAR_RANDOM_DEV, O_RDONLY);
+ readfd = open(DROPBEAR_RANDOM_DEV, readmode);
if (readfd < 0) {
dropbear_exit("couldn't open random device");
}
@@ -97,6 +102,24 @@
if (readlen < 0 && errno == EINTR) {
continue;
}
+#ifdef DROPBEAR_URANDOM_DEV
+ /* if the main random source blocked, lets retry a few times,
+ * but then give up and try a constant random source. */
+ if (readlen < 0 && errno == EAGAIN) {
+ ++readtries;
+ if (readtries < 5) {
+ sleep(1);
+ continue;
+ } else if (readtries == 5) {
+ close (readfd);
+ readfd = open(DROPBEAR_URANDOM_DEV, readmode);
+ if (readfd < 0) {
+ dropbear_exit("couldn't open secondary random device");
+ }
+ continue;
+ }
+ }
+#endif
dropbear_exit("error reading random source");
}
readpos += readlen;
|
