summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2013-11-14 22:05:47 +0800
committerMatt Johnston <matt@ucc.asn.au>2013-11-14 22:05:47 +0800
commit0bd529943883133e899f74a501b9bb03f56b70c4 (patch)
tree2d15693b0c5ed6a60c2b3659bd94a879ecf58bff
parent67f4cce42c59be9b580ea0229a7dfcb5187d575c (diff)
downloaddropbear-0bd529943883133e899f74a501b9bb03f56b70c4.tar.gz
rename random.h to dbrandom.h since some OSes have a system random.h
-rw-r--r--Makefile.in4
-rw-r--r--cli-agentfwd.c2
-rw-r--r--cli-kex.c2
-rw-r--r--cli-main.c2
-rw-r--r--cli-session.c2
-rw-r--r--common-kex.c2
-rw-r--r--common-runopts.c2
-rw-r--r--common-session.c2
-rw-r--r--dbrandom.c (renamed from random.c)2
-rw-r--r--dbrandom.h (renamed from random.h)0
-rw-r--r--dropbearconvert.c2
-rw-r--r--dropbearkey.c2
-rw-r--r--dss.c2
-rw-r--r--gendss.c2
-rw-r--r--genrsa.c2
-rw-r--r--gensignkey.c2
-rw-r--r--ltc_prng.c2
-rw-r--r--packet.c2
-rw-r--r--process-packet.c2
-rw-r--r--rsa.c2
-rw-r--r--svr-agentfwd.c2
-rw-r--r--svr-auth.c2
-rw-r--r--svr-chansession.c2
-rw-r--r--svr-kex.c2
-rw-r--r--svr-main.c2
-rw-r--r--svr-session.c2
26 files changed, 26 insertions, 26 deletions
diff --git a/Makefile.in b/Makefile.in
index a644719..daa4bb7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,7 +24,7 @@ endif
COMMONOBJS=dbutil.o buffer.o \
dss.o bignum.o \
- signkey.o rsa.o random.o \
+ signkey.o rsa.o dbrandom.o \
queue.o \
atomicio.o compat.o fake-rfc2553.o \
ltc_prng.o ecc.o ecdsa.o crypto_desc.o \
@@ -52,7 +52,7 @@ CONVERTOBJS=dropbearconvert.o keyimport.o
SCPOBJS=scp.o progressmeter.o atomicio.o scpmisc.o compat.o
HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \
- dss.h bignum.h signkey.h rsa.h random.h service.h auth.h \
+ dss.h bignum.h signkey.h rsa.h dbrandom.h service.h auth.h \
debug.h channel.h chansession.h config.h queue.h sshpty.h \
termcodes.h gendss.h genrsa.h runopts.h includes.h \
loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
diff --git a/cli-agentfwd.c b/cli-agentfwd.c
index b0c589b..f166121 100644
--- a/cli-agentfwd.c
+++ b/cli-agentfwd.c
@@ -34,7 +34,7 @@
#include "channel.h"
#include "packet.h"
#include "buffer.h"
-#include "random.h"
+#include "dbrandom.h"
#include "listener.h"
#include "runopts.h"
#include "atomicio.h"
diff --git a/cli-kex.c b/cli-kex.c
index 18285ac..55b0041 100644
--- a/cli-kex.c
+++ b/cli-kex.c
@@ -33,7 +33,7 @@
#include "ssh.h"
#include "packet.h"
#include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
#include "runopts.h"
#include "signkey.h"
#include "ecc.h"
diff --git a/cli-main.c b/cli-main.c
index aa891de..5cfd017 100644
--- a/cli-main.c
+++ b/cli-main.c
@@ -28,7 +28,7 @@
#include "dbutil.h"
#include "runopts.h"
#include "session.h"
-#include "random.h"
+#include "dbrandom.h"
#include "crypto_desc.h"
static void cli_dropbear_exit(int exitcode, const char* format, va_list param) ATTRIB_NORETURN;
diff --git a/cli-session.c b/cli-session.c
index d445d86..2a335d4 100644
--- a/cli-session.c
+++ b/cli-session.c
@@ -31,7 +31,7 @@
#include "packet.h"
#include "tcpfwd.h"
#include "channel.h"
-#include "random.h"
+#include "dbrandom.h"
#include "service.h"
#include "runopts.h"
#include "chansession.h"
diff --git a/common-kex.c b/common-kex.c
index d627fd7..77a7aa6 100644
--- a/common-kex.c
+++ b/common-kex.c
@@ -32,7 +32,7 @@
#include "ssh.h"
#include "packet.h"
#include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
#include "runopts.h"
#include "ecc.h"
#include "crypto_desc.h"
diff --git a/common-runopts.c b/common-runopts.c
index fe1089f..699ebda 100644
--- a/common-runopts.c
+++ b/common-runopts.c
@@ -29,7 +29,7 @@
#include "dbutil.h"
#include "auth.h"
#include "algo.h"
-#include "random.h"
+#include "dbrandom.h"
runopts opts; /* GLOBAL */
diff --git a/common-session.c b/common-session.c
index a300138..f4016b5 100644
--- a/common-session.c
+++ b/common-session.c
@@ -30,7 +30,7 @@
#include "buffer.h"
#include "dss.h"
#include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
#include "kex.h"
#include "channel.h"
#include "runopts.h"
diff --git a/random.c b/dbrandom.c
index cc448ec..e2f55c2 100644
--- a/random.c
+++ b/dbrandom.c
@@ -26,7 +26,7 @@
#include "buffer.h"
#include "dbutil.h"
#include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
/* this is used to generate unique output from the same hashpool */
diff --git a/random.h b/dbrandom.h
index 2c79ec3..2c79ec3 100644
--- a/random.h
+++ b/dbrandom.h
diff --git a/dropbearconvert.c b/dropbearconvert.c
index 958ced6..37ee7ac 100644
--- a/dropbearconvert.c
+++ b/dropbearconvert.c
@@ -29,7 +29,7 @@
#include "dbutil.h"
#include "keyimport.h"
#include "crypto_desc.h"
-#include "random.h"
+#include "dbrandom.h"
static int do_convert(int intype, const char* infile, int outtype,
diff --git a/dropbearkey.c b/dropbearkey.c
index 01385a1..1eb4db2 100644
--- a/dropbearkey.c
+++ b/dropbearkey.c
@@ -53,7 +53,7 @@
#include "gendss.h"
#include "ecdsa.h"
#include "crypto_desc.h"
-#include "random.h"
+#include "dbrandom.h"
#include "gensignkey.h"
static void printhelp(char * progname);
diff --git a/dss.c b/dss.c
index b3b2bb1..d4c4407 100644
--- a/dss.c
+++ b/dss.c
@@ -28,7 +28,7 @@
#include "dss.h"
#include "buffer.h"
#include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
/* Handle DSS (Digital Signature Standard), aka DSA (D.S. Algorithm),
* operations, such as key reading, signing, verification. Key generation
diff --git a/gendss.c b/gendss.c
index 2785aec..21d13a0 100644
--- a/gendss.c
+++ b/gendss.c
@@ -26,7 +26,7 @@
#include "dbutil.h"
#include "signkey.h"
#include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
#include "buffer.h"
#include "gendss.h"
#include "dss.h"
diff --git a/genrsa.c b/genrsa.c
index 5df191e..cdc585d 100644
--- a/genrsa.c
+++ b/genrsa.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "dbutil.h"
#include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
#include "rsa.h"
#include "genrsa.h"
diff --git a/gensignkey.c b/gensignkey.c
index 2869d2c..cb66fff 100644
--- a/gensignkey.c
+++ b/gensignkey.c
@@ -5,7 +5,7 @@
#include "genrsa.h"
#include "gendss.h"
#include "signkey.h"
-#include "random.h"
+#include "dbrandom.h"
#define RSA_DEFAULT_SIZE 2048
#define DSS_DEFAULT_SIZE 1024
diff --git a/ltc_prng.c b/ltc_prng.c
index 60cd590..af73dac 100644
--- a/ltc_prng.c
+++ b/ltc_prng.c
@@ -13,7 +13,7 @@
*/
#include "options.h"
#include "includes.h"
-#include "random.h"
+#include "dbrandom.h"
#include "ltc_prng.h"
/**
diff --git a/packet.c b/packet.c
index 6f872d2..1b5ee93 100644
--- a/packet.c
+++ b/packet.c
@@ -30,7 +30,7 @@
#include "algo.h"
#include "buffer.h"
#include "kex.h"
-#include "random.h"
+#include "dbrandom.h"
#include "service.h"
#include "auth.h"
#include "channel.h"
diff --git a/process-packet.c b/process-packet.c
index ecc4863..0b92510 100644
--- a/process-packet.c
+++ b/process-packet.c
@@ -30,7 +30,7 @@
#include "algo.h"
#include "buffer.h"
#include "kex.h"
-#include "random.h"
+#include "dbrandom.h"
#include "service.h"
#include "auth.h"
#include "channel.h"
diff --git a/rsa.c b/rsa.c
index e2abab1..7eb6413 100644
--- a/rsa.c
+++ b/rsa.c
@@ -34,7 +34,7 @@
#include "rsa.h"
#include "buffer.h"
#include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
#ifdef DROPBEAR_RSA
diff --git a/svr-agentfwd.c b/svr-agentfwd.c
index 3010503..3c4daab 100644
--- a/svr-agentfwd.c
+++ b/svr-agentfwd.c
@@ -37,7 +37,7 @@
#include "channel.h"
#include "packet.h"
#include "buffer.h"
-#include "random.h"
+#include "dbrandom.h"
#include "listener.h"
#include "auth.h"
diff --git a/svr-auth.c b/svr-auth.c
index 2a3ef0e..9051d85 100644
--- a/svr-auth.c
+++ b/svr-auth.c
@@ -33,7 +33,7 @@
#include "packet.h"
#include "auth.h"
#include "runopts.h"
-#include "random.h"
+#include "dbrandom.h"
static void authclear();
static int checkusername(unsigned char *username, unsigned int userlen);
diff --git a/svr-chansession.c b/svr-chansession.c
index 5dd5540..b585a9a 100644
--- a/svr-chansession.c
+++ b/svr-chansession.c
@@ -32,7 +32,7 @@
#include "sshpty.h"
#include "termcodes.h"
#include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
#include "x11fwd.h"
#include "agentfwd.h"
#include "runopts.h"
diff --git a/svr-kex.c b/svr-kex.c
index 629a31b..24f1d73 100644
--- a/svr-kex.c
+++ b/svr-kex.c
@@ -32,7 +32,7 @@
#include "ssh.h"
#include "packet.h"
#include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
#include "runopts.h"
#include "ecc.h"
#include "gensignkey.h"
diff --git a/svr-main.c b/svr-main.c
index 5e4150a..c4b8c48 100644
--- a/svr-main.c
+++ b/svr-main.c
@@ -28,7 +28,7 @@
#include "buffer.h"
#include "signkey.h"
#include "runopts.h"
-#include "random.h"
+#include "dbrandom.h"
#include "crypto_desc.h"
static size_t listensockets(int *sock, size_t sockcount, int *maxfd);
diff --git a/svr-session.c b/svr-session.c
index 76ad450..2852f29 100644
--- a/svr-session.c
+++ b/svr-session.c
@@ -30,7 +30,7 @@
#include "buffer.h"
#include "dss.h"
#include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
#include "kex.h"
#include "channel.h"
#include "chansession.h"