From 264b5e98a8b17bb4448b17960dd4e19ad8100d97 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Mon, 15 Apr 2024 15:55:01 +0000
Subject: [PATCH] Bye, bye, OPENSSL_str{,n}casecmp()

ok jsing
---
 lib/libcrypto/Makefile     |  3 +--
 lib/libcrypto/Symbols.list |  2 --
 lib/libcrypto/o_str.c      | 21 ---------------------
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 lib/libcrypto/o_str.c

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 7ed583fe4b1..1e295d17ecc 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.192 2024/03/29 07:36:38 jsing Exp $
+# $OpenBSD: Makefile,v 1.193 2024/04/15 15:55:01 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_str.c
 
 # aes/
 SRCS+= aes.c
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 3e7a32cf2fc..aa3019905ac 100644
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1707,8 +1707,6 @@ OPENSSL_init_crypto
 OPENSSL_load_builtin_modules
 OPENSSL_no_config
 OPENSSL_posix_to_tm
-OPENSSL_strcasecmp
-OPENSSL_strncasecmp
 OPENSSL_timegm
 OPENSSL_tm_to_posix
 OPENSSL_uni2asc
diff --git a/lib/libcrypto/o_str.c b/lib/libcrypto/o_str.c
deleted file mode 100644
index f05889e4c87..00000000000
--- a/lib/libcrypto/o_str.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $OpenBSD: o_str.c,v 1.9 2014/07/09 20:22:14 tedu Exp $ */
-/*
- * Written by Theo de Raadt.  Public domain.
- */
-
-#include <string.h>
-
-int OPENSSL_strcasecmp(const char *str1, const char *str2);
-int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n);
-
-int
-OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
-{
-	return strncasecmp(str1, str2, n);
-}
-
-int
-OPENSSL_strcasecmp(const char *str1, const char *str2)
-{
-	return strcasecmp(str1, str2);
-}
-- 
2.20.1