From 703da89de29bc2a68c8a28e0a02f14dbe9afdc96 Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 15 Apr 2024 15:52:01 +0000 Subject: [PATCH] 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 --- lib/libcrypto/Symbols.list | 2 -- lib/libcrypto/asn1/x_name.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index 0f0d2e74e5c..0984ef32333 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -2525,7 +2525,6 @@ X509_LOOKUP_file X509_LOOKUP_free X509_LOOKUP_hash_dir X509_LOOKUP_mem -X509_NAME_ENTRIES_it X509_NAME_ENTRY_create_by_NID X509_NAME_ENTRY_create_by_OBJ X509_NAME_ENTRY_create_by_txt @@ -2538,7 +2537,6 @@ X509_NAME_ENTRY_new X509_NAME_ENTRY_set X509_NAME_ENTRY_set_data X509_NAME_ENTRY_set_object -X509_NAME_INTERNAL_it X509_NAME_add_entry X509_NAME_add_entry_by_NID X509_NAME_add_entry_by_OBJ diff --git a/lib/libcrypto/asn1/x_name.c b/lib/libcrypto/asn1/x_name.c index 5124ad3b253..f7d28e86b18 100644 --- a/lib/libcrypto/asn1/x_name.c +++ b/lib/libcrypto/asn1/x_name.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_name.c,v 1.42 2024/04/09 13:55:02 beck Exp $ */ +/* $OpenBSD: x_name.c,v 1.43 2024/04/15 15:52:01 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -159,7 +159,7 @@ static const ASN1_TEMPLATE X509_NAME_ENTRIES_item_tt = { .item = &X509_NAME_ENTRY_it, }; -const ASN1_ITEM X509_NAME_ENTRIES_it = { +static const ASN1_ITEM X509_NAME_ENTRIES_it = { .itype = ASN1_ITYPE_PRIMITIVE, .utype = -1, .templates = &X509_NAME_ENTRIES_item_tt, @@ -177,7 +177,7 @@ static const ASN1_TEMPLATE X509_NAME_INTERNAL_item_tt = { .item = &X509_NAME_ENTRIES_it, }; -const ASN1_ITEM X509_NAME_INTERNAL_it = { +static const ASN1_ITEM X509_NAME_INTERNAL_it = { .itype = ASN1_ITYPE_PRIMITIVE, .utype = -1, .templates = &X509_NAME_INTERNAL_item_tt, -- 2.20.1