summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-05-25 17:29:52 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-05-25 17:29:52 +0000
commitb5204d6dbbbef7b308070ccbee520d67daff5dc3 (patch)
treea169605f27708cd52b7bd9f1bc665daaaa657924
parent9f3e60e41f953c417212980e75e4c1a603687a50 (diff)
define LIBRESSL_INTERNAL, and use it to hide the bad stuff from ourselves
ok beck
-rw-r--r--lib/libcrypto/crypto.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h
index 67bb46c7e54..9307687b27e 100644
--- a/lib/libcrypto/crypto.h
+++ b/lib/libcrypto/crypto.h
@@ -316,7 +316,6 @@ DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
* via CRYPTO_ex_data_new_class). */
#define CRYPTO_EX_INDEX_USER 100
-
/* This is the default callbacks, but we can have others as well:
* this is needed in Win32 where the application malloc and the
* library malloc may not be the same.
@@ -471,12 +470,14 @@ void CRYPTO_get_mem_debug_functions(
void (**r)(void *, void *, int, const char *, int, int),
void (**f)(void *, int), void (**so)(long), long (**go)(void));
+#ifndef LIBRESSL_INTERNAL
void *CRYPTO_malloc_locked(int num, const char *file, int line);
void CRYPTO_free_locked(void *ptr);
void *CRYPTO_malloc(int num, const char *file, int line);
char *CRYPTO_strdup(const char *str, const char *file, int line);
void CRYPTO_free(void *ptr);
void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
+#endif
void *CRYPTO_realloc_clean(void *addr, int old_num, int num,
const char *file, int line);
void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);