From 677a66d025419307bc6e760f1bcd514a0f43a3fd Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 2 Mar 2024 09:21:24 +0000
Subject: Remove BIO_dump_*{cb,fp}()

These were disabled and the internals that need to remain were fixed.
Time for this garbage to go.

ok jsing
---
 src/lib/libcrypto/bio/b_dump.c | 38 +-------------------------------------
 src/lib/libcrypto/bio/bio.h    | 10 +++-------
 2 files changed, 4 insertions(+), 44 deletions(-)

(limited to 'src/lib/libcrypto/bio')

diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
index 39cd94e767..4dcf710bbe 100644
--- a/src/lib/libcrypto/bio/b_dump.c
+++ b/src/lib/libcrypto/bio/b_dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_dump.c,v 1.29 2024/02/15 10:34:30 tb Exp $ */
+/* $OpenBSD: b_dump.c,v 1.30 2024/03/02 09:21:24 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -209,39 +209,3 @@ BIO_dump(BIO *bio, const char *s, int len)
 	return BIO_dump_indent(bio, s, len, 0);
 }
 LCRYPTO_ALIAS(BIO_dump);
-
-/*
- * XXX - remove the functions below in the next major bump.
- */
-
-int
-BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
-    void *u, const char *s, int len)
-{
-	BIOerror(ERR_R_DISABLED);
-	return -1;
-}
-
-int
-BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
-    void *u, const char *s, int len, int indent)
-{
-	BIOerror(ERR_R_DISABLED);
-	return -1;
-}
-
-int
-BIO_dump_fp(FILE *fp, const char *s, int len)
-{
-	BIOerror(ERR_R_DISABLED);
-	return -1;
-}
-LCRYPTO_ALIAS(BIO_dump_fp);
-
-int
-BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent)
-{
-	BIOerror(ERR_R_DISABLED);
-	return -1;
-}
-LCRYPTO_ALIAS(BIO_dump_indent_fp);
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 10b0924f73..bf1be3650c 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.61 2024/03/02 09:18:28 tb Exp $ */
+/* $OpenBSD: bio.h,v 1.62 2024/03/02 09:21:24 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -599,14 +599,10 @@ int BIO_dgram_non_fatal_error(int _error);
 
 int BIO_fd_should_retry(int i);
 int BIO_fd_non_fatal_error(int _error);
-int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
-    void *u, const char *s, int len);
-int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
-    void *u, const char *s, int len, int indent);
+
 int BIO_dump(BIO *b, const char *bytes, int len);
 int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
-int BIO_dump_fp(FILE *fp, const char *s, int len);
-int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
+
 struct hostent *BIO_gethostbyname(const char *name);
 /* We might want a thread-safe interface too:
  * struct hostent *BIO_gethostbyname_r(const char *name,
-- 
cgit v1.2.3-55-g6feb