[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  183733f882056ea3e6fe95e665b85fcc6a45dcb4 (commit)
      from  5abb2fc964cc4ea26dbddc8cf334f6958a63ee0f (commit)


- Log -----------------------------------------------------------------
commit 183733f882056ea3e6fe95e665b85fcc6a45dcb4
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 10 03:54:45 2016 +0100

    Make sure to always include string.h so memset gets declared.
    
    memset() is used by CRYPTO_secure_zalloc(), which isn't hidden away
    behind IMPLEMENTED.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/mem_sec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 6760cf4..196c245 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -13,10 +13,11 @@
 #include <openssl/crypto.h>
 #include <e_os.h>
 
+#include <string.h>
+
 #if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
 # define IMPLEMENTED
 # include <stdlib.h>
-# include <string.h>
 # include <assert.h>
 # include <unistd.h>
 # include <sys/types.h>