diff options
author | tb <> | 2024-04-15 15:52:46 +0000 |
---|---|---|
committer | tb <> | 2024-04-15 15:52:46 +0000 |
commit | fd4066a78d7d353cca0845b810adcea3560a0ae5 (patch) | |
tree | ef7659a9bc19d05026d796f217375511b67920ff /src | |
parent | 618ac6b71539e63e174c458b65bd18a06f102173 (diff) | |
download | openbsd-fd4066a78d7d353cca0845b810adcea3560a0ae5.tar.gz openbsd-fd4066a78d7d353cca0845b810adcea3560a0ae5.tar.bz2 openbsd-fd4066a78d7d353cca0845b810adcea3560a0ae5.zip |
And a pile of TS ASN.1 stuff becomes internal-only, too
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/ts/ts_asn1.c | 20 |
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 | |||
1085 | ERR_unload_strings | 1085 | ERR_unload_strings |
1086 | ESS_CERT_ID_dup | 1086 | ESS_CERT_ID_dup |
1087 | ESS_CERT_ID_free | 1087 | ESS_CERT_ID_free |
1088 | ESS_CERT_ID_it | ||
1089 | ESS_CERT_ID_new | 1088 | ESS_CERT_ID_new |
1090 | ESS_ISSUER_SERIAL_dup | 1089 | ESS_ISSUER_SERIAL_dup |
1091 | ESS_ISSUER_SERIAL_free | 1090 | ESS_ISSUER_SERIAL_free |
1092 | ESS_ISSUER_SERIAL_it | ||
1093 | ESS_ISSUER_SERIAL_new | 1091 | ESS_ISSUER_SERIAL_new |
1094 | ESS_SIGNING_CERT_dup | 1092 | ESS_SIGNING_CERT_dup |
1095 | ESS_SIGNING_CERT_free | 1093 | ESS_SIGNING_CERT_free |
1096 | ESS_SIGNING_CERT_it | ||
1097 | ESS_SIGNING_CERT_new | 1094 | ESS_SIGNING_CERT_new |
1098 | EVP_AEAD_CTX_cleanup | 1095 | EVP_AEAD_CTX_cleanup |
1099 | EVP_AEAD_CTX_free | 1096 | EVP_AEAD_CTX_free |
@@ -2182,7 +2179,6 @@ TS_ACCURACY_free | |||
2182 | TS_ACCURACY_get_micros | 2179 | TS_ACCURACY_get_micros |
2183 | TS_ACCURACY_get_millis | 2180 | TS_ACCURACY_get_millis |
2184 | TS_ACCURACY_get_seconds | 2181 | TS_ACCURACY_get_seconds |
2185 | TS_ACCURACY_it | ||
2186 | TS_ACCURACY_new | 2182 | TS_ACCURACY_new |
2187 | TS_ACCURACY_set_micros | 2183 | TS_ACCURACY_set_micros |
2188 | TS_ACCURACY_set_millis | 2184 | TS_ACCURACY_set_millis |
@@ -2208,7 +2204,6 @@ TS_MSG_IMPRINT_dup | |||
2208 | TS_MSG_IMPRINT_free | 2204 | TS_MSG_IMPRINT_free |
2209 | TS_MSG_IMPRINT_get_algo | 2205 | TS_MSG_IMPRINT_get_algo |
2210 | TS_MSG_IMPRINT_get_msg | 2206 | TS_MSG_IMPRINT_get_msg |
2211 | TS_MSG_IMPRINT_it | ||
2212 | TS_MSG_IMPRINT_new | 2207 | TS_MSG_IMPRINT_new |
2213 | TS_MSG_IMPRINT_print_bio | 2208 | TS_MSG_IMPRINT_print_bio |
2214 | TS_MSG_IMPRINT_set_algo | 2209 | TS_MSG_IMPRINT_set_algo |
@@ -2231,7 +2226,6 @@ TS_REQ_get_msg_imprint | |||
2231 | TS_REQ_get_nonce | 2226 | TS_REQ_get_nonce |
2232 | TS_REQ_get_policy_id | 2227 | TS_REQ_get_policy_id |
2233 | TS_REQ_get_version | 2228 | TS_REQ_get_version |
2234 | TS_REQ_it | ||
2235 | TS_REQ_new | 2229 | TS_REQ_new |
2236 | TS_REQ_print_bio | 2230 | TS_REQ_print_bio |
2237 | TS_REQ_set_cert_req | 2231 | TS_REQ_set_cert_req |
@@ -2265,7 +2259,6 @@ TS_RESP_free | |||
2265 | TS_RESP_get_status_info | 2259 | TS_RESP_get_status_info |
2266 | TS_RESP_get_token | 2260 | TS_RESP_get_token |
2267 | TS_RESP_get_tst_info | 2261 | TS_RESP_get_tst_info |
2268 | TS_RESP_it | ||
2269 | TS_RESP_new | 2262 | TS_RESP_new |
2270 | TS_RESP_print_bio | 2263 | TS_RESP_print_bio |
2271 | TS_RESP_set_status_info | 2264 | TS_RESP_set_status_info |
@@ -2278,7 +2271,6 @@ TS_STATUS_INFO_free | |||
2278 | TS_STATUS_INFO_get0_failure_info | 2271 | TS_STATUS_INFO_get0_failure_info |
2279 | TS_STATUS_INFO_get0_status | 2272 | TS_STATUS_INFO_get0_status |
2280 | TS_STATUS_INFO_get0_text | 2273 | TS_STATUS_INFO_get0_text |
2281 | TS_STATUS_INFO_it | ||
2282 | TS_STATUS_INFO_new | 2274 | TS_STATUS_INFO_new |
2283 | TS_STATUS_INFO_print_bio | 2275 | TS_STATUS_INFO_print_bio |
2284 | TS_STATUS_INFO_set_status | 2276 | TS_STATUS_INFO_set_status |
@@ -2303,7 +2295,6 @@ TS_TST_INFO_get_serial | |||
2303 | TS_TST_INFO_get_time | 2295 | TS_TST_INFO_get_time |
2304 | TS_TST_INFO_get_tsa | 2296 | TS_TST_INFO_get_tsa |
2305 | TS_TST_INFO_get_version | 2297 | TS_TST_INFO_get_version |
2306 | TS_TST_INFO_it | ||
2307 | TS_TST_INFO_new | 2298 | TS_TST_INFO_new |
2308 | TS_TST_INFO_print_bio | 2299 | TS_TST_INFO_print_bio |
2309 | TS_TST_INFO_set_accuracy | 2300 | 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 @@ | |||
1 | /* $OpenBSD: ts_asn1.c,v 1.14 2023/07/07 07:25:21 beck Exp $ */ | 1 | /* $OpenBSD: ts_asn1.c,v 1.15 2024/04/15 15:52:46 tb Exp $ */ |
2 | /* Written by Nils Larsch for the OpenSSL project 2004. | 2 | /* Written by Nils Larsch for the OpenSSL project 2004. |
3 | */ | 3 | */ |
4 | /* ==================================================================== | 4 | /* ==================================================================== |
@@ -80,7 +80,7 @@ static const ASN1_TEMPLATE TS_MSG_IMPRINT_seq_tt[] = { | |||
80 | }, | 80 | }, |
81 | }; | 81 | }; |
82 | 82 | ||
83 | const ASN1_ITEM TS_MSG_IMPRINT_it = { | 83 | static const ASN1_ITEM TS_MSG_IMPRINT_it = { |
84 | .itype = ASN1_ITYPE_SEQUENCE, | 84 | .itype = ASN1_ITYPE_SEQUENCE, |
85 | .utype = V_ASN1_SEQUENCE, | 85 | .utype = V_ASN1_SEQUENCE, |
86 | .templates = TS_MSG_IMPRINT_seq_tt, | 86 | .templates = TS_MSG_IMPRINT_seq_tt, |
@@ -202,7 +202,7 @@ static const ASN1_TEMPLATE TS_REQ_seq_tt[] = { | |||
202 | }, | 202 | }, |
203 | }; | 203 | }; |
204 | 204 | ||
205 | const ASN1_ITEM TS_REQ_it = { | 205 | static const ASN1_ITEM TS_REQ_it = { |
206 | .itype = ASN1_ITYPE_SEQUENCE, | 206 | .itype = ASN1_ITYPE_SEQUENCE, |
207 | .utype = V_ASN1_SEQUENCE, | 207 | .utype = V_ASN1_SEQUENCE, |
208 | .templates = TS_REQ_seq_tt, | 208 | .templates = TS_REQ_seq_tt, |
@@ -303,7 +303,7 @@ static const ASN1_TEMPLATE TS_ACCURACY_seq_tt[] = { | |||
303 | }, | 303 | }, |
304 | }; | 304 | }; |
305 | 305 | ||
306 | const ASN1_ITEM TS_ACCURACY_it = { | 306 | static const ASN1_ITEM TS_ACCURACY_it = { |
307 | .itype = ASN1_ITYPE_SEQUENCE, | 307 | .itype = ASN1_ITYPE_SEQUENCE, |
308 | .utype = V_ASN1_SEQUENCE, | 308 | .utype = V_ASN1_SEQUENCE, |
309 | .templates = TS_ACCURACY_seq_tt, | 309 | .templates = TS_ACCURACY_seq_tt, |
@@ -423,7 +423,7 @@ static const ASN1_TEMPLATE TS_TST_INFO_seq_tt[] = { | |||
423 | }, | 423 | }, |
424 | }; | 424 | }; |
425 | 425 | ||
426 | const ASN1_ITEM TS_TST_INFO_it = { | 426 | static const ASN1_ITEM TS_TST_INFO_it = { |
427 | .itype = ASN1_ITYPE_SEQUENCE, | 427 | .itype = ASN1_ITYPE_SEQUENCE, |
428 | .utype = V_ASN1_SEQUENCE, | 428 | .utype = V_ASN1_SEQUENCE, |
429 | .templates = TS_TST_INFO_seq_tt, | 429 | .templates = TS_TST_INFO_seq_tt, |
@@ -524,7 +524,7 @@ static const ASN1_TEMPLATE TS_STATUS_INFO_seq_tt[] = { | |||
524 | }, | 524 | }, |
525 | }; | 525 | }; |
526 | 526 | ||
527 | const ASN1_ITEM TS_STATUS_INFO_it = { | 527 | static const ASN1_ITEM TS_STATUS_INFO_it = { |
528 | .itype = ASN1_ITYPE_SEQUENCE, | 528 | .itype = ASN1_ITYPE_SEQUENCE, |
529 | .utype = V_ASN1_SEQUENCE, | 529 | .utype = V_ASN1_SEQUENCE, |
530 | .templates = TS_STATUS_INFO_seq_tt, | 530 | .templates = TS_STATUS_INFO_seq_tt, |
@@ -640,7 +640,7 @@ static const ASN1_TEMPLATE TS_RESP_seq_tt[] = { | |||
640 | }, | 640 | }, |
641 | }; | 641 | }; |
642 | 642 | ||
643 | const ASN1_ITEM TS_RESP_it = { | 643 | static const ASN1_ITEM TS_RESP_it = { |
644 | .itype = ASN1_ITYPE_SEQUENCE, | 644 | .itype = ASN1_ITYPE_SEQUENCE, |
645 | .utype = V_ASN1_SEQUENCE, | 645 | .utype = V_ASN1_SEQUENCE, |
646 | .templates = TS_RESP_seq_tt, | 646 | .templates = TS_RESP_seq_tt, |
@@ -734,7 +734,7 @@ static const ASN1_TEMPLATE ESS_ISSUER_SERIAL_seq_tt[] = { | |||
734 | }, | 734 | }, |
735 | }; | 735 | }; |
736 | 736 | ||
737 | const ASN1_ITEM ESS_ISSUER_SERIAL_it = { | 737 | static const ASN1_ITEM ESS_ISSUER_SERIAL_it = { |
738 | .itype = ASN1_ITYPE_SEQUENCE, | 738 | .itype = ASN1_ITYPE_SEQUENCE, |
739 | .utype = V_ASN1_SEQUENCE, | 739 | .utype = V_ASN1_SEQUENCE, |
740 | .templates = ESS_ISSUER_SERIAL_seq_tt, | 740 | .templates = ESS_ISSUER_SERIAL_seq_tt, |
@@ -798,7 +798,7 @@ static const ASN1_TEMPLATE ESS_CERT_ID_seq_tt[] = { | |||
798 | }, | 798 | }, |
799 | }; | 799 | }; |
800 | 800 | ||
801 | const ASN1_ITEM ESS_CERT_ID_it = { | 801 | static const ASN1_ITEM ESS_CERT_ID_it = { |
802 | .itype = ASN1_ITYPE_SEQUENCE, | 802 | .itype = ASN1_ITYPE_SEQUENCE, |
803 | .utype = V_ASN1_SEQUENCE, | 803 | .utype = V_ASN1_SEQUENCE, |
804 | .templates = ESS_CERT_ID_seq_tt, | 804 | .templates = ESS_CERT_ID_seq_tt, |
@@ -862,7 +862,7 @@ static const ASN1_TEMPLATE ESS_SIGNING_CERT_seq_tt[] = { | |||
862 | }, | 862 | }, |
863 | }; | 863 | }; |
864 | 864 | ||
865 | const ASN1_ITEM ESS_SIGNING_CERT_it = { | 865 | static const ASN1_ITEM ESS_SIGNING_CERT_it = { |
866 | .itype = ASN1_ITYPE_SEQUENCE, | 866 | .itype = ASN1_ITYPE_SEQUENCE, |
867 | .utype = V_ASN1_SEQUENCE, | 867 | .utype = V_ASN1_SEQUENCE, |
868 | .templates = ESS_SIGNING_CERT_seq_tt, | 868 | .templates = ESS_SIGNING_CERT_seq_tt, |