From df2dd802bcb8b62379c01acc34b4d5a3ecd36b5b Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 9 Mar 2025 15:20:20 +0000
Subject: Unexport the weird X509_OBJECT_up_ref_count()

It's only used in x509_lu.c, so move it there. X509_OBJECT is not
itself refcounted. This API bumps the refcount of its cert or CRL
member. This isn't really useful outside of the library.

ok jsing
---
 src/lib/libcrypto/Symbols.list              | 1 -
 src/lib/libcrypto/hidden/openssl/x509_vfy.h | 3 +--
 src/lib/libcrypto/x509/x509_lu.c            | 7 ++++---
 src/lib/libcrypto/x509/x509_vfy.h           | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 22e7565b71..faf4fb135f 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -2487,7 +2487,6 @@ X509_OBJECT_idx_by_subject
 X509_OBJECT_new
 X509_OBJECT_retrieve_by_subject
 X509_OBJECT_retrieve_match
-X509_OBJECT_up_ref_count
 X509_PKEY_free
 X509_PKEY_new
 X509_PUBKEY_free
diff --git a/src/lib/libcrypto/hidden/openssl/x509_vfy.h b/src/lib/libcrypto/hidden/openssl/x509_vfy.h
index 3d65837a48..cc0991518f 100644
--- a/src/lib/libcrypto/hidden/openssl/x509_vfy.h
+++ b/src/lib/libcrypto/hidden/openssl/x509_vfy.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_vfy.h,v 1.9 2024/03/02 10:57:03 tb Exp $ */
+/* $OpenBSD: x509_vfy.h,v 1.10 2025/03/09 15:20:20 tb Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -32,7 +32,6 @@ LCRYPTO_USED(X509_OBJECT_free);
 LCRYPTO_USED(X509_OBJECT_idx_by_subject);
 LCRYPTO_USED(X509_OBJECT_retrieve_by_subject);
 LCRYPTO_USED(X509_OBJECT_retrieve_match);
-LCRYPTO_USED(X509_OBJECT_up_ref_count);
 LCRYPTO_USED(X509_OBJECT_get_type);
 LCRYPTO_USED(X509_OBJECT_get0_X509);
 LCRYPTO_USED(X509_OBJECT_get0_X509_CRL);
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c
index 8ea1d158bf..0367794fca 100644
--- a/src/lib/libcrypto/x509/x509_lu.c
+++ b/src/lib/libcrypto/x509/x509_lu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_lu.c,v 1.66 2024/08/31 10:19:17 tb Exp $ */
+/* $OpenBSD: x509_lu.c,v 1.67 2025/03/09 15:20:20 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,6 +66,8 @@
 
 #include "x509_local.h"
 
+static int X509_OBJECT_up_ref_count(X509_OBJECT *a);
+
 static X509_LOOKUP *
 X509_LOOKUP_new(const X509_LOOKUP_METHOD *method)
 {
@@ -404,7 +406,7 @@ X509_STORE_add_crl(X509_STORE *store, X509_CRL *x)
 }
 LCRYPTO_ALIAS(X509_STORE_add_crl);
 
-int
+static int
 X509_OBJECT_up_ref_count(X509_OBJECT *a)
 {
 	switch (a->type) {
@@ -415,7 +417,6 @@ X509_OBJECT_up_ref_count(X509_OBJECT *a)
 	}
 	return 1;
 }
-LCRYPTO_ALIAS(X509_OBJECT_up_ref_count);
 
 X509_LOOKUP_TYPE
 X509_OBJECT_get_type(const X509_OBJECT *a)
diff --git a/src/lib/libcrypto/x509/x509_vfy.h b/src/lib/libcrypto/x509/x509_vfy.h
index 43b94021b5..7058bbc5b0 100644
--- a/src/lib/libcrypto/x509/x509_vfy.h
+++ b/src/lib/libcrypto/x509/x509_vfy.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_vfy.h,v 1.69 2024/08/31 10:19:17 tb Exp $ */
+/* $OpenBSD: x509_vfy.h,v 1.70 2025/03/09 15:20:20 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -280,7 +280,6 @@ int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
 X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,
     X509_LOOKUP_TYPE type, X509_NAME *name);
 X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x);
-int X509_OBJECT_up_ref_count(X509_OBJECT *a);
 X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a);
 X509 *X509_OBJECT_get0_X509(const X509_OBJECT *xo);
 X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *xo);
-- 
cgit v1.2.3-55-g6feb