diff options
| author | Todd Short <tshort@akamai.com> | 2016-02-04 11:41:25 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-04 12:07:50 -0500 |
| commit | 52739e40ccc1b16cd966ea204bcfea3cc874fec8 (patch) | |
| tree | b63c45d8d798aa5fb95680bd87c3a2e1f6f1c971 /crypto/async | |
| parent | ed03c46134b1ebfcbee937c74e7f4517893be1fd (diff) | |
Add option to disable async
Add no-async option to Configure that forces ASYNC_NULL.
Related to RT1979
An embedded system or replacement C library (e.g. musl or uClibc)
may not support the *context APIs that are needed for async operation.
Compiles with musl. Ran unit tests, async tests skipped as expected.
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/async')
| -rw-r--r-- | crypto/async/arch/async_posix.h | 2 | ||||
| -rw-r--r-- | crypto/async/arch/async_win.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h index 6cc313e16a..85d033f851 100644 --- a/crypto/async/arch/async_posix.h +++ b/crypto/async/arch/async_posix.h @@ -53,7 +53,7 @@ #define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H #include <openssl/e_os2.h> -#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS) +#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) # include <unistd.h> diff --git a/crypto/async/arch/async_win.h b/crypto/async/arch/async_win.h index d2054bf665..fa345cb1f7 100644 --- a/crypto/async/arch/async_win.h +++ b/crypto/async/arch/async_win.h @@ -54,7 +54,7 @@ * This is the same detection used in cryptlib to set up the thread local * storage that we depend on, so just copy that */ -#if defined(_WIN32) +#if defined(_WIN32) && !defined(OPENSSL_NO_ASYNC) #include <openssl/async.h> # define ASYNC_WIN # define ASYNC_ARCH |