[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  6a78ae2821e89a8838714496524fd39d9d21fb1b (commit)
      from  d6b55faca3bc085ed487c1a69aa976f81cf1c7fa (commit)


- Log -----------------------------------------------------------------
commit 6a78ae2821e89a8838714496524fd39d9d21fb1b
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Feb 17 13:41:26 2016 +0000

    RT4313: Fix build for !IMPLEMENTED code path in CRYPTO_secure_free()
    
    Commit 05c7b1631 ("Implement the use of heap manipulator implementions")
    added 'file' and 'line' arguments to CRYPTO_free() and friends, but neglected
    to fix up the !IMPLEMENTED case within CRYPTO_secure_free(). Add the missing
    arguments there too.
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index be3bb9a..fdda487 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -138,7 +138,7 @@ void CRYPTO_secure_free(void *ptr, const char *file, int line)
     sh_free(ptr);
     UNLOCK();
 #else
-    CRYPTO_free(ptr);
+    CRYPTO_free(ptr, file, line);
 #endif /* IMPLEMENTED */
 }