From f43847518f7fe0930205f9b6aeb7ea4c6596860b Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 6 Nov 2024 04:08:26 +0000
Subject: Rename malloc-wrapper.c to crypto_memory.c

Apparently it's important that five trivial one-line wrappers remain in a
file with the ISC license. So instead of cleaning the root directory of our
favorite pigsty further by squashing all the useless legacy garbage into a
single file, rename the oddly-named malloc-wrapper.c into crypto_memory.c.

discussed with beck, jsing
---
 src/lib/libcrypto/Makefile         |  4 +--
 src/lib/libcrypto/crypto_memory.c  | 58 ++++++++++++++++++++++++++++++++++++++
 src/lib/libcrypto/malloc-wrapper.c | 58 --------------------------------------
 3 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 src/lib/libcrypto/crypto_memory.c
 delete mode 100644 src/lib/libcrypto/malloc-wrapper.c

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index ce5adf0f5a..9158a2e594 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.224 2024/11/05 11:21:15 tb Exp $
+# $OpenBSD: Makefile,v 1.225 2024/11/06 04:08:26 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -61,7 +61,7 @@ SRCS+= crypto_ex_data.c
 SRCS+= crypto_init.c
 SRCS+= crypto_legacy.c
 SRCS+= crypto_lock.c
-SRCS+= malloc-wrapper.c
+SRCS+= crypto_memory.c
 
 # aes/
 SRCS+= aes.c
diff --git a/src/lib/libcrypto/crypto_memory.c b/src/lib/libcrypto/crypto_memory.c
new file mode 100644
index 0000000000..e294b11fa3
--- /dev/null
+++ b/src/lib/libcrypto/crypto_memory.c
@@ -0,0 +1,58 @@
+/* $OpenBSD: crypto_memory.c,v 1.1 2024/11/06 04:08:26 tb 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>
+
+#include <openssl/crypto.h>
+
+int
+CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
+    void (*f)(void *))
+{
+	return 0;
+}
+LCRYPTO_ALIAS(CRYPTO_set_mem_functions);
+
+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;
+}
+LCRYPTO_ALIAS(CRYPTO_set_mem_ex_functions);
+
+void *
+CRYPTO_malloc(size_t num, const char *file, int line)
+{
+	return malloc(num);
+}
+LCRYPTO_ALIAS(CRYPTO_malloc);
+
+char *
+CRYPTO_strdup(const char *str, const char *file, int line)
+{
+	return strdup(str);
+}
+LCRYPTO_ALIAS(CRYPTO_strdup);
+
+void
+CRYPTO_free(void *ptr, const char *file, int line)
+{
+	free(ptr);
+}
+LCRYPTO_ALIAS(CRYPTO_free);
diff --git a/src/lib/libcrypto/malloc-wrapper.c b/src/lib/libcrypto/malloc-wrapper.c
deleted file mode 100644
index 7330903c6c..0000000000
--- a/src/lib/libcrypto/malloc-wrapper.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $OpenBSD: malloc-wrapper.c,v 1.11 2024/04/10 14:51:02 beck 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>
-
-#include <openssl/crypto.h>
-
-int
-CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
-    void (*f)(void *))
-{
-	return 0;
-}
-LCRYPTO_ALIAS(CRYPTO_set_mem_functions);
-
-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;
-}
-LCRYPTO_ALIAS(CRYPTO_set_mem_ex_functions);
-
-void *
-CRYPTO_malloc(size_t num, const char *file, int line)
-{
-	return malloc(num);
-}
-LCRYPTO_ALIAS(CRYPTO_malloc);
-
-char *
-CRYPTO_strdup(const char *str, const char *file, int line)
-{
-	return strdup(str);
-}
-LCRYPTO_ALIAS(CRYPTO_strdup);
-
-void
-CRYPTO_free(void *ptr, const char *file, int line)
-{
-	free(ptr);
-}
-LCRYPTO_ALIAS(CRYPTO_free);
-- 
cgit v1.2.3-55-g6feb