diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/x_x509.c')
-rw-r--r-- | src/lib/libcrypto/asn1/x_x509.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c index 0c10bec4c8..5aa7147548 100644 --- a/src/lib/libcrypto/asn1/x_x509.c +++ b/src/lib/libcrypto/asn1/x_x509.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_x509.c,v 1.35 2023/04/28 16:30:14 tb Exp $ */ | 1 | /* $OpenBSD: x_x509.c,v 1.36 2023/07/05 21:23:37 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -149,24 +149,28 @@ d2i_X509_CINF(X509_CINF **a, const unsigned char **in, long len) | |||
149 | return (X509_CINF *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 149 | return (X509_CINF *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
150 | &X509_CINF_it); | 150 | &X509_CINF_it); |
151 | } | 151 | } |
152 | LCRYPTO_ALIAS(d2i_X509_CINF); | ||
152 | 153 | ||
153 | int | 154 | int |
154 | i2d_X509_CINF(X509_CINF *a, unsigned char **out) | 155 | i2d_X509_CINF(X509_CINF *a, unsigned char **out) |
155 | { | 156 | { |
156 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CINF_it); | 157 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CINF_it); |
157 | } | 158 | } |
159 | LCRYPTO_ALIAS(i2d_X509_CINF); | ||
158 | 160 | ||
159 | X509_CINF * | 161 | X509_CINF * |
160 | X509_CINF_new(void) | 162 | X509_CINF_new(void) |
161 | { | 163 | { |
162 | return (X509_CINF *)ASN1_item_new(&X509_CINF_it); | 164 | return (X509_CINF *)ASN1_item_new(&X509_CINF_it); |
163 | } | 165 | } |
166 | LCRYPTO_ALIAS(X509_CINF_new); | ||
164 | 167 | ||
165 | void | 168 | void |
166 | X509_CINF_free(X509_CINF *a) | 169 | X509_CINF_free(X509_CINF *a) |
167 | { | 170 | { |
168 | ASN1_item_free((ASN1_VALUE *)a, &X509_CINF_it); | 171 | ASN1_item_free((ASN1_VALUE *)a, &X509_CINF_it); |
169 | } | 172 | } |
173 | LCRYPTO_ALIAS(X509_CINF_free); | ||
170 | /* X509 top level structure needs a bit of customisation */ | 174 | /* X509 top level structure needs a bit of customisation */ |
171 | 175 | ||
172 | static int | 176 | static int |
@@ -259,30 +263,35 @@ d2i_X509(X509 **a, const unsigned char **in, long len) | |||
259 | return (X509 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 263 | return (X509 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
260 | &X509_it); | 264 | &X509_it); |
261 | } | 265 | } |
266 | LCRYPTO_ALIAS(d2i_X509); | ||
262 | 267 | ||
263 | int | 268 | int |
264 | i2d_X509(X509 *a, unsigned char **out) | 269 | i2d_X509(X509 *a, unsigned char **out) |
265 | { | 270 | { |
266 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_it); | 271 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_it); |
267 | } | 272 | } |
273 | LCRYPTO_ALIAS(i2d_X509); | ||
268 | 274 | ||
269 | X509 * | 275 | X509 * |
270 | X509_new(void) | 276 | X509_new(void) |
271 | { | 277 | { |
272 | return (X509 *)ASN1_item_new(&X509_it); | 278 | return (X509 *)ASN1_item_new(&X509_it); |
273 | } | 279 | } |
280 | LCRYPTO_ALIAS(X509_new); | ||
274 | 281 | ||
275 | void | 282 | void |
276 | X509_free(X509 *a) | 283 | X509_free(X509 *a) |
277 | { | 284 | { |
278 | ASN1_item_free((ASN1_VALUE *)a, &X509_it); | 285 | ASN1_item_free((ASN1_VALUE *)a, &X509_it); |
279 | } | 286 | } |
287 | LCRYPTO_ALIAS(X509_free); | ||
280 | 288 | ||
281 | X509 * | 289 | X509 * |
282 | X509_dup(X509 *x) | 290 | X509_dup(X509 *x) |
283 | { | 291 | { |
284 | return ASN1_item_dup(&X509_it, x); | 292 | return ASN1_item_dup(&X509_it, x); |
285 | } | 293 | } |
294 | LCRYPTO_ALIAS(X509_dup); | ||
286 | 295 | ||
287 | int | 296 | int |
288 | X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | 297 | X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, |
@@ -291,18 +300,21 @@ X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | |||
291 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, argl, argp, | 300 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, argl, argp, |
292 | new_func, dup_func, free_func); | 301 | new_func, dup_func, free_func); |
293 | } | 302 | } |
303 | LCRYPTO_ALIAS(X509_get_ex_new_index); | ||
294 | 304 | ||
295 | int | 305 | int |
296 | X509_set_ex_data(X509 *r, int idx, void *arg) | 306 | X509_set_ex_data(X509 *r, int idx, void *arg) |
297 | { | 307 | { |
298 | return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); | 308 | return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); |
299 | } | 309 | } |
310 | LCRYPTO_ALIAS(X509_set_ex_data); | ||
300 | 311 | ||
301 | void * | 312 | void * |
302 | X509_get_ex_data(X509 *r, int idx) | 313 | X509_get_ex_data(X509 *r, int idx) |
303 | { | 314 | { |
304 | return (CRYPTO_get_ex_data(&r->ex_data, idx)); | 315 | return (CRYPTO_get_ex_data(&r->ex_data, idx)); |
305 | } | 316 | } |
317 | LCRYPTO_ALIAS(X509_get_ex_data); | ||
306 | 318 | ||
307 | /* X509_AUX ASN1 routines. X509_AUX is the name given to | 319 | /* X509_AUX ASN1 routines. X509_AUX is the name given to |
308 | * a certificate with extra info tagged on the end. Since these | 320 | * a certificate with extra info tagged on the end. Since these |
@@ -340,6 +352,7 @@ d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) | |||
340 | X509_free(ret); | 352 | X509_free(ret); |
341 | return NULL; | 353 | return NULL; |
342 | } | 354 | } |
355 | LCRYPTO_ALIAS(d2i_X509_AUX); | ||
343 | 356 | ||
344 | int | 357 | int |
345 | i2d_X509_AUX(X509 *a, unsigned char **pp) | 358 | i2d_X509_AUX(X509 *a, unsigned char **pp) |
@@ -351,6 +364,7 @@ i2d_X509_AUX(X509 *a, unsigned char **pp) | |||
351 | length += i2d_X509_CERT_AUX(a->aux, pp); | 364 | length += i2d_X509_CERT_AUX(a->aux, pp); |
352 | return length; | 365 | return length; |
353 | } | 366 | } |
367 | LCRYPTO_ALIAS(i2d_X509_AUX); | ||
354 | 368 | ||
355 | int | 369 | int |
356 | i2d_re_X509_tbs(X509 *x, unsigned char **pp) | 370 | i2d_re_X509_tbs(X509 *x, unsigned char **pp) |
@@ -358,6 +372,7 @@ i2d_re_X509_tbs(X509 *x, unsigned char **pp) | |||
358 | x->cert_info->enc.modified = 1; | 372 | x->cert_info->enc.modified = 1; |
359 | return i2d_X509_CINF(x->cert_info, pp); | 373 | return i2d_X509_CINF(x->cert_info, pp); |
360 | } | 374 | } |
375 | LCRYPTO_ALIAS(i2d_re_X509_tbs); | ||
361 | 376 | ||
362 | void | 377 | void |
363 | X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, | 378 | X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, |
@@ -368,9 +383,11 @@ X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, | |||
368 | if (palg != NULL) | 383 | if (palg != NULL) |
369 | *palg = x->sig_alg; | 384 | *palg = x->sig_alg; |
370 | } | 385 | } |
386 | LCRYPTO_ALIAS(X509_get0_signature); | ||
371 | 387 | ||
372 | int | 388 | int |
373 | X509_get_signature_nid(const X509 *x) | 389 | X509_get_signature_nid(const X509 *x) |
374 | { | 390 | { |
375 | return OBJ_obj2nid(x->sig_alg->algorithm); | 391 | return OBJ_obj2nid(x->sig_alg->algorithm); |
376 | } | 392 | } |
393 | LCRYPTO_ALIAS(X509_get_signature_nid); | ||