diff options
| author | beck <> | 2024-07-08 14:47:44 +0000 |
|---|---|---|
| committer | beck <> | 2024-07-08 14:47:44 +0000 |
| commit | 751ca4542fedfb2706bb63acee88e221a6aa110a (patch) | |
| tree | 9c734b517dc0abfc0fb1c6750f545cc495d6bb7f | |
| parent | 6b813c7c12b81e1e330f8870fe4e5db7abb1db55 (diff) | |
| download | openbsd-751ca4542fedfb2706bb63acee88e221a6aa110a.tar.gz openbsd-751ca4542fedfb2706bb63acee88e221a6aa110a.tar.bz2 openbsd-751ca4542fedfb2706bb63acee88e221a6aa110a.zip | |
Hide global _it variables in x509v3.h
ok tb@
| -rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 33 | ||||
| -rw-r--r-- | src/lib/libcrypto/hidden/openssl/x509v3.h | 36 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_addr.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_akeya.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_asid.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_bcons.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_cpols.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_crld.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_extku.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_genn.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_info.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_ncons.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_pcons.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_pku.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_pmaps.c | 4 |
15 files changed, 113 insertions, 14 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace index 0abd5ef54d..18c93e981d 100644 --- a/src/lib/libcrypto/Symbols.namespace +++ b/src/lib/libcrypto/Symbols.namespace | |||
| @@ -3217,3 +3217,36 @@ _libre_EC_POINT_get_Jprojective_coordinates_GFp | |||
| 3217 | _libre_EC_POINT_set_affine_coordinates_GFp | 3217 | _libre_EC_POINT_set_affine_coordinates_GFp |
| 3218 | _libre_EC_POINT_get_affine_coordinates_GFp | 3218 | _libre_EC_POINT_get_affine_coordinates_GFp |
| 3219 | _libre_EC_POINT_set_compressed_coordinates_GFp | 3219 | _libre_EC_POINT_set_compressed_coordinates_GFp |
| 3220 | _libre_BASIC_CONSTRAINTS_it | ||
| 3221 | _libre_AUTHORITY_KEYID_it | ||
| 3222 | _libre_PKEY_USAGE_PERIOD_it | ||
| 3223 | _libre_GENERAL_NAME_it | ||
| 3224 | _libre_GENERAL_NAMES_it | ||
| 3225 | _libre_OTHERNAME_it | ||
| 3226 | _libre_EDIPARTYNAME_it | ||
| 3227 | _libre_EXTENDED_KEY_USAGE_it | ||
| 3228 | _libre_CERTIFICATEPOLICIES_it | ||
| 3229 | _libre_POLICYINFO_it | ||
| 3230 | _libre_POLICYQUALINFO_it | ||
| 3231 | _libre_USERNOTICE_it | ||
| 3232 | _libre_NOTICEREF_it | ||
| 3233 | _libre_CRL_DIST_POINTS_it | ||
| 3234 | _libre_DIST_POINT_it | ||
| 3235 | _libre_DIST_POINT_NAME_it | ||
| 3236 | _libre_DIST_POINT_it | ||
| 3237 | _libre_ISSUING_DIST_POINT_it | ||
| 3238 | _libre_ACCESS_DESCRIPTION_it | ||
| 3239 | _libre_AUTHORITY_INFO_ACCESS_it | ||
| 3240 | _libre_POLICY_MAPPING_it | ||
| 3241 | _libre_POLICY_MAPPINGS_it | ||
| 3242 | _libre_GENERAL_SUBTREE_it | ||
| 3243 | _libre_NAME_CONSTRAINTS_it | ||
| 3244 | _libre_POLICY_CONSTRAINTS_it | ||
| 3245 | _libre_ASRange_it | ||
| 3246 | _libre_ASIdOrRange_it | ||
| 3247 | _libre_ASIdentifierChoice_it | ||
| 3248 | _libre_ASIdentifiers_it | ||
| 3249 | _libre_IPAddressRange_it | ||
| 3250 | _libre_IPAddressOrRange_it | ||
| 3251 | _libre_IPAddressChoice_it | ||
| 3252 | _libre_IPAddressFamily_it | ||
diff --git a/src/lib/libcrypto/hidden/openssl/x509v3.h b/src/lib/libcrypto/hidden/openssl/x509v3.h index a833ec9f4e..dac12ab09b 100644 --- a/src/lib/libcrypto/hidden/openssl/x509v3.h +++ b/src/lib/libcrypto/hidden/openssl/x509v3.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509v3.h,v 1.7 2024/03/02 10:40:05 tb Exp $ */ | 1 | /* $OpenBSD: x509v3.h,v 1.8 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -252,5 +252,39 @@ LCRYPTO_USED(X509v3_addr_validate_path); | |||
| 252 | LCRYPTO_USED(X509v3_asid_validate_resource_set); | 252 | LCRYPTO_USED(X509v3_asid_validate_resource_set); |
| 253 | LCRYPTO_USED(X509v3_addr_validate_resource_set); | 253 | LCRYPTO_USED(X509v3_addr_validate_resource_set); |
| 254 | LCRYPTO_USED(ERR_load_X509V3_strings); | 254 | LCRYPTO_USED(ERR_load_X509V3_strings); |
| 255 | extern LCRYPTO_USED(BASIC_CONSTRAINTS_it); | ||
| 256 | extern LCRYPTO_USED(AUTHORITY_KEYID_it); | ||
| 257 | extern LCRYPTO_USED(PKEY_USAGE_PERIOD_it); | ||
| 258 | extern LCRYPTO_USED(GENERAL_NAME_it); | ||
| 259 | extern LCRYPTO_USED(GENERAL_NAMES_it); | ||
| 260 | extern LCRYPTO_USED(OTHERNAME_it); | ||
| 261 | extern LCRYPTO_USED(EDIPARTYNAME_it); | ||
| 262 | extern LCRYPTO_USED(EXTENDED_KEY_USAGE_it); | ||
| 263 | extern LCRYPTO_USED(CERTIFICATEPOLICIES_it); | ||
| 264 | extern LCRYPTO_USED(POLICYINFO_it); | ||
| 265 | extern LCRYPTO_USED(POLICYQUALINFO_it); | ||
| 266 | extern LCRYPTO_USED(USERNOTICE_it); | ||
| 267 | extern LCRYPTO_USED(NOTICEREF_it); | ||
| 268 | extern LCRYPTO_USED(CRL_DIST_POINTS_it); | ||
| 269 | extern LCRYPTO_USED(DIST_POINT_it); | ||
| 270 | extern LCRYPTO_USED(DIST_POINT_NAME_it); | ||
| 271 | extern LCRYPTO_USED(DIST_POINT_it); | ||
| 272 | extern LCRYPTO_USED(ISSUING_DIST_POINT_it); | ||
| 273 | extern LCRYPTO_USED(ACCESS_DESCRIPTION_it); | ||
| 274 | extern LCRYPTO_USED(AUTHORITY_INFO_ACCESS_it); | ||
| 275 | extern LCRYPTO_USED(POLICY_MAPPING_it); | ||
| 276 | extern LCRYPTO_USED(POLICY_MAPPINGS_it); | ||
| 277 | extern LCRYPTO_USED(GENERAL_SUBTREE_it); | ||
| 278 | extern LCRYPTO_USED(NAME_CONSTRAINTS_it); | ||
| 279 | extern LCRYPTO_USED(POLICY_CONSTRAINTS_it); | ||
| 280 | extern LCRYPTO_USED(ASRange_it); | ||
| 281 | extern LCRYPTO_USED(ASIdOrRange_it); | ||
| 282 | extern LCRYPTO_USED(ASIdentifierChoice_it); | ||
| 283 | extern LCRYPTO_USED(ASIdentifiers_it); | ||
| 284 | extern LCRYPTO_USED(IPAddressRange_it); | ||
| 285 | extern LCRYPTO_USED(IPAddressOrRange_it); | ||
| 286 | extern LCRYPTO_USED(IPAddressChoice_it); | ||
| 287 | extern LCRYPTO_USED(IPAddressFamily_it); | ||
| 288 | |||
| 255 | 289 | ||
| 256 | #endif /* _LIBCRYPTO_X509V3_H */ | 290 | #endif /* _LIBCRYPTO_X509V3_H */ |
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c index a3b28ac07a..864b7bbf3d 100644 --- a/src/lib/libcrypto/x509/x509_addr.c +++ b/src/lib/libcrypto/x509/x509_addr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_addr.c,v 1.91 2023/10/29 13:22:37 tb Exp $ */ | 1 | /* $OpenBSD: x509_addr.c,v 1.92 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Contributed to the OpenSSL Project by the American Registry for | 3 | * Contributed to the OpenSSL Project by the American Registry for |
| 4 | * Internet Numbers ("ARIN"). | 4 | * Internet Numbers ("ARIN"). |
| @@ -109,6 +109,7 @@ const ASN1_ITEM IPAddressRange_it = { | |||
| 109 | .size = sizeof(IPAddressRange), | 109 | .size = sizeof(IPAddressRange), |
| 110 | .sname = "IPAddressRange", | 110 | .sname = "IPAddressRange", |
| 111 | }; | 111 | }; |
| 112 | LCRYPTO_ALIAS(IPAddressRange_it); | ||
| 112 | 113 | ||
| 113 | static const ASN1_TEMPLATE IPAddressOrRange_ch_tt[] = { | 114 | static const ASN1_TEMPLATE IPAddressOrRange_ch_tt[] = { |
| 114 | { | 115 | { |
| @@ -136,6 +137,7 @@ const ASN1_ITEM IPAddressOrRange_it = { | |||
| 136 | .size = sizeof(IPAddressOrRange), | 137 | .size = sizeof(IPAddressOrRange), |
| 137 | .sname = "IPAddressOrRange", | 138 | .sname = "IPAddressOrRange", |
| 138 | }; | 139 | }; |
| 140 | LCRYPTO_ALIAS(IPAddressOrRange_it); | ||
| 139 | 141 | ||
| 140 | static const ASN1_TEMPLATE IPAddressChoice_ch_tt[] = { | 142 | static const ASN1_TEMPLATE IPAddressChoice_ch_tt[] = { |
| 141 | { | 143 | { |
| @@ -163,6 +165,7 @@ const ASN1_ITEM IPAddressChoice_it = { | |||
| 163 | .size = sizeof(IPAddressChoice), | 165 | .size = sizeof(IPAddressChoice), |
| 164 | .sname = "IPAddressChoice", | 166 | .sname = "IPAddressChoice", |
| 165 | }; | 167 | }; |
| 168 | LCRYPTO_ALIAS(IPAddressChoice_it); | ||
| 166 | 169 | ||
| 167 | static const ASN1_TEMPLATE IPAddressFamily_seq_tt[] = { | 170 | static const ASN1_TEMPLATE IPAddressFamily_seq_tt[] = { |
| 168 | { | 171 | { |
| @@ -190,6 +193,7 @@ const ASN1_ITEM IPAddressFamily_it = { | |||
| 190 | .size = sizeof(IPAddressFamily), | 193 | .size = sizeof(IPAddressFamily), |
| 191 | .sname = "IPAddressFamily", | 194 | .sname = "IPAddressFamily", |
| 192 | }; | 195 | }; |
| 196 | LCRYPTO_ALIAS(IPAddressFamily_it); | ||
| 193 | 197 | ||
| 194 | static const ASN1_TEMPLATE IPAddrBlocks_item_tt = { | 198 | static const ASN1_TEMPLATE IPAddrBlocks_item_tt = { |
| 195 | .flags = ASN1_TFLG_SEQUENCE_OF, | 199 | .flags = ASN1_TFLG_SEQUENCE_OF, |
diff --git a/src/lib/libcrypto/x509/x509_akeya.c b/src/lib/libcrypto/x509/x509_akeya.c index 52eca42cff..e816e6b613 100644 --- a/src/lib/libcrypto/x509/x509_akeya.c +++ b/src/lib/libcrypto/x509/x509_akeya.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_akeya.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_akeya.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -96,6 +96,7 @@ const ASN1_ITEM AUTHORITY_KEYID_it = { | |||
| 96 | .size = sizeof(AUTHORITY_KEYID), | 96 | .size = sizeof(AUTHORITY_KEYID), |
| 97 | .sname = "AUTHORITY_KEYID", | 97 | .sname = "AUTHORITY_KEYID", |
| 98 | }; | 98 | }; |
| 99 | LCRYPTO_ALIAS(AUTHORITY_KEYID_it); | ||
| 99 | 100 | ||
| 100 | 101 | ||
| 101 | AUTHORITY_KEYID * | 102 | AUTHORITY_KEYID * |
diff --git a/src/lib/libcrypto/x509/x509_asid.c b/src/lib/libcrypto/x509/x509_asid.c index 2fda58c3fa..e3af673202 100644 --- a/src/lib/libcrypto/x509/x509_asid.c +++ b/src/lib/libcrypto/x509/x509_asid.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_asid.c,v 1.43 2024/02/20 14:58:16 tb Exp $ */ | 1 | /* $OpenBSD: x509_asid.c,v 1.44 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Contributed to the OpenSSL Project by the American Registry for | 3 | * Contributed to the OpenSSL Project by the American Registry for |
| 4 | * Internet Numbers ("ARIN"). | 4 | * Internet Numbers ("ARIN"). |
| @@ -102,6 +102,7 @@ const ASN1_ITEM ASRange_it = { | |||
| 102 | .size = sizeof(ASRange), | 102 | .size = sizeof(ASRange), |
| 103 | .sname = "ASRange", | 103 | .sname = "ASRange", |
| 104 | }; | 104 | }; |
| 105 | LCRYPTO_ALIAS(ASRange_it); | ||
| 105 | 106 | ||
| 106 | static const ASN1_TEMPLATE ASIdOrRange_ch_tt[] = { | 107 | static const ASN1_TEMPLATE ASIdOrRange_ch_tt[] = { |
| 107 | { | 108 | { |
| @@ -129,6 +130,7 @@ const ASN1_ITEM ASIdOrRange_it = { | |||
| 129 | .size = sizeof(ASIdOrRange), | 130 | .size = sizeof(ASIdOrRange), |
| 130 | .sname = "ASIdOrRange", | 131 | .sname = "ASIdOrRange", |
| 131 | }; | 132 | }; |
| 133 | LCRYPTO_ALIAS(ASIdOrRange_it); | ||
| 132 | 134 | ||
| 133 | static const ASN1_TEMPLATE ASIdentifierChoice_ch_tt[] = { | 135 | static const ASN1_TEMPLATE ASIdentifierChoice_ch_tt[] = { |
| 134 | { | 136 | { |
| @@ -156,6 +158,7 @@ const ASN1_ITEM ASIdentifierChoice_it = { | |||
| 156 | .size = sizeof(ASIdentifierChoice), | 158 | .size = sizeof(ASIdentifierChoice), |
| 157 | .sname = "ASIdentifierChoice", | 159 | .sname = "ASIdentifierChoice", |
| 158 | }; | 160 | }; |
| 161 | LCRYPTO_ALIAS(ASIdentifierChoice_it); | ||
| 159 | 162 | ||
| 160 | static const ASN1_TEMPLATE ASIdentifiers_seq_tt[] = { | 163 | static const ASN1_TEMPLATE ASIdentifiers_seq_tt[] = { |
| 161 | { | 164 | { |
| @@ -183,6 +186,7 @@ const ASN1_ITEM ASIdentifiers_it = { | |||
| 183 | .size = sizeof(ASIdentifiers), | 186 | .size = sizeof(ASIdentifiers), |
| 184 | .sname = "ASIdentifiers", | 187 | .sname = "ASIdentifiers", |
| 185 | }; | 188 | }; |
| 189 | LCRYPTO_ALIAS(ASIdentifiers_it); | ||
| 186 | 190 | ||
| 187 | ASRange * | 191 | ASRange * |
| 188 | d2i_ASRange(ASRange **a, const unsigned char **in, long len) | 192 | d2i_ASRange(ASRange **a, const unsigned char **in, long len) |
diff --git a/src/lib/libcrypto/x509/x509_bcons.c b/src/lib/libcrypto/x509/x509_bcons.c index a39ae0aae0..7ad65231ec 100644 --- a/src/lib/libcrypto/x509/x509_bcons.c +++ b/src/lib/libcrypto/x509/x509_bcons.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_bcons.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_bcons.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -113,6 +113,7 @@ const ASN1_ITEM BASIC_CONSTRAINTS_it = { | |||
| 113 | .size = sizeof(BASIC_CONSTRAINTS), | 113 | .size = sizeof(BASIC_CONSTRAINTS), |
| 114 | .sname = "BASIC_CONSTRAINTS", | 114 | .sname = "BASIC_CONSTRAINTS", |
| 115 | }; | 115 | }; |
| 116 | LCRYPTO_ALIAS(BASIC_CONSTRAINTS_it); | ||
| 116 | 117 | ||
| 117 | 118 | ||
| 118 | BASIC_CONSTRAINTS * | 119 | BASIC_CONSTRAINTS * |
diff --git a/src/lib/libcrypto/x509/x509_cpols.c b/src/lib/libcrypto/x509/x509_cpols.c index bab2e99a93..34c9345a4f 100644 --- a/src/lib/libcrypto/x509/x509_cpols.c +++ b/src/lib/libcrypto/x509/x509_cpols.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_cpols.c,v 1.11 2023/04/26 20:54:21 tb Exp $ */ | 1 | /* $OpenBSD: x509_cpols.c,v 1.12 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -116,6 +116,7 @@ const ASN1_ITEM CERTIFICATEPOLICIES_it = { | |||
| 116 | .size = 0, | 116 | .size = 0, |
| 117 | .sname = "CERTIFICATEPOLICIES", | 117 | .sname = "CERTIFICATEPOLICIES", |
| 118 | }; | 118 | }; |
| 119 | LCRYPTO_ALIAS(CERTIFICATEPOLICIES_it); | ||
| 119 | 120 | ||
| 120 | 121 | ||
| 121 | CERTIFICATEPOLICIES * | 122 | CERTIFICATEPOLICIES * |
| @@ -173,6 +174,7 @@ const ASN1_ITEM POLICYINFO_it = { | |||
| 173 | .size = sizeof(POLICYINFO), | 174 | .size = sizeof(POLICYINFO), |
| 174 | .sname = "POLICYINFO", | 175 | .sname = "POLICYINFO", |
| 175 | }; | 176 | }; |
| 177 | LCRYPTO_ALIAS(POLICYINFO_it); | ||
| 176 | 178 | ||
| 177 | 179 | ||
| 178 | POLICYINFO * | 180 | POLICYINFO * |
| @@ -270,6 +272,7 @@ const ASN1_ITEM POLICYQUALINFO_it = { | |||
| 270 | .size = sizeof(POLICYQUALINFO), | 272 | .size = sizeof(POLICYQUALINFO), |
| 271 | .sname = "POLICYQUALINFO", | 273 | .sname = "POLICYQUALINFO", |
| 272 | }; | 274 | }; |
| 275 | LCRYPTO_ALIAS(POLICYQUALINFO_it); | ||
| 273 | 276 | ||
| 274 | 277 | ||
| 275 | POLICYQUALINFO * | 278 | POLICYQUALINFO * |
| @@ -327,6 +330,7 @@ const ASN1_ITEM USERNOTICE_it = { | |||
| 327 | .size = sizeof(USERNOTICE), | 330 | .size = sizeof(USERNOTICE), |
| 328 | .sname = "USERNOTICE", | 331 | .sname = "USERNOTICE", |
| 329 | }; | 332 | }; |
| 333 | LCRYPTO_ALIAS(USERNOTICE_it); | ||
| 330 | 334 | ||
| 331 | 335 | ||
| 332 | USERNOTICE * | 336 | USERNOTICE * |
| @@ -384,6 +388,7 @@ const ASN1_ITEM NOTICEREF_it = { | |||
| 384 | .size = sizeof(NOTICEREF), | 388 | .size = sizeof(NOTICEREF), |
| 385 | .sname = "NOTICEREF", | 389 | .sname = "NOTICEREF", |
| 386 | }; | 390 | }; |
| 391 | LCRYPTO_ALIAS(NOTICEREF_it); | ||
| 387 | 392 | ||
| 388 | 393 | ||
| 389 | NOTICEREF * | 394 | NOTICEREF * |
diff --git a/src/lib/libcrypto/x509/x509_crld.c b/src/lib/libcrypto/x509/x509_crld.c index 7887ccd644..dfb5d27f65 100644 --- a/src/lib/libcrypto/x509/x509_crld.c +++ b/src/lib/libcrypto/x509/x509_crld.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_crld.c,v 1.5 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_crld.c,v 1.6 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -417,6 +417,7 @@ const ASN1_ITEM DIST_POINT_NAME_it = { | |||
| 417 | .size = sizeof(DIST_POINT_NAME), | 417 | .size = sizeof(DIST_POINT_NAME), |
| 418 | .sname = "DIST_POINT_NAME", | 418 | .sname = "DIST_POINT_NAME", |
| 419 | }; | 419 | }; |
| 420 | LCRYPTO_ALIAS(DIST_POINT_NAME_it); | ||
| 420 | 421 | ||
| 421 | 422 | ||
| 422 | 423 | ||
| @@ -482,6 +483,7 @@ const ASN1_ITEM DIST_POINT_it = { | |||
| 482 | .size = sizeof(DIST_POINT), | 483 | .size = sizeof(DIST_POINT), |
| 483 | .sname = "DIST_POINT", | 484 | .sname = "DIST_POINT", |
| 484 | }; | 485 | }; |
| 486 | LCRYPTO_ALIAS(DIST_POINT_it); | ||
| 485 | 487 | ||
| 486 | 488 | ||
| 487 | DIST_POINT * | 489 | DIST_POINT * |
| @@ -530,6 +532,7 @@ const ASN1_ITEM CRL_DIST_POINTS_it = { | |||
| 530 | .size = 0, | 532 | .size = 0, |
| 531 | .sname = "CRL_DIST_POINTS", | 533 | .sname = "CRL_DIST_POINTS", |
| 532 | }; | 534 | }; |
| 535 | LCRYPTO_ALIAS(CRL_DIST_POINTS_it); | ||
| 533 | 536 | ||
| 534 | 537 | ||
| 535 | CRL_DIST_POINTS * | 538 | CRL_DIST_POINTS * |
| @@ -615,6 +618,7 @@ const ASN1_ITEM ISSUING_DIST_POINT_it = { | |||
| 615 | .size = sizeof(ISSUING_DIST_POINT), | 618 | .size = sizeof(ISSUING_DIST_POINT), |
| 616 | .sname = "ISSUING_DIST_POINT", | 619 | .sname = "ISSUING_DIST_POINT", |
| 617 | }; | 620 | }; |
| 621 | LCRYPTO_ALIAS(ISSUING_DIST_POINT_it); | ||
| 618 | 622 | ||
| 619 | 623 | ||
| 620 | ISSUING_DIST_POINT * | 624 | ISSUING_DIST_POINT * |
diff --git a/src/lib/libcrypto/x509/x509_extku.c b/src/lib/libcrypto/x509/x509_extku.c index 94032f624e..f0f8d44aa6 100644 --- a/src/lib/libcrypto/x509/x509_extku.c +++ b/src/lib/libcrypto/x509/x509_extku.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_extku.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_extku.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -120,6 +120,7 @@ const ASN1_ITEM EXTENDED_KEY_USAGE_it = { | |||
| 120 | .size = 0, | 120 | .size = 0, |
| 121 | .sname = "EXTENDED_KEY_USAGE", | 121 | .sname = "EXTENDED_KEY_USAGE", |
| 122 | }; | 122 | }; |
| 123 | LCRYPTO_ALIAS(EXTENDED_KEY_USAGE_it); | ||
| 123 | 124 | ||
| 124 | 125 | ||
| 125 | EXTENDED_KEY_USAGE * | 126 | EXTENDED_KEY_USAGE * |
diff --git a/src/lib/libcrypto/x509/x509_genn.c b/src/lib/libcrypto/x509/x509_genn.c index 556ba81c84..1ea7155795 100644 --- a/src/lib/libcrypto/x509/x509_genn.c +++ b/src/lib/libcrypto/x509/x509_genn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_genn.c,v 1.6 2023/04/25 15:51:04 tb Exp $ */ | 1 | /* $OpenBSD: x509_genn.c,v 1.7 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -90,6 +90,7 @@ const ASN1_ITEM OTHERNAME_it = { | |||
| 90 | .size = sizeof(OTHERNAME), | 90 | .size = sizeof(OTHERNAME), |
| 91 | .sname = "OTHERNAME", | 91 | .sname = "OTHERNAME", |
| 92 | }; | 92 | }; |
| 93 | LCRYPTO_ALIAS(OTHERNAME_it); | ||
| 93 | 94 | ||
| 94 | 95 | ||
| 95 | OTHERNAME * | 96 | OTHERNAME * |
| @@ -148,6 +149,7 @@ const ASN1_ITEM EDIPARTYNAME_it = { | |||
| 148 | .size = sizeof(EDIPARTYNAME), | 149 | .size = sizeof(EDIPARTYNAME), |
| 149 | .sname = "EDIPARTYNAME", | 150 | .sname = "EDIPARTYNAME", |
| 150 | }; | 151 | }; |
| 152 | LCRYPTO_ALIAS(EDIPARTYNAME_it); | ||
| 151 | 153 | ||
| 152 | 154 | ||
| 153 | EDIPARTYNAME * | 155 | EDIPARTYNAME * |
| @@ -256,6 +258,7 @@ const ASN1_ITEM GENERAL_NAME_it = { | |||
| 256 | .size = sizeof(GENERAL_NAME), | 258 | .size = sizeof(GENERAL_NAME), |
| 257 | .sname = "GENERAL_NAME", | 259 | .sname = "GENERAL_NAME", |
| 258 | }; | 260 | }; |
| 261 | LCRYPTO_ALIAS(GENERAL_NAME_it); | ||
| 259 | 262 | ||
| 260 | 263 | ||
| 261 | GENERAL_NAME * | 264 | GENERAL_NAME * |
| @@ -304,6 +307,7 @@ const ASN1_ITEM GENERAL_NAMES_it = { | |||
| 304 | .size = 0, | 307 | .size = 0, |
| 305 | .sname = "GENERAL_NAMES", | 308 | .sname = "GENERAL_NAMES", |
| 306 | }; | 309 | }; |
| 310 | LCRYPTO_ALIAS(GENERAL_NAMES_it); | ||
| 307 | 311 | ||
| 308 | 312 | ||
| 309 | GENERAL_NAMES * | 313 | GENERAL_NAMES * |
diff --git a/src/lib/libcrypto/x509/x509_info.c b/src/lib/libcrypto/x509/x509_info.c index a3d4d1bcc7..9372b066ae 100644 --- a/src/lib/libcrypto/x509/x509_info.c +++ b/src/lib/libcrypto/x509/x509_info.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_info.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_info.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -131,6 +131,7 @@ const ASN1_ITEM ACCESS_DESCRIPTION_it = { | |||
| 131 | .size = sizeof(ACCESS_DESCRIPTION), | 131 | .size = sizeof(ACCESS_DESCRIPTION), |
| 132 | .sname = "ACCESS_DESCRIPTION", | 132 | .sname = "ACCESS_DESCRIPTION", |
| 133 | }; | 133 | }; |
| 134 | LCRYPTO_ALIAS(ACCESS_DESCRIPTION_it); | ||
| 134 | 135 | ||
| 135 | 136 | ||
| 136 | ACCESS_DESCRIPTION * | 137 | ACCESS_DESCRIPTION * |
| @@ -179,6 +180,7 @@ const ASN1_ITEM AUTHORITY_INFO_ACCESS_it = { | |||
| 179 | .size = 0, | 180 | .size = 0, |
| 180 | .sname = "AUTHORITY_INFO_ACCESS", | 181 | .sname = "AUTHORITY_INFO_ACCESS", |
| 181 | }; | 182 | }; |
| 183 | LCRYPTO_ALIAS(AUTHORITY_INFO_ACCESS_it); | ||
| 182 | 184 | ||
| 183 | 185 | ||
| 184 | AUTHORITY_INFO_ACCESS * | 186 | AUTHORITY_INFO_ACCESS * |
diff --git a/src/lib/libcrypto/x509/x509_ncons.c b/src/lib/libcrypto/x509/x509_ncons.c index 159e3c2563..f8c63886a4 100644 --- a/src/lib/libcrypto/x509/x509_ncons.c +++ b/src/lib/libcrypto/x509/x509_ncons.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_ncons.c,v 1.9 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_ncons.c,v 1.10 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -131,6 +131,7 @@ const ASN1_ITEM GENERAL_SUBTREE_it = { | |||
| 131 | .size = sizeof(GENERAL_SUBTREE), | 131 | .size = sizeof(GENERAL_SUBTREE), |
| 132 | .sname = "GENERAL_SUBTREE", | 132 | .sname = "GENERAL_SUBTREE", |
| 133 | }; | 133 | }; |
| 134 | LCRYPTO_ALIAS(GENERAL_SUBTREE_it); | ||
| 134 | 135 | ||
| 135 | static const ASN1_TEMPLATE NAME_CONSTRAINTS_seq_tt[] = { | 136 | static const ASN1_TEMPLATE NAME_CONSTRAINTS_seq_tt[] = { |
| 136 | { | 137 | { |
| @@ -158,6 +159,7 @@ const ASN1_ITEM NAME_CONSTRAINTS_it = { | |||
| 158 | .size = sizeof(NAME_CONSTRAINTS), | 159 | .size = sizeof(NAME_CONSTRAINTS), |
| 159 | .sname = "NAME_CONSTRAINTS", | 160 | .sname = "NAME_CONSTRAINTS", |
| 160 | }; | 161 | }; |
| 162 | LCRYPTO_ALIAS(NAME_CONSTRAINTS_it); | ||
| 161 | 163 | ||
| 162 | 164 | ||
| 163 | GENERAL_SUBTREE * | 165 | GENERAL_SUBTREE * |
diff --git a/src/lib/libcrypto/x509/x509_pcons.c b/src/lib/libcrypto/x509/x509_pcons.c index 0ee935540f..8f2109eaad 100644 --- a/src/lib/libcrypto/x509/x509_pcons.c +++ b/src/lib/libcrypto/x509/x509_pcons.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_pcons.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_pcons.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -114,6 +114,7 @@ const ASN1_ITEM POLICY_CONSTRAINTS_it = { | |||
| 114 | .size = sizeof(POLICY_CONSTRAINTS), | 114 | .size = sizeof(POLICY_CONSTRAINTS), |
| 115 | .sname = "POLICY_CONSTRAINTS", | 115 | .sname = "POLICY_CONSTRAINTS", |
| 116 | }; | 116 | }; |
| 117 | LCRYPTO_ALIAS(POLICY_CONSTRAINTS_it); | ||
| 117 | 118 | ||
| 118 | 119 | ||
| 119 | POLICY_CONSTRAINTS * | 120 | POLICY_CONSTRAINTS * |
diff --git a/src/lib/libcrypto/x509/x509_pku.c b/src/lib/libcrypto/x509/x509_pku.c index dd28077de1..05c9ff2431 100644 --- a/src/lib/libcrypto/x509/x509_pku.c +++ b/src/lib/libcrypto/x509/x509_pku.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_pku.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_pku.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -108,6 +108,7 @@ const ASN1_ITEM PKEY_USAGE_PERIOD_it = { | |||
| 108 | .size = sizeof(PKEY_USAGE_PERIOD), | 108 | .size = sizeof(PKEY_USAGE_PERIOD), |
| 109 | .sname = "PKEY_USAGE_PERIOD", | 109 | .sname = "PKEY_USAGE_PERIOD", |
| 110 | }; | 110 | }; |
| 111 | LCRYPTO_ALIAS(PKEY_USAGE_PERIOD_it); | ||
| 111 | 112 | ||
| 112 | 113 | ||
| 113 | PKEY_USAGE_PERIOD * | 114 | PKEY_USAGE_PERIOD * |
diff --git a/src/lib/libcrypto/x509/x509_pmaps.c b/src/lib/libcrypto/x509/x509_pmaps.c index 39aebfee86..b2d74dce1d 100644 --- a/src/lib/libcrypto/x509/x509_pmaps.c +++ b/src/lib/libcrypto/x509/x509_pmaps.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_pmaps.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: x509_pmaps.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -112,6 +112,7 @@ const ASN1_ITEM POLICY_MAPPING_it = { | |||
| 112 | .size = sizeof(POLICY_MAPPING), | 112 | .size = sizeof(POLICY_MAPPING), |
| 113 | .sname = "POLICY_MAPPING", | 113 | .sname = "POLICY_MAPPING", |
| 114 | }; | 114 | }; |
| 115 | LCRYPTO_ALIAS(POLICY_MAPPING_it); | ||
| 115 | 116 | ||
| 116 | static const ASN1_TEMPLATE POLICY_MAPPINGS_item_tt = { | 117 | static const ASN1_TEMPLATE POLICY_MAPPINGS_item_tt = { |
| 117 | .flags = ASN1_TFLG_SEQUENCE_OF, | 118 | .flags = ASN1_TFLG_SEQUENCE_OF, |
| @@ -130,6 +131,7 @@ const ASN1_ITEM POLICY_MAPPINGS_it = { | |||
| 130 | .size = 0, | 131 | .size = 0, |
| 131 | .sname = "POLICY_MAPPINGS", | 132 | .sname = "POLICY_MAPPINGS", |
| 132 | }; | 133 | }; |
| 134 | LCRYPTO_ALIAS(POLICY_MAPPINGS_it); | ||
| 133 | 135 | ||
| 134 | 136 | ||
| 135 | POLICY_MAPPING * | 137 | POLICY_MAPPING * |
