4 files changed, 23 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e413341..93f185f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,7 @@ crypto/compat/strlcpy.c
 crypto/compat/strtonum.c
 crypto/compat/timingsafe_bcmp.c
 crypto/compat/timingsafe_memcmp.c
+crypto/compat/arc4random_*.h
 crypto/aes/
 crypto/asn1/
diff --git a/crypto/Makefile.am.tpl b/crypto/Makefile.am.tpl
index d79a270..ac87a77 100644
--- a/crypto/Makefile.am.tpl
+++ b/crypto/Makefile.am.tpl
@@ -69,6 +69,11 @@ endif
 noinst_HEADERS = des/ncbc_enc.c
 noinst_HEADERS += compat/thread_private.h
+noinst_HEADERS += compat/arc4random.h
+noinst_HEADERS += compat/arc4random_linux.h
+noinst_HEADERS += compat/arc4random_osx.h
+noinst_HEADERS += compat/arc4random_solaris.h
+noinst_HEADERS += compat/arc4random_win.h
 noinst_HEADERS += compat/chacha_private.h
 libcrypto_la_SOURCES =
 EXTRA_libcrypto_la_SOURCES =
diff --git a/crypto/compat/arc4random.h b/crypto/compat/arc4random.h
new file mode 100644
index 0000000..e4ecd06
--- /dev/null
+++ b/crypto/compat/arc4random.h
@@ -0,0 +1,16 @@
+#ifdef __linux__
+#include "arc4random_linux.h"
+#endif
+#ifdef __APPLE__
+#include "arc4random_osx.h"
+#endif
+#ifdef __sun
+#include "arc4random_solaris.h"
+#endif
+#ifdef __WIN32
+#include "arc4random_win.h"
+#endif
diff --git a/update.sh b/update.sh
index 1b30f7d..b226603 100755
--- a/update.sh
+++ b/update.sh
@@ -68,6 +68,7 @@ cp $libc_src/stdlib/reallocarray.c crypto/compat
 cp $libc_src/crypt/arc4random.c crypto/compat
 cp $libc_src/crypt/chacha_private.h crypto/compat
 cp $libcrypto_src/crypto/getentropy_*.c crypto/compat
+cp $libcrypto_src/crypto/arc4random_*.h crypto/compat
 (cd ./$libssl_src/src/crypto/objects/;
        perl objects.pl objects.txt obj_mac.num obj_mac.h;

diff --git a/.gitignore b/.gitignore index e413341..93f185f 100644 --- a/.gitignore +++ b/.gitignore
@@ -110,6 +110,7 @@ crypto/compat/strlcpy.c
110	crypto/compat/strtonum.c	110	crypto/compat/strtonum.c
111	crypto/compat/timingsafe_bcmp.c	111	crypto/compat/timingsafe_bcmp.c
112	crypto/compat/timingsafe_memcmp.c	112	crypto/compat/timingsafe_memcmp.c
		113	crypto/compat/arc4random_*.h
113		114
114	crypto/aes/	115	crypto/aes/
115	crypto/asn1/	116	crypto/asn1/


diff --git a/crypto/Makefile.am.tpl b/crypto/Makefile.am.tpl index d79a270..ac87a77 100644 --- a/crypto/Makefile.am.tpl +++ b/crypto/Makefile.am.tpl
@@ -69,6 +69,11 @@ endif
69		69
70	noinst_HEADERS = des/ncbc_enc.c	70	noinst_HEADERS = des/ncbc_enc.c
71	noinst_HEADERS += compat/thread_private.h	71	noinst_HEADERS += compat/thread_private.h
		72	noinst_HEADERS += compat/arc4random.h
		73	noinst_HEADERS += compat/arc4random_linux.h
		74	noinst_HEADERS += compat/arc4random_osx.h
		75	noinst_HEADERS += compat/arc4random_solaris.h
		76	noinst_HEADERS += compat/arc4random_win.h
72	noinst_HEADERS += compat/chacha_private.h	77	noinst_HEADERS += compat/chacha_private.h
73	libcrypto_la_SOURCES =	78	libcrypto_la_SOURCES =
74	EXTRA_libcrypto_la_SOURCES =	79	EXTRA_libcrypto_la_SOURCES =


diff --git a/crypto/compat/arc4random.h b/crypto/compat/arc4random.h new file mode 100644 index 0000000..e4ecd06 --- /dev/null +++ b/crypto/compat/arc4random.h
@@ -0,0 +1,16 @@
		1	#ifdef __linux__
		2	#include "arc4random_linux.h"
		3	#endif
		4
		5	#ifdef __APPLE__
		6	#include "arc4random_osx.h"
		7	#endif
		8
		9	#ifdef __sun
		10	#include "arc4random_solaris.h"
		11	#endif
		12
		13	#ifdef __WIN32
		14	#include "arc4random_win.h"
		15	#endif
		16


diff --git a/update.sh b/update.sh index 1b30f7d..b226603 100755 --- a/update.sh +++ b/update.sh
@@ -68,6 +68,7 @@ cp $libc_src/stdlib/reallocarray.c crypto/compat
68	cp $libc_src/crypt/arc4random.c crypto/compat	68	cp $libc_src/crypt/arc4random.c crypto/compat
69	cp $libc_src/crypt/chacha_private.h crypto/compat	69	cp $libc_src/crypt/chacha_private.h crypto/compat
70	cp $libcrypto_src/crypto/getentropy_*.c crypto/compat	70	cp $libcrypto_src/crypto/getentropy_*.c crypto/compat
		71	cp $libcrypto_src/crypto/arc4random_*.h crypto/compat
71		72
72	(cd ./$libssl_src/src/crypto/objects/;	73	(cd ./$libssl_src/src/crypto/objects/;
73	perl objects.pl objects.txt obj_mac.num obj_mac.h;	74	perl objects.pl objects.txt obj_mac.num obj_mac.h;