From 02325d3f08b84c968c0a9d0980ccca4efca3c676 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 9 Mar 2025 15:17:22 +0000
Subject: Unexport X509_NAME_print()

Nothing uses this anymore. M2Crypto has been patched and a fix for
opensc has been upstreamed.

ok jsing

This is the start of a major bump. Don't build the tree until I have
synced sets in about 20 commits.
---
 src/lib/libcrypto/Symbols.list          | 1 -
 src/lib/libcrypto/asn1/a_strex.c        | 5 ++---
 src/lib/libcrypto/hidden/openssl/x509.h | 3 +--
 src/lib/libcrypto/x509/x509.h           | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 8459316be1..22e7565b71 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -2476,7 +2476,6 @@ X509_NAME_hash_old
 X509_NAME_it
 X509_NAME_new
 X509_NAME_oneline
-X509_NAME_print
 X509_NAME_print_ex
 X509_NAME_print_ex_fp
 X509_NAME_set
diff --git a/src/lib/libcrypto/asn1/a_strex.c b/src/lib/libcrypto/asn1/a_strex.c
index a9ee0dd9c9..5523c22cc4 100644
--- a/src/lib/libcrypto/asn1/a_strex.c
+++ b/src/lib/libcrypto/asn1/a_strex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_strex.c,v 1.36 2025/02/08 03:41:36 tb Exp $ */
+/* $OpenBSD: a_strex.c,v 1.37 2025/03/09 15:17:22 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -590,7 +590,7 @@ x509_name_entry_include(const X509_NAME_ENTRY *ne)
 	return 0;
 }
 
-int
+static int
 X509_NAME_print(BIO *bio, const X509_NAME *name, int obase)
 {
 	CBB cbb;
@@ -640,7 +640,6 @@ X509_NAME_print(BIO *bio, const X509_NAME *name, int obase)
 
 	return ret;
 }
-LCRYPTO_ALIAS(X509_NAME_print);
 
 /* Wrappers round the main functions */
 
diff --git a/src/lib/libcrypto/hidden/openssl/x509.h b/src/lib/libcrypto/hidden/openssl/x509.h
index ac990a631d..e6104cd451 100644
--- a/src/lib/libcrypto/hidden/openssl/x509.h
+++ b/src/lib/libcrypto/hidden/openssl/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.14 2024/08/31 10:46:40 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.15 2025/03/09 15:17:22 tb Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -422,7 +422,6 @@ LCRYPTO_USED(X509_print_fp);
 LCRYPTO_USED(X509_CRL_print_fp);
 LCRYPTO_USED(X509_REQ_print_fp);
 LCRYPTO_USED(X509_NAME_print_ex_fp);
-LCRYPTO_USED(X509_NAME_print);
 LCRYPTO_USED(X509_NAME_print_ex);
 LCRYPTO_USED(X509_print_ex);
 LCRYPTO_USED(X509_print);
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index 7390aaebfb..a198b23202 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.120 2025/03/01 11:31:28 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.121 2025/03/09 15:17:22 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -788,7 +788,6 @@ int		X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent,
 		    unsigned long flags);
 
 #ifndef OPENSSL_NO_BIO
-int		X509_NAME_print(BIO *bp, const X509_NAME *name, int obase);
 int		X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent,
 		    unsigned long flags);
 int		X509_print_ex(BIO *bp,X509 *x, unsigned long nmflag, unsigned long cflag);
-- 
cgit v1.2.3-55-g6feb