summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509_asid.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/x509/x509_asid.c')
-rw-r--r--src/lib/libcrypto/x509/x509_asid.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/lib/libcrypto/x509/x509_asid.c b/src/lib/libcrypto/x509/x509_asid.c
index 3a37b002f2..cc36cc1a56 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.38 2022/11/26 16:08:54 tb Exp $ */ 1/* $OpenBSD: x509_asid.c,v 1.39 2023/02/16 08:38:17 tb 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").
@@ -191,28 +191,28 @@ d2i_ASRange(ASRange **a, const unsigned char **in, long len)
191 return (ASRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 191 return (ASRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
192 &ASRange_it); 192 &ASRange_it);
193} 193}
194LCRYPTO_ALIAS(d2i_ASRange) 194LCRYPTO_ALIAS(d2i_ASRange);
195 195
196int 196int
197i2d_ASRange(ASRange *a, unsigned char **out) 197i2d_ASRange(ASRange *a, unsigned char **out)
198{ 198{
199 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASRange_it); 199 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASRange_it);
200} 200}
201LCRYPTO_ALIAS(i2d_ASRange) 201LCRYPTO_ALIAS(i2d_ASRange);
202 202
203ASRange * 203ASRange *
204ASRange_new(void) 204ASRange_new(void)
205{ 205{
206 return (ASRange *)ASN1_item_new(&ASRange_it); 206 return (ASRange *)ASN1_item_new(&ASRange_it);
207} 207}
208LCRYPTO_ALIAS(ASRange_new) 208LCRYPTO_ALIAS(ASRange_new);
209 209
210void 210void
211ASRange_free(ASRange *a) 211ASRange_free(ASRange *a)
212{ 212{
213 ASN1_item_free((ASN1_VALUE *)a, &ASRange_it); 213 ASN1_item_free((ASN1_VALUE *)a, &ASRange_it);
214} 214}
215LCRYPTO_ALIAS(ASRange_free) 215LCRYPTO_ALIAS(ASRange_free);
216 216
217ASIdOrRange * 217ASIdOrRange *
218d2i_ASIdOrRange(ASIdOrRange **a, const unsigned char **in, long len) 218d2i_ASIdOrRange(ASIdOrRange **a, const unsigned char **in, long len)
@@ -220,28 +220,28 @@ d2i_ASIdOrRange(ASIdOrRange **a, const unsigned char **in, long len)
220 return (ASIdOrRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 220 return (ASIdOrRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
221 &ASIdOrRange_it); 221 &ASIdOrRange_it);
222} 222}
223LCRYPTO_ALIAS(d2i_ASIdOrRange) 223LCRYPTO_ALIAS(d2i_ASIdOrRange);
224 224
225int 225int
226i2d_ASIdOrRange(ASIdOrRange *a, unsigned char **out) 226i2d_ASIdOrRange(ASIdOrRange *a, unsigned char **out)
227{ 227{
228 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdOrRange_it); 228 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdOrRange_it);
229} 229}
230LCRYPTO_ALIAS(i2d_ASIdOrRange) 230LCRYPTO_ALIAS(i2d_ASIdOrRange);
231 231
232ASIdOrRange * 232ASIdOrRange *
233ASIdOrRange_new(void) 233ASIdOrRange_new(void)
234{ 234{
235 return (ASIdOrRange *)ASN1_item_new(&ASIdOrRange_it); 235 return (ASIdOrRange *)ASN1_item_new(&ASIdOrRange_it);
236} 236}
237LCRYPTO_ALIAS(ASIdOrRange_new) 237LCRYPTO_ALIAS(ASIdOrRange_new);
238 238
239void 239void
240ASIdOrRange_free(ASIdOrRange *a) 240ASIdOrRange_free(ASIdOrRange *a)
241{ 241{
242 ASN1_item_free((ASN1_VALUE *)a, &ASIdOrRange_it); 242 ASN1_item_free((ASN1_VALUE *)a, &ASIdOrRange_it);
243} 243}
244LCRYPTO_ALIAS(ASIdOrRange_free) 244LCRYPTO_ALIAS(ASIdOrRange_free);
245 245
246ASIdentifierChoice * 246ASIdentifierChoice *
247d2i_ASIdentifierChoice(ASIdentifierChoice **a, const unsigned char **in, 247d2i_ASIdentifierChoice(ASIdentifierChoice **a, const unsigned char **in,
@@ -250,28 +250,28 @@ d2i_ASIdentifierChoice(ASIdentifierChoice **a, const unsigned char **in,
250 return (ASIdentifierChoice *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 250 return (ASIdentifierChoice *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
251 &ASIdentifierChoice_it); 251 &ASIdentifierChoice_it);
252} 252}
253LCRYPTO_ALIAS(d2i_ASIdentifierChoice) 253LCRYPTO_ALIAS(d2i_ASIdentifierChoice);
254 254
255int 255int
256i2d_ASIdentifierChoice(ASIdentifierChoice *a, unsigned char **out) 256i2d_ASIdentifierChoice(ASIdentifierChoice *a, unsigned char **out)
257{ 257{
258 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdentifierChoice_it); 258 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdentifierChoice_it);
259} 259}
260LCRYPTO_ALIAS(i2d_ASIdentifierChoice) 260LCRYPTO_ALIAS(i2d_ASIdentifierChoice);
261 261
262ASIdentifierChoice * 262ASIdentifierChoice *
263ASIdentifierChoice_new(void) 263ASIdentifierChoice_new(void)
264{ 264{
265 return (ASIdentifierChoice *)ASN1_item_new(&ASIdentifierChoice_it); 265 return (ASIdentifierChoice *)ASN1_item_new(&ASIdentifierChoice_it);
266} 266}
267LCRYPTO_ALIAS(ASIdentifierChoice_new) 267LCRYPTO_ALIAS(ASIdentifierChoice_new);
268 268
269void 269void
270ASIdentifierChoice_free(ASIdentifierChoice *a) 270ASIdentifierChoice_free(ASIdentifierChoice *a)
271{ 271{
272 ASN1_item_free((ASN1_VALUE *)a, &ASIdentifierChoice_it); 272 ASN1_item_free((ASN1_VALUE *)a, &ASIdentifierChoice_it);
273} 273}
274LCRYPTO_ALIAS(ASIdentifierChoice_free) 274LCRYPTO_ALIAS(ASIdentifierChoice_free);
275 275
276ASIdentifiers * 276ASIdentifiers *
277d2i_ASIdentifiers(ASIdentifiers **a, const unsigned char **in, long len) 277d2i_ASIdentifiers(ASIdentifiers **a, const unsigned char **in, long len)
@@ -279,28 +279,28 @@ d2i_ASIdentifiers(ASIdentifiers **a, const unsigned char **in, long len)
279 return (ASIdentifiers *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 279 return (ASIdentifiers *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
280 &ASIdentifiers_it); 280 &ASIdentifiers_it);
281} 281}
282LCRYPTO_ALIAS(d2i_ASIdentifiers) 282LCRYPTO_ALIAS(d2i_ASIdentifiers);
283 283
284int 284int
285i2d_ASIdentifiers(ASIdentifiers *a, unsigned char **out) 285i2d_ASIdentifiers(ASIdentifiers *a, unsigned char **out)
286{ 286{
287 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdentifiers_it); 287 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdentifiers_it);
288} 288}
289LCRYPTO_ALIAS(i2d_ASIdentifiers) 289LCRYPTO_ALIAS(i2d_ASIdentifiers);
290 290
291ASIdentifiers * 291ASIdentifiers *
292ASIdentifiers_new(void) 292ASIdentifiers_new(void)
293{ 293{
294 return (ASIdentifiers *)ASN1_item_new(&ASIdentifiers_it); 294 return (ASIdentifiers *)ASN1_item_new(&ASIdentifiers_it);
295} 295}
296LCRYPTO_ALIAS(ASIdentifiers_new) 296LCRYPTO_ALIAS(ASIdentifiers_new);
297 297
298void 298void
299ASIdentifiers_free(ASIdentifiers *a) 299ASIdentifiers_free(ASIdentifiers *a)
300{ 300{
301 ASN1_item_free((ASN1_VALUE *)a, &ASIdentifiers_it); 301 ASN1_item_free((ASN1_VALUE *)a, &ASIdentifiers_it);
302} 302}
303LCRYPTO_ALIAS(ASIdentifiers_free) 303LCRYPTO_ALIAS(ASIdentifiers_free);
304 304
305/* 305/*
306 * i2r method for an ASIdentifierChoice. 306 * i2r method for an ASIdentifierChoice.
@@ -428,7 +428,7 @@ X509v3_asid_add_inherit(ASIdentifiers *asid, int which)
428 } 428 }
429 return (*choice)->type == ASIdentifierChoice_inherit; 429 return (*choice)->type == ASIdentifierChoice_inherit;
430} 430}
431LCRYPTO_ALIAS(X509v3_asid_add_inherit) 431LCRYPTO_ALIAS(X509v3_asid_add_inherit);
432 432
433/* 433/*
434 * Add an ID or range to an ASIdentifierChoice. 434 * Add an ID or range to an ASIdentifierChoice.
@@ -483,7 +483,7 @@ X509v3_asid_add_id_or_range(ASIdentifiers *asid, int which, ASN1_INTEGER *min,
483 ASIdOrRange_free(aor); 483 ASIdOrRange_free(aor);
484 return 0; 484 return 0;
485} 485}
486LCRYPTO_ALIAS(X509v3_asid_add_id_or_range) 486LCRYPTO_ALIAS(X509v3_asid_add_id_or_range);
487 487
488/* 488/*
489 * Extract min and max values from an ASIdOrRange. 489 * Extract min and max values from an ASIdOrRange.
@@ -612,7 +612,7 @@ X509v3_asid_is_canonical(ASIdentifiers *asid)
612 (ASIdentifierChoice_is_canonical(asid->asnum) && 612 (ASIdentifierChoice_is_canonical(asid->asnum) &&
613 ASIdentifierChoice_is_canonical(asid->rdi))); 613 ASIdentifierChoice_is_canonical(asid->rdi)));
614} 614}
615LCRYPTO_ALIAS(X509v3_asid_is_canonical) 615LCRYPTO_ALIAS(X509v3_asid_is_canonical);
616 616
617/* 617/*
618 * Whack an ASIdentifierChoice into canonical form. 618 * Whack an ASIdentifierChoice into canonical form.
@@ -780,7 +780,7 @@ X509v3_asid_canonize(ASIdentifiers *asid)
780 780
781 return ASIdentifierChoice_canonize(asid->rdi); 781 return ASIdentifierChoice_canonize(asid->rdi);
782} 782}
783LCRYPTO_ALIAS(X509v3_asid_canonize) 783LCRYPTO_ALIAS(X509v3_asid_canonize);
784 784
785/* 785/*
786 * v2i method for an ASIdentifier extension. 786 * v2i method for an ASIdentifier extension.
@@ -939,7 +939,7 @@ X509v3_asid_inherits(ASIdentifiers *asid)
939 939
940 return 0; 940 return 0;
941} 941}
942LCRYPTO_ALIAS(X509v3_asid_inherits) 942LCRYPTO_ALIAS(X509v3_asid_inherits);
943 943
944/* 944/*
945 * Figure out whether parent contains child. 945 * Figure out whether parent contains child.
@@ -1013,7 +1013,7 @@ X509v3_asid_subset(ASIdentifiers *child, ASIdentifiers *parent)
1013 1013
1014 return 1; 1014 return 1;
1015} 1015}
1016LCRYPTO_ALIAS(X509v3_asid_subset) 1016LCRYPTO_ALIAS(X509v3_asid_subset);
1017 1017
1018/* 1018/*
1019 * Validation error handling via callback. 1019 * Validation error handling via callback.
@@ -1181,7 +1181,7 @@ X509v3_asid_validate_path(X509_STORE_CTX *ctx)
1181 } 1181 }
1182 return asid_validate_path_internal(ctx, ctx->chain, NULL); 1182 return asid_validate_path_internal(ctx, ctx->chain, NULL);
1183} 1183}
1184LCRYPTO_ALIAS(X509v3_asid_validate_path) 1184LCRYPTO_ALIAS(X509v3_asid_validate_path);
1185 1185
1186/* 1186/*
1187 * RFC 3779 3.3 path validation of an extension. 1187 * RFC 3779 3.3 path validation of an extension.
@@ -1199,6 +1199,6 @@ X509v3_asid_validate_resource_set(STACK_OF(X509) *chain, ASIdentifiers *ext,
1199 return 0; 1199 return 0;
1200 return asid_validate_path_internal(NULL, chain, ext); 1200 return asid_validate_path_internal(NULL, chain, ext);
1201} 1201}
1202LCRYPTO_ALIAS(X509v3_asid_validate_resource_set) 1202LCRYPTO_ALIAS(X509v3_asid_validate_resource_set);
1203 1203
1204#endif /* OPENSSL_NO_RFC3779 */ 1204#endif /* OPENSSL_NO_RFC3779 */