/* XXX use correct function pointer types */
#ifdef CRYPTO_MDEBUG
/* use default functions from mem_dbg.c */
-static void (*malloc_debug_func)(void *,size_t,const char *,int,int)
+static void (*malloc_debug_func)(void *,int,const char *,int,int)
= CRYPTO_dbg_malloc;
-static void (*realloc_debug_func)(void *,void *,size_t,const char *,int,int)
+static void (*realloc_debug_func)(void *,void *,int,const char *,int,int)
= CRYPTO_dbg_realloc;
static void (*free_debug_func)(void *,int) = CRYPTO_dbg_free;
static void (*set_debug_options_func)(long) = CRYPTO_dbg_set_options;
#else
/* applications can use CRYPTO_malloc_debug_init() to select above case
* at run-time */
-static void (*malloc_debug_func)(void *,size_t,const char *,int,int) = NULL;
-static void (*realloc_debug_func)(void *,void *,size_t,const char *,int,int)
+static void (*malloc_debug_func)(void *,int,const char *,int,int) = NULL;
+static void (*realloc_debug_func)(void *,void *,int,const char *,int,int)
= NULL;
static void (*free_debug_func)(void *,int) = NULL;
static void (*set_debug_options_func)(long) = NULL;
static long (*get_debug_options_func)(void) = NULL;
#endif
-
int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
void (*f)(void *))
{
+ /* Dummy call just to ensure OPENSSL_init() gets linked in */
+ OPENSSL_init();
if (!allow_customize)
return 0;
if ((m == 0) || (r == 0) || (f == 0))
return 1;
}
-int CRYPTO_set_mem_debug_functions(void (*m)(void *,size_t,const char *,int,int),
- void (*r)(void *,void *,size_t,const char *,int,int),
+int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
+ void (*r)(void *,void *,int,const char *,int,int),
void (*f)(void *,int),
void (*so)(long),
long (*go)(void))
if (f != NULL) *f=free_locked_func;
}
-void CRYPTO_get_mem_debug_functions(void (**m)(void *,size_t,const char *,int,int),
- void (**r)(void *,void *,size_t,const char *,int,int),
+void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int),
+ void (**r)(void *,void *,int,const char *,int,int),
void (**f)(void *,int),
void (**so)(long),
long (**go)(void))
}
-void *CRYPTO_malloc_locked(size_t num, const char *file, int line)
+void *CRYPTO_malloc_locked(int num, const char *file, int line)
{
void *ret = NULL;
free_debug_func(NULL, 1);
}
-void *CRYPTO_malloc(size_t num, const char *file, int line)
+void *CRYPTO_malloc(int num, const char *file, int line)
{
void *ret = NULL;
return ret;
}
-void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
+void *CRYPTO_realloc(void *str, int num, const char *file, int line)
{
void *ret = NULL;
return ret;
}
-void *CRYPTO_realloc_clean(void *str, size_t old_len, size_t num,
- const char *file, int line)
+void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
+ int line)
{
void *ret = NULL;
if (num <= 0) return NULL;
+ /* We don't support shrinking the buffer. Note the memcpy that copies
+ * |old_len| bytes to the new buffer, below. */
+ if (num < old_len) return NULL;
+
if (realloc_debug_func != NULL)
realloc_debug_func(str, NULL, num, file, line, 0);
ret=malloc_ex_func(num,file,line);
free_debug_func(NULL, 1);
}
-void *CRYPTO_remalloc(void *a, size_t num, const char *file, int line)
+void *CRYPTO_remalloc(void *a, int num, const char *file, int line)
{
if (a != NULL) OPENSSL_free(a);
- a=OPENSSL_malloc(num);
+ a=(char *)OPENSSL_malloc(num);
return(a);
}