summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-04-15 15:52:01 +0000
committertb <>2024-04-15 15:52:01 +0000
commit618ac6b71539e63e174c458b65bd18a06f102173 (patch)
treef727566194e5d48cc4285e3c914d7be2ad3d37cf
parenteaec6fe55de5b154c7834985bf4beb20a123e220 (diff)
downloadopenbsd-618ac6b71539e63e174c458b65bd18a06f102173.tar.gz
openbsd-618ac6b71539e63e174c458b65bd18a06f102173.tar.bz2
openbsd-618ac6b71539e63e174c458b65bd18a06f102173.zip
X509_NAME_ENTRIES_it and X509_NAME_INTERNAL_it go internal
It's always good to see something called internal in the public API. ok jsing
-rw-r--r--src/lib/libcrypto/Symbols.list2
-rw-r--r--src/lib/libcrypto/asn1/x_name.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 0f0d2e74e5..0984ef3233 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -2525,7 +2525,6 @@ X509_LOOKUP_file
2525X509_LOOKUP_free 2525X509_LOOKUP_free
2526X509_LOOKUP_hash_dir 2526X509_LOOKUP_hash_dir
2527X509_LOOKUP_mem 2527X509_LOOKUP_mem
2528X509_NAME_ENTRIES_it
2529X509_NAME_ENTRY_create_by_NID 2528X509_NAME_ENTRY_create_by_NID
2530X509_NAME_ENTRY_create_by_OBJ 2529X509_NAME_ENTRY_create_by_OBJ
2531X509_NAME_ENTRY_create_by_txt 2530X509_NAME_ENTRY_create_by_txt
@@ -2538,7 +2537,6 @@ X509_NAME_ENTRY_new
2538X509_NAME_ENTRY_set 2537X509_NAME_ENTRY_set
2539X509_NAME_ENTRY_set_data 2538X509_NAME_ENTRY_set_data
2540X509_NAME_ENTRY_set_object 2539X509_NAME_ENTRY_set_object
2541X509_NAME_INTERNAL_it
2542X509_NAME_add_entry 2540X509_NAME_add_entry
2543X509_NAME_add_entry_by_NID 2541X509_NAME_add_entry_by_NID
2544X509_NAME_add_entry_by_OBJ 2542X509_NAME_add_entry_by_OBJ
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
index 5124ad3b25..f7d28e86b1 100644
--- a/src/lib/libcrypto/asn1/x_name.c
+++ b/src/lib/libcrypto/asn1/x_name.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_name.c,v 1.42 2024/04/09 13:55:02 beck Exp $ */ 1/* $OpenBSD: x_name.c,v 1.43 2024/04/15 15:52:01 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 *
@@ -159,7 +159,7 @@ static const ASN1_TEMPLATE X509_NAME_ENTRIES_item_tt = {
159 .item = &X509_NAME_ENTRY_it, 159 .item = &X509_NAME_ENTRY_it,
160}; 160};
161 161
162const ASN1_ITEM X509_NAME_ENTRIES_it = { 162static const ASN1_ITEM X509_NAME_ENTRIES_it = {
163 .itype = ASN1_ITYPE_PRIMITIVE, 163 .itype = ASN1_ITYPE_PRIMITIVE,
164 .utype = -1, 164 .utype = -1,
165 .templates = &X509_NAME_ENTRIES_item_tt, 165 .templates = &X509_NAME_ENTRIES_item_tt,
@@ -177,7 +177,7 @@ static const ASN1_TEMPLATE X509_NAME_INTERNAL_item_tt = {
177 .item = &X509_NAME_ENTRIES_it, 177 .item = &X509_NAME_ENTRIES_it,
178}; 178};
179 179
180const ASN1_ITEM X509_NAME_INTERNAL_it = { 180static const ASN1_ITEM X509_NAME_INTERNAL_it = {
181 .itype = ASN1_ITYPE_PRIMITIVE, 181 .itype = ASN1_ITYPE_PRIMITIVE,
182 .utype = -1, 182 .utype = -1,
183 .templates = &X509_NAME_INTERNAL_item_tt, 183 .templates = &X509_NAME_INTERNAL_item_tt,