[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  c144b4edda9177ab42c0fa94977098763074f912 (commit)
      from  d9e6d7716425593751c34e71b001f68693480fe2 (commit)


- Log -----------------------------------------------------------------
commit c144b4edda9177ab42c0fa94977098763074f912
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 16 16:01:58 2016 +0100

    Revert "RT4526: Call TerminateProcess, not ExitProcess"
    
    This reverts commit 75f90688fb2dec0f897cad8be8b92be725c5016b.
    
    TerminateProcess is asynchronous, so the code as written in the above
    commit is not correct (and doesn't even compile at the moment). 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 a37c9b5..95adcc1 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -332,7 +332,7 @@ static double Time_F(int s)
         if (thr == NULL) {
             DWORD ret = GetLastError();
             BIO_printf(bio_err, "unable to CreateThread (%d)", ret);
-            TerminateProcess(GetCurrentProcess(), err);
+            ExitProcess(ret);
         }
         CloseHandle(thr);       /* detach the thread */
         while (!schlock)
diff --git a/ms/uplink.c b/ms/uplink.c
index c5c9cd4..e58ab9d 100644
--- a/ms/uplink.c
+++ b/ms/uplink.c
@@ -19,7 +19,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)