[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  f219a1b0485309b6814f00985f7bbb45e72ee374 (commit)
      from  b02b57431718b74ddaf24cc3db004f145311abac (commit)


- Log -----------------------------------------------------------------
commit f219a1b0485309b6814f00985f7bbb45e72ee374
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 16 15:59:42 2016 +0100

    Revert "RT4526: Call TerminateProcess, not ExitProcess"
    
    This reverts commit 9c1a9ccf65d0ea1912675d3a622fa8e51b524b9e.
    
    TerminateProcess is asynchronous, so the code as written in the above
    commit is not correct. It is also probably not needed in the speed
    case. Reverting in order to figure out the correct solution.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 apps/speed.c | 2 +-
 ms/uplink.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/speed.c b/apps/speed.c
index f439d0d..3b162e1 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -314,7 +314,7 @@ static double Time_F(int s)
         if (thr == NULL) {
             DWORD err = GetLastError();
             BIO_printf(bio_err, "unable to CreateThread (%lu)", err);
-            TerminateProcess(GetCurrentProcess(), err);
+            ExitProcess(err);
         }
         while (!schlock)
             Sleep(0);           /* scheduler spinlock */
diff --git a/ms/uplink.c b/ms/uplink.c
index 2096f2c..7f7abfb 100644
--- a/ms/uplink.c
+++ b/ms/uplink.c
@@ -28,7 +28,7 @@ static TCHAR msg[128];
 static void unimplemented(void)
 {
     OPENSSL_showfatal(sizeof(TCHAR) == sizeof(char) ? "%s\n" : "%S\n", msg);
-    TerminateProcess(GetCurrentProcess(), 1);
+    ExitProcess(1);
 }
 
 void OPENSSL_Uplink(volatile void **table, int index)