From cbe63bbabe5628e29fde8f30702d90e975fc75fb Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Thu, 14 Nov 2013 22:05:47 +0800
Subject: [PATCH] rename random.h to dbrandom.h since some OSes have a system
 random.h

--HG--
rename : random.c => dbrandom.c
rename : random.h => dbrandom.h
---
 Makefile.in            | 4 ++--
 cli-agentfwd.c         | 2 +-
 cli-kex.c              | 2 +-
 cli-main.c             | 2 +-
 cli-session.c          | 2 +-
 common-kex.c           | 2 +-
 common-runopts.c       | 2 +-
 common-session.c       | 2 +-
 random.c => dbrandom.c | 2 +-
 random.h => dbrandom.h | 0
 dropbearconvert.c      | 2 +-
 dropbearkey.c          | 2 +-
 dss.c                  | 2 +-
 gendss.c               | 2 +-
 genrsa.c               | 2 +-
 gensignkey.c           | 2 +-
 ltc_prng.c             | 2 +-
 packet.c               | 2 +-
 process-packet.c       | 2 +-
 rsa.c                  | 2 +-
 svr-agentfwd.c         | 2 +-
 svr-auth.c             | 2 +-
 svr-chansession.c      | 2 +-
 svr-kex.c              | 2 +-
 svr-main.c             | 2 +-
 svr-session.c          | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)
 rename random.c => dbrandom.c (99%)
 rename random.h => dbrandom.h (100%)

diff --git a/Makefile.in b/Makefile.in
index a6447194..daa4bb7a 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 b0c589bc..f166121e 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 18285ac3..55b00415 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 aa891dea..5cfd017f 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 d445d862..2a335d43 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 d627fd79..77a7aa69 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 fe1089fa..699ebdaa 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 a300138f..f4016b59 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
similarity index 99%
rename from random.c
rename to dbrandom.c
index cc448ec8..e2f55c2c 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
similarity index 100%
rename from random.h
rename to dbrandom.h
diff --git a/dropbearconvert.c b/dropbearconvert.c
index 958ced61..37ee7aca 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 01385a1b..1eb4db2f 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 b3b2bb1e..d4c4407a 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 2785aecd..21d13a04 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 5df191e8..cdc585db 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 2869d2c4..cb66ffff 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 60cd590f..af73dac6 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 6f872d2d..1b5ee93d 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 ecc48633..0b925106 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 e2abab18..7eb64131 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 30105038..3c4daab1 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 2a3ef0e2..9051d85f 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 5dd5540b..b585a9a5 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 629a31b1..24f1d737 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 5e4150a1..c4b8c488 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 76ad4501..2852f296 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"
-- 
GitLab