From 90aaecc08a13c406fab617fec14d7dfcc2c433bb Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Tue, 19 Mar 2024 19:27:33 +0000
Subject: [PATCH] Move the OPENSSL_init() stub from o_init.c to crypto_init.c

---
 lib/libcrypto/Makefile      |  3 +--
 lib/libcrypto/crypto_init.c |  7 ++++++-
 lib/libcrypto/o_init.c      | 10 ----------
 3 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 lib/libcrypto/o_init.c

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 06bb1ec6bdb..8c3d05bd483 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.174 2024/03/02 13:39:28 tb Exp $
+# $OpenBSD: Makefile,v 1.175 2024/03/19 19:27:33 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -69,7 +69,6 @@ SRCS+= malloc-wrapper.c
 SRCS+= mem_clr.c
 SRCS+= mem_dbg.c
 SRCS+= o_fips.c
-SRCS+= o_init.c
 SRCS+= o_str.c
 
 # aes/
diff --git a/lib/libcrypto/crypto_init.c b/lib/libcrypto/crypto_init.c
index 56f4460e65f..ddd3ec19bc3 100644
--- a/lib/libcrypto/crypto_init.c
+++ b/lib/libcrypto/crypto_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto_init.c,v 1.18 2024/01/25 12:22:31 tb Exp $ */
+/*	$OpenBSD: crypto_init.c,v 1.19 2024/03/19 19:27:33 tb Exp $ */
 /*
  * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
  *
@@ -37,6 +37,11 @@ static pthread_once_t crypto_init_once = PTHREAD_ONCE_INIT;
 static pthread_t crypto_init_thread;
 static int crypto_init_cleaned_up;
 
+void
+OPENSSL_init(void)
+{
+}
+
 static void
 OPENSSL_init_crypto_internal(void)
 {
diff --git a/lib/libcrypto/o_init.c b/lib/libcrypto/o_init.c
deleted file mode 100644
index 2f819eac958..00000000000
--- a/lib/libcrypto/o_init.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $OpenBSD: o_init.c,v 1.8 2014/06/12 15:49:27 deraadt Exp $ */
-/* Ted Unangst places this file in the public domain. */
-
-#include <openssl/crypto.h>
-
-void
-OPENSSL_init(void)
-{
-
-}
-- 
2.20.1