diff options
| author | beck <> | 2023-07-07 19:37:54 +0000 |
|---|---|---|
| committer | beck <> | 2023-07-07 19:37:54 +0000 |
| commit | 1ca8095297adf80b48019b5a2d18010ff9e3427f (patch) | |
| tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/asn1/x_x509.c | |
| parent | 66ac57d506be0af957abeb5a5a7334a8d2a36c9b (diff) | |
| download | openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.tar.gz openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.tar.bz2 openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.zip | |
Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing.
This unbreaks the namespace build so it will pass again
ok tb@
Diffstat (limited to 'src/lib/libcrypto/asn1/x_x509.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_x509.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c index 5aa7147548..08e4dba9e8 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.36 2023/07/05 21:23:37 beck Exp $ */ | 1 | /* $OpenBSD: x_x509.c,v 1.37 2023/07/07 19:37:53 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,28 +149,24 @@ 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); | ||
| 153 | 152 | ||
| 154 | int | 153 | int |
| 155 | i2d_X509_CINF(X509_CINF *a, unsigned char **out) | 154 | i2d_X509_CINF(X509_CINF *a, unsigned char **out) |
| 156 | { | 155 | { |
| 157 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CINF_it); | 156 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CINF_it); |
| 158 | } | 157 | } |
| 159 | LCRYPTO_ALIAS(i2d_X509_CINF); | ||
| 160 | 158 | ||
| 161 | X509_CINF * | 159 | X509_CINF * |
| 162 | X509_CINF_new(void) | 160 | X509_CINF_new(void) |
| 163 | { | 161 | { |
| 164 | return (X509_CINF *)ASN1_item_new(&X509_CINF_it); | 162 | return (X509_CINF *)ASN1_item_new(&X509_CINF_it); |
| 165 | } | 163 | } |
| 166 | LCRYPTO_ALIAS(X509_CINF_new); | ||
| 167 | 164 | ||
| 168 | void | 165 | void |
| 169 | X509_CINF_free(X509_CINF *a) | 166 | X509_CINF_free(X509_CINF *a) |
| 170 | { | 167 | { |
| 171 | ASN1_item_free((ASN1_VALUE *)a, &X509_CINF_it); | 168 | ASN1_item_free((ASN1_VALUE *)a, &X509_CINF_it); |
| 172 | } | 169 | } |
| 173 | LCRYPTO_ALIAS(X509_CINF_free); | ||
| 174 | /* X509 top level structure needs a bit of customisation */ | 170 | /* X509 top level structure needs a bit of customisation */ |
| 175 | 171 | ||
| 176 | static int | 172 | static int |
| @@ -263,35 +259,30 @@ d2i_X509(X509 **a, const unsigned char **in, long len) | |||
| 263 | return (X509 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 259 | return (X509 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 264 | &X509_it); | 260 | &X509_it); |
| 265 | } | 261 | } |
| 266 | LCRYPTO_ALIAS(d2i_X509); | ||
| 267 | 262 | ||
| 268 | int | 263 | int |
| 269 | i2d_X509(X509 *a, unsigned char **out) | 264 | i2d_X509(X509 *a, unsigned char **out) |
| 270 | { | 265 | { |
| 271 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_it); | 266 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_it); |
| 272 | } | 267 | } |
| 273 | LCRYPTO_ALIAS(i2d_X509); | ||
| 274 | 268 | ||
| 275 | X509 * | 269 | X509 * |
| 276 | X509_new(void) | 270 | X509_new(void) |
| 277 | { | 271 | { |
| 278 | return (X509 *)ASN1_item_new(&X509_it); | 272 | return (X509 *)ASN1_item_new(&X509_it); |
| 279 | } | 273 | } |
| 280 | LCRYPTO_ALIAS(X509_new); | ||
| 281 | 274 | ||
| 282 | void | 275 | void |
| 283 | X509_free(X509 *a) | 276 | X509_free(X509 *a) |
| 284 | { | 277 | { |
| 285 | ASN1_item_free((ASN1_VALUE *)a, &X509_it); | 278 | ASN1_item_free((ASN1_VALUE *)a, &X509_it); |
| 286 | } | 279 | } |
| 287 | LCRYPTO_ALIAS(X509_free); | ||
| 288 | 280 | ||
| 289 | X509 * | 281 | X509 * |
| 290 | X509_dup(X509 *x) | 282 | X509_dup(X509 *x) |
| 291 | { | 283 | { |
| 292 | return ASN1_item_dup(&X509_it, x); | 284 | return ASN1_item_dup(&X509_it, x); |
| 293 | } | 285 | } |
| 294 | LCRYPTO_ALIAS(X509_dup); | ||
| 295 | 286 | ||
| 296 | int | 287 | int |
| 297 | X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | 288 | X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, |
| @@ -300,21 +291,18 @@ X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | |||
| 300 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, argl, argp, | 291 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, argl, argp, |
| 301 | new_func, dup_func, free_func); | 292 | new_func, dup_func, free_func); |
| 302 | } | 293 | } |
| 303 | LCRYPTO_ALIAS(X509_get_ex_new_index); | ||
| 304 | 294 | ||
| 305 | int | 295 | int |
| 306 | X509_set_ex_data(X509 *r, int idx, void *arg) | 296 | X509_set_ex_data(X509 *r, int idx, void *arg) |
| 307 | { | 297 | { |
| 308 | return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); | 298 | return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); |
| 309 | } | 299 | } |
| 310 | LCRYPTO_ALIAS(X509_set_ex_data); | ||
| 311 | 300 | ||
| 312 | void * | 301 | void * |
| 313 | X509_get_ex_data(X509 *r, int idx) | 302 | X509_get_ex_data(X509 *r, int idx) |
| 314 | { | 303 | { |
| 315 | return (CRYPTO_get_ex_data(&r->ex_data, idx)); | 304 | return (CRYPTO_get_ex_data(&r->ex_data, idx)); |
| 316 | } | 305 | } |
| 317 | LCRYPTO_ALIAS(X509_get_ex_data); | ||
| 318 | 306 | ||
| 319 | /* X509_AUX ASN1 routines. X509_AUX is the name given to | 307 | /* X509_AUX ASN1 routines. X509_AUX is the name given to |
| 320 | * a certificate with extra info tagged on the end. Since these | 308 | * a certificate with extra info tagged on the end. Since these |
| @@ -352,7 +340,6 @@ d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) | |||
| 352 | X509_free(ret); | 340 | X509_free(ret); |
| 353 | return NULL; | 341 | return NULL; |
| 354 | } | 342 | } |
| 355 | LCRYPTO_ALIAS(d2i_X509_AUX); | ||
| 356 | 343 | ||
| 357 | int | 344 | int |
| 358 | i2d_X509_AUX(X509 *a, unsigned char **pp) | 345 | i2d_X509_AUX(X509 *a, unsigned char **pp) |
| @@ -364,7 +351,6 @@ i2d_X509_AUX(X509 *a, unsigned char **pp) | |||
| 364 | length += i2d_X509_CERT_AUX(a->aux, pp); | 351 | length += i2d_X509_CERT_AUX(a->aux, pp); |
| 365 | return length; | 352 | return length; |
| 366 | } | 353 | } |
| 367 | LCRYPTO_ALIAS(i2d_X509_AUX); | ||
| 368 | 354 | ||
| 369 | int | 355 | int |
| 370 | i2d_re_X509_tbs(X509 *x, unsigned char **pp) | 356 | i2d_re_X509_tbs(X509 *x, unsigned char **pp) |
| @@ -372,7 +358,6 @@ i2d_re_X509_tbs(X509 *x, unsigned char **pp) | |||
| 372 | x->cert_info->enc.modified = 1; | 358 | x->cert_info->enc.modified = 1; |
| 373 | return i2d_X509_CINF(x->cert_info, pp); | 359 | return i2d_X509_CINF(x->cert_info, pp); |
| 374 | } | 360 | } |
| 375 | LCRYPTO_ALIAS(i2d_re_X509_tbs); | ||
| 376 | 361 | ||
| 377 | void | 362 | void |
| 378 | X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, | 363 | X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, |
| @@ -383,11 +368,9 @@ X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, | |||
| 383 | if (palg != NULL) | 368 | if (palg != NULL) |
| 384 | *palg = x->sig_alg; | 369 | *palg = x->sig_alg; |
| 385 | } | 370 | } |
| 386 | LCRYPTO_ALIAS(X509_get0_signature); | ||
| 387 | 371 | ||
| 388 | int | 372 | int |
| 389 | X509_get_signature_nid(const X509 *x) | 373 | X509_get_signature_nid(const X509 *x) |
| 390 | { | 374 | { |
| 391 | return OBJ_obj2nid(x->sig_alg->algorithm); | 375 | return OBJ_obj2nid(x->sig_alg->algorithm); |
| 392 | } | 376 | } |
| 393 | LCRYPTO_ALIAS(X509_get_signature_nid); | ||
