diff options
| author | Brent Cook <bcook@openbsd.org> | 2014-07-17 23:58:46 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-07-18 09:19:23 -0500 |
| commit | 1b1bce16b15cbe3bc7394f7876cb064ef5b8e7ab (patch) | |
| tree | fa6f281564a377ff8b453f21816d8be00bf759f5 /crypto | |
| parent | d697fdb4afb08bb46027a5efd1f8040bfdb8380e (diff) | |
| download | portable-1b1bce16b15cbe3bc7394f7876cb064ef5b8e7ab.tar.gz portable-1b1bce16b15cbe3bc7394f7876cb064ef5b8e7ab.tar.bz2 portable-1b1bce16b15cbe3bc7394f7876cb064ef5b8e7ab.zip | |
update to newly-refactored arc4random compatibility shims
the thread-private bits can move next
ok beck@
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile.am.tpl | 5 | ||||
| -rw-r--r-- | crypto/compat/arc4random.h | 16 |
2 files changed, 21 insertions, 0 deletions
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 | |||