diff options
author | beck <> | 2024-04-09 13:52:42 +0000 |
---|---|---|
committer | beck <> | 2024-04-09 13:52:42 +0000 |
commit | b8c1a99fdb41738feb7a1352029c5f5aa42fed86 (patch) | |
tree | b9ee99887d6be79187ba476e0f6ac92f0820775f /src/lib/libcrypto/evp/p_lib.c | |
parent | 94d86681cdef7dae37d5ce494a200523ce63b70c (diff) | |
download | openbsd-b8c1a99fdb41738feb7a1352029c5f5aa42fed86.tar.gz openbsd-b8c1a99fdb41738feb7a1352029c5f5aa42fed86.tar.bz2 openbsd-b8c1a99fdb41738feb7a1352029c5f5aa42fed86.zip |
Hide public symbols in evp.h
largely mechanically done by the guentherizer 9000
ok tb@
Diffstat (limited to 'src/lib/libcrypto/evp/p_lib.c')
-rw-r--r-- | src/lib/libcrypto/evp/p_lib.c | 48 |
1 files changed, 47 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c index 8bf820560c..4a6a6db4cc 100644 --- a/src/lib/libcrypto/evp/p_lib.c +++ b/src/lib/libcrypto/evp/p_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p_lib.c,v 1.59 2024/03/02 11:17:27 tb Exp $ */ | 1 | /* $OpenBSD: p_lib.c,v 1.60 2024/04/09 13:52:41 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 | * |
@@ -170,6 +170,7 @@ EVP_PKEY_asn1_get_count(void) | |||
170 | { | 170 | { |
171 | return N_ASN1_METHODS; | 171 | return N_ASN1_METHODS; |
172 | } | 172 | } |
173 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get_count); | ||
173 | 174 | ||
174 | const EVP_PKEY_ASN1_METHOD * | 175 | const EVP_PKEY_ASN1_METHOD * |
175 | EVP_PKEY_asn1_get0(int idx) | 176 | EVP_PKEY_asn1_get0(int idx) |
@@ -179,6 +180,7 @@ EVP_PKEY_asn1_get0(int idx) | |||
179 | 180 | ||
180 | return asn1_methods[idx]; | 181 | return asn1_methods[idx]; |
181 | } | 182 | } |
183 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get0); | ||
182 | 184 | ||
183 | const EVP_PKEY_ASN1_METHOD * | 185 | const EVP_PKEY_ASN1_METHOD * |
184 | EVP_PKEY_asn1_find(ENGINE **engine, int pkey_id) | 186 | EVP_PKEY_asn1_find(ENGINE **engine, int pkey_id) |
@@ -195,6 +197,7 @@ EVP_PKEY_asn1_find(ENGINE **engine, int pkey_id) | |||
195 | 197 | ||
196 | return NULL; | 198 | return NULL; |
197 | } | 199 | } |
200 | LCRYPTO_ALIAS(EVP_PKEY_asn1_find); | ||
198 | 201 | ||
199 | const EVP_PKEY_ASN1_METHOD * | 202 | const EVP_PKEY_ASN1_METHOD * |
200 | EVP_PKEY_asn1_find_str(ENGINE **engine, const char *str, int len) | 203 | EVP_PKEY_asn1_find_str(ENGINE **engine, const char *str, int len) |
@@ -224,6 +227,7 @@ EVP_PKEY_asn1_find_str(ENGINE **engine, const char *str, int len) | |||
224 | 227 | ||
225 | return NULL; | 228 | return NULL; |
226 | } | 229 | } |
230 | LCRYPTO_ALIAS(EVP_PKEY_asn1_find_str); | ||
227 | 231 | ||
228 | int | 232 | int |
229 | EVP_PKEY_asn1_get0_info(int *pkey_id, int *pkey_base_id, int *pkey_flags, | 233 | EVP_PKEY_asn1_get0_info(int *pkey_id, int *pkey_base_id, int *pkey_flags, |
@@ -246,12 +250,14 @@ EVP_PKEY_asn1_get0_info(int *pkey_id, int *pkey_base_id, int *pkey_flags, | |||
246 | 250 | ||
247 | return 1; | 251 | return 1; |
248 | } | 252 | } |
253 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get0_info); | ||
249 | 254 | ||
250 | const EVP_PKEY_ASN1_METHOD* | 255 | const EVP_PKEY_ASN1_METHOD* |
251 | EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) | 256 | EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) |
252 | { | 257 | { |
253 | return pkey->ameth; | 258 | return pkey->ameth; |
254 | } | 259 | } |
260 | LCRYPTO_ALIAS(EVP_PKEY_get0_asn1); | ||
255 | 261 | ||
256 | int | 262 | int |
257 | EVP_PKEY_bits(const EVP_PKEY *pkey) | 263 | EVP_PKEY_bits(const EVP_PKEY *pkey) |
@@ -260,6 +266,7 @@ EVP_PKEY_bits(const EVP_PKEY *pkey) | |||
260 | return pkey->ameth->pkey_bits(pkey); | 266 | return pkey->ameth->pkey_bits(pkey); |
261 | return 0; | 267 | return 0; |
262 | } | 268 | } |
269 | LCRYPTO_ALIAS(EVP_PKEY_bits); | ||
263 | 270 | ||
264 | int | 271 | int |
265 | EVP_PKEY_security_bits(const EVP_PKEY *pkey) | 272 | EVP_PKEY_security_bits(const EVP_PKEY *pkey) |
@@ -271,6 +278,7 @@ EVP_PKEY_security_bits(const EVP_PKEY *pkey) | |||
271 | 278 | ||
272 | return pkey->ameth->pkey_security_bits(pkey); | 279 | return pkey->ameth->pkey_security_bits(pkey); |
273 | } | 280 | } |
281 | LCRYPTO_ALIAS(EVP_PKEY_security_bits); | ||
274 | 282 | ||
275 | int | 283 | int |
276 | EVP_PKEY_size(const EVP_PKEY *pkey) | 284 | EVP_PKEY_size(const EVP_PKEY *pkey) |
@@ -279,6 +287,7 @@ EVP_PKEY_size(const EVP_PKEY *pkey) | |||
279 | return pkey->ameth->pkey_size(pkey); | 287 | return pkey->ameth->pkey_size(pkey); |
280 | return 0; | 288 | return 0; |
281 | } | 289 | } |
290 | LCRYPTO_ALIAS(EVP_PKEY_size); | ||
282 | 291 | ||
283 | int | 292 | int |
284 | EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode) | 293 | EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode) |
@@ -303,6 +312,7 @@ EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode) | |||
303 | #endif | 312 | #endif |
304 | return (0); | 313 | return (0); |
305 | } | 314 | } |
315 | LCRYPTO_ALIAS(EVP_PKEY_save_parameters); | ||
306 | 316 | ||
307 | int | 317 | int |
308 | EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) | 318 | EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) |
@@ -322,6 +332,7 @@ EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) | |||
322 | err: | 332 | err: |
323 | return 0; | 333 | return 0; |
324 | } | 334 | } |
335 | LCRYPTO_ALIAS(EVP_PKEY_copy_parameters); | ||
325 | 336 | ||
326 | int | 337 | int |
327 | EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) | 338 | EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) |
@@ -330,6 +341,7 @@ EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) | |||
330 | return pkey->ameth->param_missing(pkey); | 341 | return pkey->ameth->param_missing(pkey); |
331 | return 0; | 342 | return 0; |
332 | } | 343 | } |
344 | LCRYPTO_ALIAS(EVP_PKEY_missing_parameters); | ||
333 | 345 | ||
334 | int | 346 | int |
335 | EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) | 347 | EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) |
@@ -340,6 +352,7 @@ EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) | |||
340 | return a->ameth->param_cmp(a, b); | 352 | return a->ameth->param_cmp(a, b); |
341 | return -2; | 353 | return -2; |
342 | } | 354 | } |
355 | LCRYPTO_ALIAS(EVP_PKEY_cmp_parameters); | ||
343 | 356 | ||
344 | int | 357 | int |
345 | EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b) | 358 | EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b) |
@@ -362,6 +375,7 @@ EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b) | |||
362 | 375 | ||
363 | return -2; | 376 | return -2; |
364 | } | 377 | } |
378 | LCRYPTO_ALIAS(EVP_PKEY_cmp); | ||
365 | 379 | ||
366 | EVP_PKEY * | 380 | EVP_PKEY * |
367 | EVP_PKEY_new(void) | 381 | EVP_PKEY_new(void) |
@@ -379,12 +393,14 @@ EVP_PKEY_new(void) | |||
379 | 393 | ||
380 | return pkey; | 394 | return pkey; |
381 | } | 395 | } |
396 | LCRYPTO_ALIAS(EVP_PKEY_new); | ||
382 | 397 | ||
383 | int | 398 | int |
384 | EVP_PKEY_up_ref(EVP_PKEY *pkey) | 399 | EVP_PKEY_up_ref(EVP_PKEY *pkey) |
385 | { | 400 | { |
386 | return CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY) > 1; | 401 | return CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY) > 1; |
387 | } | 402 | } |
403 | LCRYPTO_ALIAS(EVP_PKEY_up_ref); | ||
388 | 404 | ||
389 | static void | 405 | static void |
390 | evp_pkey_free_pkey_ptr(EVP_PKEY *pkey) | 406 | evp_pkey_free_pkey_ptr(EVP_PKEY *pkey) |
@@ -409,6 +425,7 @@ EVP_PKEY_free(EVP_PKEY *pkey) | |||
409 | sk_X509_ATTRIBUTE_pop_free(pkey->attributes, X509_ATTRIBUTE_free); | 425 | sk_X509_ATTRIBUTE_pop_free(pkey->attributes, X509_ATTRIBUTE_free); |
410 | freezero(pkey, sizeof(*pkey)); | 426 | freezero(pkey, sizeof(*pkey)); |
411 | } | 427 | } |
428 | LCRYPTO_ALIAS(EVP_PKEY_free); | ||
412 | 429 | ||
413 | int | 430 | int |
414 | EVP_PKEY_set_type(EVP_PKEY *pkey, int type) | 431 | EVP_PKEY_set_type(EVP_PKEY *pkey, int type) |
@@ -428,6 +445,7 @@ EVP_PKEY_set_type(EVP_PKEY *pkey, int type) | |||
428 | 445 | ||
429 | return 1; | 446 | return 1; |
430 | } | 447 | } |
448 | LCRYPTO_ALIAS(EVP_PKEY_set_type); | ||
431 | 449 | ||
432 | int | 450 | int |
433 | EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len) | 451 | EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len) |
@@ -447,6 +465,7 @@ EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len) | |||
447 | 465 | ||
448 | return 1; | 466 | return 1; |
449 | } | 467 | } |
468 | LCRYPTO_ALIAS(EVP_PKEY_set_type_str); | ||
450 | 469 | ||
451 | int | 470 | int |
452 | EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) | 471 | EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) |
@@ -456,6 +475,7 @@ EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) | |||
456 | 475 | ||
457 | return (pkey->pkey.ptr = key) != NULL; | 476 | return (pkey->pkey.ptr = key) != NULL; |
458 | } | 477 | } |
478 | LCRYPTO_ALIAS(EVP_PKEY_assign); | ||
459 | 479 | ||
460 | EVP_PKEY * | 480 | EVP_PKEY * |
461 | EVP_PKEY_new_raw_private_key(int type, ENGINE *engine, | 481 | EVP_PKEY_new_raw_private_key(int type, ENGINE *engine, |
@@ -485,6 +505,7 @@ EVP_PKEY_new_raw_private_key(int type, ENGINE *engine, | |||
485 | 505 | ||
486 | return NULL; | 506 | return NULL; |
487 | } | 507 | } |
508 | LCRYPTO_ALIAS(EVP_PKEY_new_raw_private_key); | ||
488 | 509 | ||
489 | EVP_PKEY * | 510 | EVP_PKEY * |
490 | EVP_PKEY_new_raw_public_key(int type, ENGINE *engine, | 511 | EVP_PKEY_new_raw_public_key(int type, ENGINE *engine, |
@@ -514,6 +535,7 @@ EVP_PKEY_new_raw_public_key(int type, ENGINE *engine, | |||
514 | 535 | ||
515 | return NULL; | 536 | return NULL; |
516 | } | 537 | } |
538 | LCRYPTO_ALIAS(EVP_PKEY_new_raw_public_key); | ||
517 | 539 | ||
518 | int | 540 | int |
519 | EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, | 541 | EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, |
@@ -530,6 +552,7 @@ EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, | |||
530 | 552 | ||
531 | return 1; | 553 | return 1; |
532 | } | 554 | } |
555 | LCRYPTO_ALIAS(EVP_PKEY_get_raw_private_key); | ||
533 | 556 | ||
534 | int | 557 | int |
535 | EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, | 558 | EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, |
@@ -546,6 +569,7 @@ EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, | |||
546 | 569 | ||
547 | return 1; | 570 | return 1; |
548 | } | 571 | } |
572 | LCRYPTO_ALIAS(EVP_PKEY_get_raw_public_key); | ||
549 | 573 | ||
550 | EVP_PKEY * | 574 | EVP_PKEY * |
551 | EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len, | 575 | EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len, |
@@ -577,12 +601,14 @@ EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len, | |||
577 | 601 | ||
578 | return NULL; | 602 | return NULL; |
579 | } | 603 | } |
604 | LCRYPTO_ALIAS(EVP_PKEY_new_CMAC_key); | ||
580 | 605 | ||
581 | void * | 606 | void * |
582 | EVP_PKEY_get0(const EVP_PKEY *pkey) | 607 | EVP_PKEY_get0(const EVP_PKEY *pkey) |
583 | { | 608 | { |
584 | return pkey->pkey.ptr; | 609 | return pkey->pkey.ptr; |
585 | } | 610 | } |
611 | LCRYPTO_ALIAS(EVP_PKEY_get0); | ||
586 | 612 | ||
587 | const unsigned char * | 613 | const unsigned char * |
588 | EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len) | 614 | EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len) |
@@ -599,6 +625,7 @@ EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len) | |||
599 | 625 | ||
600 | return os->data; | 626 | return os->data; |
601 | } | 627 | } |
628 | LCRYPTO_ALIAS(EVP_PKEY_get0_hmac); | ||
602 | 629 | ||
603 | #ifndef OPENSSL_NO_RSA | 630 | #ifndef OPENSSL_NO_RSA |
604 | RSA * | 631 | RSA * |
@@ -610,6 +637,7 @@ EVP_PKEY_get0_RSA(EVP_PKEY *pkey) | |||
610 | EVPerror(EVP_R_EXPECTING_AN_RSA_KEY); | 637 | EVPerror(EVP_R_EXPECTING_AN_RSA_KEY); |
611 | return NULL; | 638 | return NULL; |
612 | } | 639 | } |
640 | LCRYPTO_ALIAS(EVP_PKEY_get0_RSA); | ||
613 | 641 | ||
614 | RSA * | 642 | RSA * |
615 | EVP_PKEY_get1_RSA(EVP_PKEY *pkey) | 643 | EVP_PKEY_get1_RSA(EVP_PKEY *pkey) |
@@ -623,6 +651,7 @@ EVP_PKEY_get1_RSA(EVP_PKEY *pkey) | |||
623 | 651 | ||
624 | return rsa; | 652 | return rsa; |
625 | } | 653 | } |
654 | LCRYPTO_ALIAS(EVP_PKEY_get1_RSA); | ||
626 | 655 | ||
627 | int | 656 | int |
628 | EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) | 657 | EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) |
@@ -632,6 +661,7 @@ EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) | |||
632 | RSA_up_ref(key); | 661 | RSA_up_ref(key); |
633 | return ret; | 662 | return ret; |
634 | } | 663 | } |
664 | LCRYPTO_ALIAS(EVP_PKEY_set1_RSA); | ||
635 | #endif | 665 | #endif |
636 | 666 | ||
637 | #ifndef OPENSSL_NO_DSA | 667 | #ifndef OPENSSL_NO_DSA |
@@ -644,6 +674,7 @@ EVP_PKEY_get0_DSA(EVP_PKEY *pkey) | |||
644 | } | 674 | } |
645 | return pkey->pkey.dsa; | 675 | return pkey->pkey.dsa; |
646 | } | 676 | } |
677 | LCRYPTO_ALIAS(EVP_PKEY_get0_DSA); | ||
647 | 678 | ||
648 | DSA * | 679 | DSA * |
649 | EVP_PKEY_get1_DSA(EVP_PKEY *pkey) | 680 | EVP_PKEY_get1_DSA(EVP_PKEY *pkey) |
@@ -657,6 +688,7 @@ EVP_PKEY_get1_DSA(EVP_PKEY *pkey) | |||
657 | 688 | ||
658 | return dsa; | 689 | return dsa; |
659 | } | 690 | } |
691 | LCRYPTO_ALIAS(EVP_PKEY_get1_DSA); | ||
660 | 692 | ||
661 | int | 693 | int |
662 | EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) | 694 | EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) |
@@ -666,6 +698,7 @@ EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) | |||
666 | DSA_up_ref(key); | 698 | DSA_up_ref(key); |
667 | return ret; | 699 | return ret; |
668 | } | 700 | } |
701 | LCRYPTO_ALIAS(EVP_PKEY_set1_DSA); | ||
669 | #endif | 702 | #endif |
670 | 703 | ||
671 | #ifndef OPENSSL_NO_EC | 704 | #ifndef OPENSSL_NO_EC |
@@ -678,6 +711,7 @@ EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey) | |||
678 | } | 711 | } |
679 | return pkey->pkey.ec; | 712 | return pkey->pkey.ec; |
680 | } | 713 | } |
714 | LCRYPTO_ALIAS(EVP_PKEY_get0_EC_KEY); | ||
681 | 715 | ||
682 | EC_KEY * | 716 | EC_KEY * |
683 | EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) | 717 | EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) |
@@ -691,6 +725,7 @@ EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) | |||
691 | 725 | ||
692 | return key; | 726 | return key; |
693 | } | 727 | } |
728 | LCRYPTO_ALIAS(EVP_PKEY_get1_EC_KEY); | ||
694 | 729 | ||
695 | int | 730 | int |
696 | EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key) | 731 | EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key) |
@@ -700,6 +735,7 @@ EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key) | |||
700 | EC_KEY_up_ref(key); | 735 | EC_KEY_up_ref(key); |
701 | return ret; | 736 | return ret; |
702 | } | 737 | } |
738 | LCRYPTO_ALIAS(EVP_PKEY_set1_EC_KEY); | ||
703 | #endif | 739 | #endif |
704 | 740 | ||
705 | 741 | ||
@@ -713,6 +749,7 @@ EVP_PKEY_get0_DH(EVP_PKEY *pkey) | |||
713 | } | 749 | } |
714 | return pkey->pkey.dh; | 750 | return pkey->pkey.dh; |
715 | } | 751 | } |
752 | LCRYPTO_ALIAS(EVP_PKEY_get0_DH); | ||
716 | 753 | ||
717 | DH * | 754 | DH * |
718 | EVP_PKEY_get1_DH(EVP_PKEY *pkey) | 755 | EVP_PKEY_get1_DH(EVP_PKEY *pkey) |
@@ -726,6 +763,7 @@ EVP_PKEY_get1_DH(EVP_PKEY *pkey) | |||
726 | 763 | ||
727 | return dh; | 764 | return dh; |
728 | } | 765 | } |
766 | LCRYPTO_ALIAS(EVP_PKEY_get1_DH); | ||
729 | 767 | ||
730 | int | 768 | int |
731 | EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key) | 769 | EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key) |
@@ -735,6 +773,7 @@ EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key) | |||
735 | DH_up_ref(key); | 773 | DH_up_ref(key); |
736 | return ret; | 774 | return ret; |
737 | } | 775 | } |
776 | LCRYPTO_ALIAS(EVP_PKEY_set1_DH); | ||
738 | #endif | 777 | #endif |
739 | 778 | ||
740 | int | 779 | int |
@@ -747,18 +786,21 @@ EVP_PKEY_type(int type) | |||
747 | 786 | ||
748 | return NID_undef; | 787 | return NID_undef; |
749 | } | 788 | } |
789 | LCRYPTO_ALIAS(EVP_PKEY_type); | ||
750 | 790 | ||
751 | int | 791 | int |
752 | EVP_PKEY_id(const EVP_PKEY *pkey) | 792 | EVP_PKEY_id(const EVP_PKEY *pkey) |
753 | { | 793 | { |
754 | return pkey->type; | 794 | return pkey->type; |
755 | } | 795 | } |
796 | LCRYPTO_ALIAS(EVP_PKEY_id); | ||
756 | 797 | ||
757 | int | 798 | int |
758 | EVP_PKEY_base_id(const EVP_PKEY *pkey) | 799 | EVP_PKEY_base_id(const EVP_PKEY *pkey) |
759 | { | 800 | { |
760 | return EVP_PKEY_type(pkey->type); | 801 | return EVP_PKEY_type(pkey->type); |
761 | } | 802 | } |
803 | LCRYPTO_ALIAS(EVP_PKEY_base_id); | ||
762 | 804 | ||
763 | static int | 805 | static int |
764 | unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent, const char *kstr) | 806 | unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent, const char *kstr) |
@@ -779,6 +821,7 @@ EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey, int indent, | |||
779 | 821 | ||
780 | return unsup_alg(out, pkey, indent, "Public Key"); | 822 | return unsup_alg(out, pkey, indent, "Public Key"); |
781 | } | 823 | } |
824 | LCRYPTO_ALIAS(EVP_PKEY_print_public); | ||
782 | 825 | ||
783 | int | 826 | int |
784 | EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent, | 827 | EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent, |
@@ -789,6 +832,7 @@ EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent, | |||
789 | 832 | ||
790 | return unsup_alg(out, pkey, indent, "Private Key"); | 833 | return unsup_alg(out, pkey, indent, "Private Key"); |
791 | } | 834 | } |
835 | LCRYPTO_ALIAS(EVP_PKEY_print_private); | ||
792 | 836 | ||
793 | int | 837 | int |
794 | EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent, | 838 | EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent, |
@@ -798,6 +842,7 @@ EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent, | |||
798 | return pkey->ameth->param_print(out, pkey, indent, pctx); | 842 | return pkey->ameth->param_print(out, pkey, indent, pctx); |
799 | return unsup_alg(out, pkey, indent, "Parameters"); | 843 | return unsup_alg(out, pkey, indent, "Parameters"); |
800 | } | 844 | } |
845 | LCRYPTO_ALIAS(EVP_PKEY_print_params); | ||
801 | 846 | ||
802 | int | 847 | int |
803 | EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid) | 848 | EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid) |
@@ -807,3 +852,4 @@ EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid) | |||
807 | return pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_DEFAULT_MD_NID, | 852 | return pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_DEFAULT_MD_NID, |
808 | 0, pnid); | 853 | 0, pnid); |
809 | } | 854 | } |
855 | LCRYPTO_ALIAS(EVP_PKEY_get_default_digest_nid); | ||