[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  316fae2a948afc1eb3a6d3d8b294156c011df133 (commit)
      from  d99d0d96a70faad1bcc8ba95eb3bcf8a4f3fc9a8 (commit)


- Log -----------------------------------------------------------------
commit 316fae2a948afc1eb3a6d3d8b294156c011df133
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 18 16:54:16 2016 +0000

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure               |  2 +-
 include/openssl/async.h | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Configure b/Configure
index 82086ed..04ed030 100755
--- 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 99d8075..5223aad 100644
--- 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