update to newly-refactored arc4random compatibility shims
the thread-private bits can move next ok beck@
This commit is contained in:
parent
d697fdb4af
commit
1b1bce16b1
1
.gitignore
vendored
1
.gitignore
vendored
@ -110,6 +110,7 @@ crypto/compat/strlcpy.c
|
|||||||
crypto/compat/strtonum.c
|
crypto/compat/strtonum.c
|
||||||
crypto/compat/timingsafe_bcmp.c
|
crypto/compat/timingsafe_bcmp.c
|
||||||
crypto/compat/timingsafe_memcmp.c
|
crypto/compat/timingsafe_memcmp.c
|
||||||
|
crypto/compat/arc4random_*.h
|
||||||
|
|
||||||
crypto/aes/
|
crypto/aes/
|
||||||
crypto/asn1/
|
crypto/asn1/
|
||||||
|
@ -69,6 +69,11 @@ endif
|
|||||||
|
|
||||||
noinst_HEADERS = des/ncbc_enc.c
|
noinst_HEADERS = des/ncbc_enc.c
|
||||||
noinst_HEADERS += compat/thread_private.h
|
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
|
noinst_HEADERS += compat/chacha_private.h
|
||||||
libcrypto_la_SOURCES =
|
libcrypto_la_SOURCES =
|
||||||
EXTRA_libcrypto_la_SOURCES =
|
EXTRA_libcrypto_la_SOURCES =
|
||||||
|
16
crypto/compat/arc4random.h
Normal file
16
crypto/compat/arc4random.h
Normal file
@ -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
|
||||||
|
|
@ -68,6 +68,7 @@ cp $libc_src/stdlib/reallocarray.c crypto/compat
|
|||||||
cp $libc_src/crypt/arc4random.c crypto/compat
|
cp $libc_src/crypt/arc4random.c crypto/compat
|
||||||
cp $libc_src/crypt/chacha_private.h crypto/compat
|
cp $libc_src/crypt/chacha_private.h crypto/compat
|
||||||
cp $libcrypto_src/crypto/getentropy_*.c crypto/compat
|
cp $libcrypto_src/crypto/getentropy_*.c crypto/compat
|
||||||
|
cp $libcrypto_src/crypto/arc4random_*.h crypto/compat
|
||||||
|
|
||||||
(cd ./$libssl_src/src/crypto/objects/;
|
(cd ./$libssl_src/src/crypto/objects/;
|
||||||
perl objects.pl objects.txt obj_mac.num obj_mac.h;
|
perl objects.pl objects.txt obj_mac.num obj_mac.h;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user