projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make CBC decoding constant time.
[oweals/openssl.git]
/
crypto
/
mem_dbg.c
diff --git
a/crypto/mem_dbg.c
b/crypto/mem_dbg.c
index f80060d9471a0bf71d798e730951d2319821351c..ac793397f10f5289fe0d1a5ac1cc8ad3e33f4b28 100644
(file)
--- a/
crypto/mem_dbg.c
+++ b/
crypto/mem_dbg.c
@@
-478,7
+478,7
@@
int CRYPTO_remove_all_info(void)
static unsigned long break_order_num=0;
static unsigned long break_order_num=0;
-void CRYPTO_dbg_malloc(void *addr,
size_
t num, const char *file, int line,
+void CRYPTO_dbg_malloc(void *addr,
in
t num, const char *file, int line,
int before_p)
{
MEM *m,*mm;
int before_p)
{
MEM *m,*mm;
@@
-602,8
+602,8
@@
void CRYPTO_dbg_free(void *addr, int before_p)
}
}
}
}
-void CRYPTO_dbg_realloc(void *addr1, void *addr2,
size_
t num,
-
const char *file, int line, int before_p)
+void CRYPTO_dbg_realloc(void *addr1, void *addr2,
in
t num,
+ const char *file, int line, int before_p)
{
MEM m,*mp;
{
MEM m,*mp;
@@
-666,7
+666,7
@@
static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l)
char buf[1024];
char *bufp = buf;
APP_INFO *amip;
char buf[1024];
char *bufp = buf;
APP_INFO *amip;
-
size_
t ami_cnt;
+
in
t ami_cnt;
struct tm *lcl = NULL;
CRYPTO_THREADID ti;
struct tm *lcl = NULL;
CRYPTO_THREADID ti;
@@
-712,7
+712,7
@@
static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l)
do
{
do
{
-
size_
t buf_len;
+
in
t buf_len;
int info_len;
ami_cnt++;
int info_len;
ami_cnt++;
@@
-772,6
+772,9
@@
void CRYPTO_mem_leaks(BIO *b)
{
BIO_printf(b,"%ld bytes leaked in %d chunks\n",
ml.bytes,ml.chunks);
{
BIO_printf(b,"%ld bytes leaked in %d chunks\n",
ml.bytes,ml.chunks);
+#ifdef CRYPTO_MDEBUG_ABORT
+ abort();
+#endif
}
else
{
}
else
{
@@
-784,7
+787,7
@@
void CRYPTO_mem_leaks(BIO *b)
* XXX This should be in CRYPTO_mem_leaks_cb,
* and CRYPTO_mem_leaks should be implemented by
* using CRYPTO_mem_leaks_cb.
* XXX This should be in CRYPTO_mem_leaks_cb,
* and CRYPTO_mem_leaks should be implemented by
* using CRYPTO_mem_leaks_cb.
- * (Also the
ir
should be a variant of lh_doall_arg
+ * (Also the
re
should be a variant of lh_doall_arg
* that takes a function pointer instead of a void *;
* this would obviate the ugly and illegal
* void_fn_to_char kludge in CRYPTO_mem_leaks_cb.
* that takes a function pointer instead of a void *;
* this would obviate the ugly and illegal
* void_fn_to_char kludge in CRYPTO_mem_leaks_cb.