diff options
author | beck <> | 2023-07-07 19:37:54 +0000 |
---|---|---|
committer | beck <> | 2023-07-07 19:37:54 +0000 |
commit | 8d42940c1d19bb9bd4ce45580f18a59069225432 (patch) | |
tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/asn1/ameth_lib.c | |
parent | 1c5e77a1d6f97589e2bca622f3313c1418f9a535 (diff) | |
download | openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.gz openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.bz2 openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.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/ameth_lib.c')
-rw-r--r-- | src/lib/libcrypto/asn1/ameth_lib.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c index 5a1dfd7ce3..153ad21a81 100644 --- a/src/lib/libcrypto/asn1/ameth_lib.c +++ b/src/lib/libcrypto/asn1/ameth_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ameth_lib.c,v 1.31 2023/07/05 21:23:36 beck Exp $ */ | 1 | /* $OpenBSD: ameth_lib.c,v 1.32 2023/07/07 19:37:52 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 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -120,7 +120,6 @@ EVP_PKEY_asn1_get_count(void) | |||
120 | 120 | ||
121 | return num; | 121 | return num; |
122 | } | 122 | } |
123 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get_count); | ||
124 | 123 | ||
125 | const EVP_PKEY_ASN1_METHOD * | 124 | const EVP_PKEY_ASN1_METHOD * |
126 | EVP_PKEY_asn1_get0(int idx) | 125 | EVP_PKEY_asn1_get0(int idx) |
@@ -136,7 +135,6 @@ EVP_PKEY_asn1_get0(int idx) | |||
136 | 135 | ||
137 | return sk_EVP_PKEY_ASN1_METHOD_value(asn1_app_methods, idx); | 136 | return sk_EVP_PKEY_ASN1_METHOD_value(asn1_app_methods, idx); |
138 | } | 137 | } |
139 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get0); | ||
140 | 138 | ||
141 | static const EVP_PKEY_ASN1_METHOD * | 139 | static const EVP_PKEY_ASN1_METHOD * |
142 | pkey_asn1_find(int pkey_id) | 140 | pkey_asn1_find(int pkey_id) |
@@ -185,7 +183,6 @@ EVP_PKEY_asn1_find(ENGINE **pe, int type) | |||
185 | } | 183 | } |
186 | return mp; | 184 | return mp; |
187 | } | 185 | } |
188 | LCRYPTO_ALIAS(EVP_PKEY_asn1_find); | ||
189 | 186 | ||
190 | const EVP_PKEY_ASN1_METHOD * | 187 | const EVP_PKEY_ASN1_METHOD * |
191 | EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len) | 188 | EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len) |
@@ -222,7 +219,6 @@ EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len) | |||
222 | } | 219 | } |
223 | return NULL; | 220 | return NULL; |
224 | } | 221 | } |
225 | LCRYPTO_ALIAS(EVP_PKEY_asn1_find_str); | ||
226 | 222 | ||
227 | int | 223 | int |
228 | EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) | 224 | EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) |
@@ -238,7 +234,6 @@ EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) | |||
238 | 234 | ||
239 | return 1; | 235 | return 1; |
240 | } | 236 | } |
241 | LCRYPTO_ALIAS(EVP_PKEY_asn1_add0); | ||
242 | 237 | ||
243 | int | 238 | int |
244 | EVP_PKEY_asn1_add_alias(int to, int from) | 239 | EVP_PKEY_asn1_add_alias(int to, int from) |
@@ -256,7 +251,6 @@ EVP_PKEY_asn1_add_alias(int to, int from) | |||
256 | } | 251 | } |
257 | return 1; | 252 | return 1; |
258 | } | 253 | } |
259 | LCRYPTO_ALIAS(EVP_PKEY_asn1_add_alias); | ||
260 | 254 | ||
261 | int | 255 | int |
262 | EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, | 256 | EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, |
@@ -277,14 +271,12 @@ EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, | |||
277 | *ppem_str = ameth->pem_str; | 271 | *ppem_str = ameth->pem_str; |
278 | return 1; | 272 | return 1; |
279 | } | 273 | } |
280 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get0_info); | ||
281 | 274 | ||
282 | const EVP_PKEY_ASN1_METHOD* | 275 | const EVP_PKEY_ASN1_METHOD* |
283 | EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) | 276 | EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) |
284 | { | 277 | { |
285 | return pkey->ameth; | 278 | return pkey->ameth; |
286 | } | 279 | } |
287 | LCRYPTO_ALIAS(EVP_PKEY_get0_asn1); | ||
288 | 280 | ||
289 | EVP_PKEY_ASN1_METHOD* | 281 | EVP_PKEY_ASN1_METHOD* |
290 | EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) | 282 | EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) |
@@ -314,7 +306,6 @@ EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) | |||
314 | EVP_PKEY_asn1_free(ameth); | 306 | EVP_PKEY_asn1_free(ameth); |
315 | return NULL; | 307 | return NULL; |
316 | } | 308 | } |
317 | LCRYPTO_ALIAS(EVP_PKEY_asn1_new); | ||
318 | 309 | ||
319 | void | 310 | void |
320 | EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, const EVP_PKEY_ASN1_METHOD *src) | 311 | EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, const EVP_PKEY_ASN1_METHOD *src) |
@@ -335,7 +326,6 @@ EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, const EVP_PKEY_ASN1_METHOD *src) | |||
335 | dst->pem_str = preserve.pem_str; | 326 | dst->pem_str = preserve.pem_str; |
336 | dst->info = preserve.info; | 327 | dst->info = preserve.info; |
337 | } | 328 | } |
338 | LCRYPTO_ALIAS(EVP_PKEY_asn1_copy); | ||
339 | 329 | ||
340 | void | 330 | void |
341 | EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth) | 331 | EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth) |
@@ -346,7 +336,6 @@ EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth) | |||
346 | free(ameth); | 336 | free(ameth); |
347 | } | 337 | } |
348 | } | 338 | } |
349 | LCRYPTO_ALIAS(EVP_PKEY_asn1_free); | ||
350 | 339 | ||
351 | void | 340 | void |
352 | EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, | 341 | EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -365,7 +354,6 @@ EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, | |||
365 | ameth->pkey_size = pkey_size; | 354 | ameth->pkey_size = pkey_size; |
366 | ameth->pkey_bits = pkey_bits; | 355 | ameth->pkey_bits = pkey_bits; |
367 | } | 356 | } |
368 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_public); | ||
369 | 357 | ||
370 | void | 358 | void |
371 | EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth, | 359 | EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -378,7 +366,6 @@ EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth, | |||
378 | ameth->priv_encode = priv_encode; | 366 | ameth->priv_encode = priv_encode; |
379 | ameth->priv_print = priv_print; | 367 | ameth->priv_print = priv_print; |
380 | } | 368 | } |
381 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_private); | ||
382 | 369 | ||
383 | void | 370 | void |
384 | EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth, | 371 | EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -397,7 +384,6 @@ EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth, | |||
397 | ameth->param_cmp = param_cmp; | 384 | ameth->param_cmp = param_cmp; |
398 | ameth->param_print = param_print; | 385 | ameth->param_print = param_print; |
399 | } | 386 | } |
400 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_param); | ||
401 | 387 | ||
402 | void | 388 | void |
403 | EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, | 389 | EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -405,7 +391,6 @@ EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, | |||
405 | { | 391 | { |
406 | ameth->pkey_free = pkey_free; | 392 | ameth->pkey_free = pkey_free; |
407 | } | 393 | } |
408 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_free); | ||
409 | 394 | ||
410 | void | 395 | void |
411 | EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, | 396 | EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -413,7 +398,6 @@ EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, | |||
413 | { | 398 | { |
414 | ameth->pkey_ctrl = pkey_ctrl; | 399 | ameth->pkey_ctrl = pkey_ctrl; |
415 | } | 400 | } |
416 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_ctrl); | ||
417 | 401 | ||
418 | void | 402 | void |
419 | EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, | 403 | EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -421,7 +405,6 @@ EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, | |||
421 | { | 405 | { |
422 | ameth->pkey_security_bits = pkey_security_bits; | 406 | ameth->pkey_security_bits = pkey_security_bits; |
423 | } | 407 | } |
424 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_security_bits); | ||
425 | 408 | ||
426 | void | 409 | void |
427 | EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, | 410 | EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -429,7 +412,6 @@ EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, | |||
429 | { | 412 | { |
430 | ameth->pkey_check = pkey_check; | 413 | ameth->pkey_check = pkey_check; |
431 | } | 414 | } |
432 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_check); | ||
433 | 415 | ||
434 | void | 416 | void |
435 | EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, | 417 | EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -437,7 +419,6 @@ EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, | |||
437 | { | 419 | { |
438 | ameth->pkey_public_check = pkey_public_check; | 420 | ameth->pkey_public_check = pkey_public_check; |
439 | } | 421 | } |
440 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_public_check); | ||
441 | 422 | ||
442 | void | 423 | void |
443 | EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, | 424 | EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -445,4 +426,3 @@ EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, | |||
445 | { | 426 | { |
446 | ameth->pkey_param_check = pkey_param_check; | 427 | ameth->pkey_param_check = pkey_param_check; |
447 | } | 428 | } |
448 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_param_check); | ||