#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>
return ret;
}
-void CRYPTO_secure_free(void *ptr)
+void CRYPTO_secure_free(void *ptr, const char *file, int line)
{
#ifdef IMPLEMENTED
size_t actual_size;
if (ptr == NULL)
return;
if (!secure_mem_initialized) {
- CRYPTO_free(ptr);
+ CRYPTO_free(ptr, file, line);
return;
}
LOCK();
sh_free(ptr);
UNLOCK();
#else
- CRYPTO_free(ptr);
+ CRYPTO_free(ptr, file, line);
#endif /* IMPLEMENTED */
}
*list = ptr;
}
-static void sh_remove_from_list(char *ptr, char *list)
+static void sh_remove_from_list(char *ptr)
{
SH_LIST *temp, *temp2;
/* remove from bigger list */
OPENSSL_assert(!sh_testbit(temp, slist, sh.bitmalloc));
sh_clearbit(temp, slist, sh.bittable);
- sh_remove_from_list(temp, sh.freelist[slist]);
+ sh_remove_from_list(temp);
OPENSSL_assert(temp != sh.freelist[slist]);
/* done with bigger list */
chunk = sh.freelist[list];
OPENSSL_assert(sh_testbit(chunk, list, sh.bittable));
sh_setbit(chunk, list, sh.bitmalloc);
- sh_remove_from_list(chunk, sh.freelist[list]);
+ sh_remove_from_list(chunk);
OPENSSL_assert(WITHIN_ARENA(chunk));
OPENSSL_assert(ptr != NULL);
OPENSSL_assert(!sh_testbit(ptr, list, sh.bitmalloc));
sh_clearbit(ptr, list, sh.bittable);
- sh_remove_from_list(ptr, sh.freelist[list]);
+ sh_remove_from_list(ptr);
OPENSSL_assert(!sh_testbit(ptr, list, sh.bitmalloc));
sh_clearbit(buddy, list, sh.bittable);
- sh_remove_from_list(buddy, sh.freelist[list]);
+ sh_remove_from_list(buddy);
list--;