Partial revert of 1288f26 and fix for no-async

The commit 1288f26 says that it fixes no-async, but instead seems to break
it. Therefore revert that change and fix no-async.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/Configure b/Configure
index 82086ed5a6d6eba75938c5606af0aea7c7d2b400..04ed030d65d5f13d44f97ae39e17c3c8e9359d9d 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -800,7 +800,7 @@ foreach (sort (keys %disabled))
                my ($ALGO, $algo);
                ($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
 
-               if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/
+               if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/ || /^async$/
                                || /^autoalginit/ || /^autoerrinit/)
                        {
                        push @{$config{openssl_other_defines}}, "OPENSSL_NO_$ALGO";

diff --git a/include/openssl/async.h b/include/openssl/async.h
index 99d80752159dd13e4b7aad738c02c70ff7c98e97..5223aadf37369bd3cf2dfd02be666a7121167b94 100644 (file)
--- a/include/openssl/async.h
+++ b/include/openssl/async.h
@@ -50,17 +50,11 @@
  * ====================================================================
  */
 
+#include <stdlib.h>
+
 #ifndef HEADER_ASYNC_H
 # define HEADER_ASYNC_H
 
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_ASYNC
-#define ASYNC_block_pause() do { ; } while(0)
-#define ASYNC_unblock_pause() do { ; } while(0)
-#else
-#include <stdlib.h>
-
 #if defined(_WIN32)
 #include <windows.h>
 #define OSSL_ASYNC_FD   HANDLE
@@ -122,5 +116,4 @@ void ERR_load_ASYNC_strings(void);
 #ifdef  __cplusplus
 }
 #endif
-#endif /* OPENSSL_NO_ASYNC */
 #endif