And a pile of TS ASN.1 stuff becomes internal-only, too

ok jsing

2 files changed, 10 insertions, 19 deletions

diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 0984ef3233..3e7a32cf2f 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1085,15 +1085,12 @@ ERR_set_mark
 ERR_unload_strings
 ESS_CERT_ID_dup
 ESS_CERT_ID_free
-ESS_CERT_ID_it
 ESS_CERT_ID_new
 ESS_ISSUER_SERIAL_dup
 ESS_ISSUER_SERIAL_free
-ESS_ISSUER_SERIAL_it
 ESS_ISSUER_SERIAL_new
 ESS_SIGNING_CERT_dup
 ESS_SIGNING_CERT_free
-ESS_SIGNING_CERT_it
 ESS_SIGNING_CERT_new
 EVP_AEAD_CTX_cleanup
 EVP_AEAD_CTX_free
@@ -2182,7 +2179,6 @@ TS_ACCURACY_free
 TS_ACCURACY_get_micros
 TS_ACCURACY_get_millis
 TS_ACCURACY_get_seconds
-TS_ACCURACY_it
 TS_ACCURACY_new
 TS_ACCURACY_set_micros
 TS_ACCURACY_set_millis
@@ -2208,7 +2204,6 @@ TS_MSG_IMPRINT_dup
 TS_MSG_IMPRINT_free
 TS_MSG_IMPRINT_get_algo
 TS_MSG_IMPRINT_get_msg
-TS_MSG_IMPRINT_it
 TS_MSG_IMPRINT_new
 TS_MSG_IMPRINT_print_bio
 TS_MSG_IMPRINT_set_algo
@@ -2231,7 +2226,6 @@ TS_REQ_get_msg_imprint
 TS_REQ_get_nonce
 TS_REQ_get_policy_id
 TS_REQ_get_version
-TS_REQ_it
 TS_REQ_new
 TS_REQ_print_bio
 TS_REQ_set_cert_req
@@ -2265,7 +2259,6 @@ TS_RESP_free
 TS_RESP_get_status_info
 TS_RESP_get_token
 TS_RESP_get_tst_info
-TS_RESP_it
 TS_RESP_new
 TS_RESP_print_bio
 TS_RESP_set_status_info
@@ -2278,7 +2271,6 @@ TS_STATUS_INFO_free
 TS_STATUS_INFO_get0_failure_info
 TS_STATUS_INFO_get0_status
 TS_STATUS_INFO_get0_text
-TS_STATUS_INFO_it
 TS_STATUS_INFO_new
 TS_STATUS_INFO_print_bio
 TS_STATUS_INFO_set_status
@@ -2303,7 +2295,6 @@ TS_TST_INFO_get_serial
 TS_TST_INFO_get_time
 TS_TST_INFO_get_tsa
 TS_TST_INFO_get_version
-TS_TST_INFO_it
 TS_TST_INFO_new
 TS_TST_INFO_print_bio
 TS_TST_INFO_set_accuracy
diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c
index 60ee0b81cb..feb2da68f9 100644
--- a/src/lib/libcrypto/ts/ts_asn1.c
+++ b/src/lib/libcrypto/ts/ts_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_asn1.c,v 1.14 2023/07/07 07:25:21 beck Exp $ */
+/* $OpenBSD: ts_asn1.c,v 1.15 2024/04/15 15:52:46 tb Exp $ */
 /* Written by Nils Larsch for the OpenSSL project 2004.
  */
 /* ====================================================================
@@ -80,7 +80,7 @@ static const ASN1_TEMPLATE TS_MSG_IMPRINT_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM TS_MSG_IMPRINT_it = {
+static const ASN1_ITEM TS_MSG_IMPRINT_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = TS_MSG_IMPRINT_seq_tt,
@@ -202,7 +202,7 @@ static const ASN1_TEMPLATE TS_REQ_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM TS_REQ_it = {
+static const ASN1_ITEM TS_REQ_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = TS_REQ_seq_tt,
@@ -303,7 +303,7 @@ static const ASN1_TEMPLATE TS_ACCURACY_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM TS_ACCURACY_it = {
+static const ASN1_ITEM TS_ACCURACY_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = TS_ACCURACY_seq_tt,
@@ -423,7 +423,7 @@ static const ASN1_TEMPLATE TS_TST_INFO_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM TS_TST_INFO_it = {
+static const ASN1_ITEM TS_TST_INFO_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = TS_TST_INFO_seq_tt,
@@ -524,7 +524,7 @@ static const ASN1_TEMPLATE TS_STATUS_INFO_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM TS_STATUS_INFO_it = {
+static const ASN1_ITEM TS_STATUS_INFO_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = TS_STATUS_INFO_seq_tt,
@@ -640,7 +640,7 @@ static const ASN1_TEMPLATE TS_RESP_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM TS_RESP_it = {
+static const ASN1_ITEM TS_RESP_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = TS_RESP_seq_tt,
@@ -734,7 +734,7 @@ static const ASN1_TEMPLATE ESS_ISSUER_SERIAL_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM ESS_ISSUER_SERIAL_it = {
+static const ASN1_ITEM ESS_ISSUER_SERIAL_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = ESS_ISSUER_SERIAL_seq_tt,
@@ -798,7 +798,7 @@ static const ASN1_TEMPLATE ESS_CERT_ID_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM ESS_CERT_ID_it = {
+static const ASN1_ITEM ESS_CERT_ID_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = ESS_CERT_ID_seq_tt,
@@ -862,7 +862,7 @@ static const ASN1_TEMPLATE ESS_SIGNING_CERT_seq_tt[] = {
         },
 };
 
-const ASN1_ITEM ESS_SIGNING_CERT_it = {
+static const ASN1_ITEM ESS_SIGNING_CERT_it = {
         .itype = ASN1_ITYPE_SEQUENCE,
         .utype = V_ASN1_SEQUENCE,
         .templates = ESS_SIGNING_CERT_seq_tt,