summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/ameth_lib.c
diff options
context:
space:
mode:
authorbeck <>2023-07-07 19:37:54 +0000
committerbeck <>2023-07-07 19:37:54 +0000
commit8d42940c1d19bb9bd4ce45580f18a59069225432 (patch)
treeb1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/asn1/ameth_lib.c
parent1c5e77a1d6f97589e2bca622f3313c1418f9a535 (diff)
downloadopenbsd-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.c22
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}
123LCRYPTO_ALIAS(EVP_PKEY_asn1_get_count);
124 123
125const EVP_PKEY_ASN1_METHOD * 124const EVP_PKEY_ASN1_METHOD *
126EVP_PKEY_asn1_get0(int idx) 125EVP_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}
139LCRYPTO_ALIAS(EVP_PKEY_asn1_get0);
140 138
141static const EVP_PKEY_ASN1_METHOD * 139static const EVP_PKEY_ASN1_METHOD *
142pkey_asn1_find(int pkey_id) 140pkey_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}
188LCRYPTO_ALIAS(EVP_PKEY_asn1_find);
189 186
190const EVP_PKEY_ASN1_METHOD * 187const EVP_PKEY_ASN1_METHOD *
191EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len) 188EVP_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}
225LCRYPTO_ALIAS(EVP_PKEY_asn1_find_str);
226 222
227int 223int
228EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) 224EVP_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}
241LCRYPTO_ALIAS(EVP_PKEY_asn1_add0);
242 237
243int 238int
244EVP_PKEY_asn1_add_alias(int to, int from) 239EVP_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}
259LCRYPTO_ALIAS(EVP_PKEY_asn1_add_alias);
260 254
261int 255int
262EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, 256EVP_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}
280LCRYPTO_ALIAS(EVP_PKEY_asn1_get0_info);
281 274
282const EVP_PKEY_ASN1_METHOD* 275const EVP_PKEY_ASN1_METHOD*
283EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) 276EVP_PKEY_get0_asn1(const EVP_PKEY *pkey)
284{ 277{
285 return pkey->ameth; 278 return pkey->ameth;
286} 279}
287LCRYPTO_ALIAS(EVP_PKEY_get0_asn1);
288 280
289EVP_PKEY_ASN1_METHOD* 281EVP_PKEY_ASN1_METHOD*
290EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) 282EVP_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}
317LCRYPTO_ALIAS(EVP_PKEY_asn1_new);
318 309
319void 310void
320EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, const EVP_PKEY_ASN1_METHOD *src) 311EVP_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}
338LCRYPTO_ALIAS(EVP_PKEY_asn1_copy);
339 329
340void 330void
341EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth) 331EVP_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}
349LCRYPTO_ALIAS(EVP_PKEY_asn1_free);
350 339
351void 340void
352EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, 341EVP_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}
368LCRYPTO_ALIAS(EVP_PKEY_asn1_set_public);
369 357
370void 358void
371EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth, 359EVP_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}
381LCRYPTO_ALIAS(EVP_PKEY_asn1_set_private);
382 369
383void 370void
384EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth, 371EVP_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}
400LCRYPTO_ALIAS(EVP_PKEY_asn1_set_param);
401 387
402void 388void
403EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, 389EVP_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}
408LCRYPTO_ALIAS(EVP_PKEY_asn1_set_free);
409 394
410void 395void
411EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, 396EVP_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}
416LCRYPTO_ALIAS(EVP_PKEY_asn1_set_ctrl);
417 401
418void 402void
419EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, 403EVP_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}
424LCRYPTO_ALIAS(EVP_PKEY_asn1_set_security_bits);
425 408
426void 409void
427EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, 410EVP_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}
432LCRYPTO_ALIAS(EVP_PKEY_asn1_set_check);
433 415
434void 416void
435EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, 417EVP_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}
440LCRYPTO_ALIAS(EVP_PKEY_asn1_set_public_check);
441 422
442void 423void
443EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, 424EVP_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}
448LCRYPTO_ALIAS(EVP_PKEY_asn1_set_param_check);