From 86c49b31af735796dfde37aa29473a30d36367db Mon Sep 17 00:00:00 2001
From: cvs2svn <admin@example.com>
Date: Sat, 23 Jul 2016 19:31:36 +0000
Subject: This commit was manufactured by cvs2git to create tag
 'OPENBSD_6_0_BASE'.

---
 src/lib/libcrypto/malloc-wrapper.c | 197 -------------------------------------
 1 file changed, 197 deletions(-)
 delete mode 100644 src/lib/libcrypto/malloc-wrapper.c

(limited to 'src/lib/libcrypto/malloc-wrapper.c')

diff --git a/src/lib/libcrypto/malloc-wrapper.c b/src/lib/libcrypto/malloc-wrapper.c
deleted file mode 100644
index 68af818230..0000000000
--- a/src/lib/libcrypto/malloc-wrapper.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* $OpenBSD: malloc-wrapper.c,v 1.3 2014/04/20 14:32:19 jsing Exp $ */
-/*
- * Copyright (c) 2014 Bob Beck
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int
-CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
-    void (*f)(void *))
-{
-	return 0;
-}
-
-int
-CRYPTO_set_mem_ex_functions(void *(*m)(size_t, const char *, int),
-    void *(*r)(void *, size_t, const char *, int), void (*f)(void *))
-{
-	return 0;
-}
-
-int
-CRYPTO_set_locked_mem_functions(void *(*m)(size_t), void (*f)(void *))
-{
-	return 0;
-}
-
-int
-CRYPTO_set_locked_mem_ex_functions(void *(*m)(size_t, const char *, int),
-    void (*f)(void *))
-{
-	return 0;
-}
-
-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))
-{
-	return 0;
-}
-
-
-void
-CRYPTO_get_mem_functions(void *(**m)(size_t), void *(**r)(void *, size_t),
-    void (**f)(void *))
-{
-	if (m != NULL)
-		*m = malloc;
-	if (r != NULL)
-		*r = realloc;
-	if (f != NULL)
-		*f = free;
-}
-
-void
-CRYPTO_get_mem_ex_functions(void *(**m)(size_t, const char *, int),
-    void *(**r)(void *, size_t, const char *, int), void (**f)(void *))
-{
-	if (m != NULL)
-		*m = NULL;
-	if (r != NULL)
-		*r = NULL;
-	if (f != NULL)
-		*f = free;
-}
-
-void
-CRYPTO_get_locked_mem_functions(void *(**m)(size_t), void (**f)(void *))
-{
-	if (m != NULL)
-		*m = malloc;
-	if (f != NULL)
-		*f = free;
-}
-
-void
-CRYPTO_get_locked_mem_ex_functions(void *(**m)(size_t, const char *, int),
-    void (**f)(void *))
-{
-	if (m != NULL)
-		*m = NULL;
-	if (f != NULL)
-		*f = free;
-}
-
-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))
-{
-	if (m != NULL)
-		*m = NULL;
-	if (r != NULL)
-		*r = NULL;
-	if (f != NULL)
-		*f = NULL;
-	if (so != NULL)
-		*so = NULL;
-	if (go != NULL)
-		*go = NULL;
-}
-
-
-void *
-CRYPTO_malloc_locked(int num, const char *file, int line)
-{
-	if (num <= 0)
-		return NULL;
-	return malloc(num);
-}
-
-void
-CRYPTO_free_locked(void *ptr)
-{
-	free(ptr);
-}
-
-void *
-CRYPTO_malloc(int num, const char *file, int line)
-{
-	if (num <= 0)
-		return NULL;
-	return malloc(num);
-}
-
-char *
-CRYPTO_strdup(const char *str, const char *file, int line)
-{
-	return strdup(str);
-}
-
-void *
-CRYPTO_realloc(void *ptr, int num, const char *file, int line)
-{
-	if (num <= 0)
-		return NULL;
-
-	return realloc(ptr, num);
-}
-
-void *
-CRYPTO_realloc_clean(void *ptr, int old_len, int num, const char *file,
-    int line)
-{
-	void *ret = NULL;
-
-	if (num <= 0)
-		return NULL;
-	if (num < old_len)
-		return NULL; /* original does not support shrinking */
-	ret = malloc(num);
-	if (ret && ptr && old_len > 0) {
-		memcpy(ret, ptr, old_len);
-		explicit_bzero(ptr, old_len);
-		free(ptr);
-	}
-	return ret;
-}
-
-void
-CRYPTO_free(void *ptr)
-{
-	free(ptr);
-}
-
-void *
-CRYPTO_remalloc(void *a, int num, const char *file, int line)
-{
-	free(a);
-	return malloc(num);
-}
-
-void
-CRYPTO_set_mem_debug_options(long bits)
-{
-	return;
-}
-
-long
-CRYPTO_get_mem_debug_options(void)
-{
-	return 0;
-}
-- 
cgit v1.2.3-55-g6feb