The branch master has been updated
via eaa7e483c509d46f455a9deb148bfaf34a8fcbe3 (commit)
from 0fb3b629026831339489b0bae506281e7f2064e6 (commit)
- Log -----------------------------------------------------------------
commit eaa7e483c509d46f455a9deb148bfaf34a8fcbe3
Author: Viktor Szakats <[email protected]>
Date: Fri Feb 19 12:26:17 2016 +0100
GH712: Missed some no-filenames cases
crypto.h: honor no-filenames config setting in missing cases
Signed-off-by: Rich Salz <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
include/openssl/crypto.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 64a431e..2cabcc8 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -293,29 +293,29 @@ DEFINE_STACK_OF(void)
int CRYPTO_mem_ctrl(int mode);
# define OPENSSL_malloc(num) \
- CRYPTO_malloc(num, __FILE__, __LINE__)
+ CRYPTO_malloc(num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_zalloc(num) \
- CRYPTO_zalloc(num, __FILE__, __LINE__)
+ CRYPTO_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_realloc(addr, num) \
- CRYPTO_realloc(addr, num, __FILE__, __LINE__)
+ CRYPTO_realloc(addr, num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_clear_realloc(addr, old_num, num) \
- CRYPTO_clear_realloc(addr, old_num, num, __FILE__, __LINE__)
+ CRYPTO_clear_realloc(addr, old_num, num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_clear_free(addr, num) \
- CRYPTO_clear_free(addr, num, __FILE__, __LINE__)
+ CRYPTO_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_free(addr) \
- CRYPTO_free(addr, __FILE__, __LINE__)
+ CRYPTO_free(addr, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_memdup(str, s) \
- CRYPTO_memdup((str), s, __FILE__, __LINE__)
+ CRYPTO_memdup((str), s, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_strdup(str) \
- CRYPTO_strdup(str, __FILE__, __LINE__)
+ CRYPTO_strdup(str, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_strndup(str, n) \
- CRYPTO_strndup(str, n, __FILE__, __LINE__)
+ CRYPTO_strndup(str, n, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_secure_malloc(num) \
- CRYPTO_secure_malloc(num, __FILE__, __LINE__)
+ CRYPTO_secure_malloc(num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_secure_zalloc(num) \
- CRYPTO_secure_zalloc(num, __FILE__, __LINE__)
+ CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_secure_free(addr) \
- CRYPTO_secure_free(addr, __FILE__, __LINE__)
+ CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE)
# define OPENSSL_secure_actual_size(ptr) \
CRYPTO_secure_actual_size(ptr)
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
