[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  c7b7938e75587d1ff8cf28c9de966623cfbe8858 (commit)
      from  dba317774555fbd5bccdfc5270fc486e0d02d9db (commit)


- Log -----------------------------------------------------------------
commit c7b7938e75587d1ff8cf28c9de966623cfbe8858
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Feb 17 14:54:33 2016 +0000

    RT4315: Fix UEFI build in crypto/init.c
    
    We don't have atexit() in the EDK2 environment. Firmware never exits.
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/init.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/init.c b/crypto/init.c
index 25e3dc7..c7eff8b 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -270,7 +270,9 @@ static void ossl_init_base(void)
     fprintf(stderr, "OPENSSL_INIT: ossl_init_base: Setting up stop handlers\n");
 #endif
     ossl_init_setup_thread_stop();
+#ifndef OPENSSL_SYS_UEFI
     atexit(OPENSSL_cleanup);
+#endif
     OPENSSL_cpuid_setup();
     base_inited = 1;
 }