summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2025-03-09 15:20:20 +0000
committertb <>2025-03-09 15:20:20 +0000
commitdf2dd802bcb8b62379c01acc34b4d5a3ecd36b5b (patch)
tree6211c10e590ea0a50bf0271a5c907a1ca47045cb /src/lib
parent02325d3f08b84c968c0a9d0980ccca4efca3c676 (diff)
downloadopenbsd-df2dd802bcb8b62379c01acc34b4d5a3ecd36b5b.tar.gz
openbsd-df2dd802bcb8b62379c01acc34b4d5a3ecd36b5b.tar.bz2
openbsd-df2dd802bcb8b62379c01acc34b4d5a3ecd36b5b.zip
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
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/Symbols.list1
-rw-r--r--src/lib/libcrypto/hidden/openssl/x509_vfy.h3
-rw-r--r--src/lib/libcrypto/x509/x509_lu.c7
-rw-r--r--src/lib/libcrypto/x509/x509_vfy.h3
4 files changed, 6 insertions, 8 deletions
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
2487X509_OBJECT_new 2487X509_OBJECT_new
2488X509_OBJECT_retrieve_by_subject 2488X509_OBJECT_retrieve_by_subject
2489X509_OBJECT_retrieve_match 2489X509_OBJECT_retrieve_match
2490X509_OBJECT_up_ref_count
2491X509_PKEY_free 2490X509_PKEY_free
2492X509_PKEY_new 2491X509_PKEY_new
2493X509_PUBKEY_free 2492X509_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 @@
1/* $OpenBSD: x509_vfy.h,v 1.9 2024/03/02 10:57:03 tb Exp $ */ 1/* $OpenBSD: x509_vfy.h,v 1.10 2025/03/09 15:20:20 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -32,7 +32,6 @@ LCRYPTO_USED(X509_OBJECT_free);
32LCRYPTO_USED(X509_OBJECT_idx_by_subject); 32LCRYPTO_USED(X509_OBJECT_idx_by_subject);
33LCRYPTO_USED(X509_OBJECT_retrieve_by_subject); 33LCRYPTO_USED(X509_OBJECT_retrieve_by_subject);
34LCRYPTO_USED(X509_OBJECT_retrieve_match); 34LCRYPTO_USED(X509_OBJECT_retrieve_match);
35LCRYPTO_USED(X509_OBJECT_up_ref_count);
36LCRYPTO_USED(X509_OBJECT_get_type); 35LCRYPTO_USED(X509_OBJECT_get_type);
37LCRYPTO_USED(X509_OBJECT_get0_X509); 36LCRYPTO_USED(X509_OBJECT_get0_X509);
38LCRYPTO_USED(X509_OBJECT_get0_X509_CRL); 37LCRYPTO_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 @@
1/* $OpenBSD: x509_lu.c,v 1.66 2024/08/31 10:19:17 tb Exp $ */ 1/* $OpenBSD: x509_lu.c,v 1.67 2025/03/09 15:20:20 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -66,6 +66,8 @@
66 66
67#include "x509_local.h" 67#include "x509_local.h"
68 68
69static int X509_OBJECT_up_ref_count(X509_OBJECT *a);
70
69static X509_LOOKUP * 71static X509_LOOKUP *
70X509_LOOKUP_new(const X509_LOOKUP_METHOD *method) 72X509_LOOKUP_new(const X509_LOOKUP_METHOD *method)
71{ 73{
@@ -404,7 +406,7 @@ X509_STORE_add_crl(X509_STORE *store, X509_CRL *x)
404} 406}
405LCRYPTO_ALIAS(X509_STORE_add_crl); 407LCRYPTO_ALIAS(X509_STORE_add_crl);
406 408
407int 409static int
408X509_OBJECT_up_ref_count(X509_OBJECT *a) 410X509_OBJECT_up_ref_count(X509_OBJECT *a)
409{ 411{
410 switch (a->type) { 412 switch (a->type) {
@@ -415,7 +417,6 @@ X509_OBJECT_up_ref_count(X509_OBJECT *a)
415 } 417 }
416 return 1; 418 return 1;
417} 419}
418LCRYPTO_ALIAS(X509_OBJECT_up_ref_count);
419 420
420X509_LOOKUP_TYPE 421X509_LOOKUP_TYPE
421X509_OBJECT_get_type(const X509_OBJECT *a) 422X509_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 @@
1/* $OpenBSD: x509_vfy.h,v 1.69 2024/08/31 10:19:17 tb Exp $ */ 1/* $OpenBSD: x509_vfy.h,v 1.70 2025/03/09 15:20:20 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -280,7 +280,6 @@ int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
280X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h, 280X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,
281 X509_LOOKUP_TYPE type, X509_NAME *name); 281 X509_LOOKUP_TYPE type, X509_NAME *name);
282X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x); 282X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x);
283int X509_OBJECT_up_ref_count(X509_OBJECT *a);
284X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a); 283X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a);
285X509 *X509_OBJECT_get0_X509(const X509_OBJECT *xo); 284X509 *X509_OBJECT_get0_X509(const X509_OBJECT *xo);
286X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *xo); 285X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *xo);