summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/p_lib.c
diff options
context:
space:
mode:
authorbeck <>2024-04-09 13:52:42 +0000
committerbeck <>2024-04-09 13:52:42 +0000
commitb8c1a99fdb41738feb7a1352029c5f5aa42fed86 (patch)
treeb9ee99887d6be79187ba476e0f6ac92f0820775f /src/lib/libcrypto/evp/p_lib.c
parent94d86681cdef7dae37d5ce494a200523ce63b70c (diff)
downloadopenbsd-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.c48
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}
173LCRYPTO_ALIAS(EVP_PKEY_asn1_get_count);
173 174
174const EVP_PKEY_ASN1_METHOD * 175const EVP_PKEY_ASN1_METHOD *
175EVP_PKEY_asn1_get0(int idx) 176EVP_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}
183LCRYPTO_ALIAS(EVP_PKEY_asn1_get0);
182 184
183const EVP_PKEY_ASN1_METHOD * 185const EVP_PKEY_ASN1_METHOD *
184EVP_PKEY_asn1_find(ENGINE **engine, int pkey_id) 186EVP_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}
200LCRYPTO_ALIAS(EVP_PKEY_asn1_find);
198 201
199const EVP_PKEY_ASN1_METHOD * 202const EVP_PKEY_ASN1_METHOD *
200EVP_PKEY_asn1_find_str(ENGINE **engine, const char *str, int len) 203EVP_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}
230LCRYPTO_ALIAS(EVP_PKEY_asn1_find_str);
227 231
228int 232int
229EVP_PKEY_asn1_get0_info(int *pkey_id, int *pkey_base_id, int *pkey_flags, 233EVP_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}
253LCRYPTO_ALIAS(EVP_PKEY_asn1_get0_info);
249 254
250const EVP_PKEY_ASN1_METHOD* 255const EVP_PKEY_ASN1_METHOD*
251EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) 256EVP_PKEY_get0_asn1(const EVP_PKEY *pkey)
252{ 257{
253 return pkey->ameth; 258 return pkey->ameth;
254} 259}
260LCRYPTO_ALIAS(EVP_PKEY_get0_asn1);
255 261
256int 262int
257EVP_PKEY_bits(const EVP_PKEY *pkey) 263EVP_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}
269LCRYPTO_ALIAS(EVP_PKEY_bits);
263 270
264int 271int
265EVP_PKEY_security_bits(const EVP_PKEY *pkey) 272EVP_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}
281LCRYPTO_ALIAS(EVP_PKEY_security_bits);
274 282
275int 283int
276EVP_PKEY_size(const EVP_PKEY *pkey) 284EVP_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}
290LCRYPTO_ALIAS(EVP_PKEY_size);
282 291
283int 292int
284EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode) 293EVP_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}
315LCRYPTO_ALIAS(EVP_PKEY_save_parameters);
306 316
307int 317int
308EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) 318EVP_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)
322err: 332err:
323 return 0; 333 return 0;
324} 334}
335LCRYPTO_ALIAS(EVP_PKEY_copy_parameters);
325 336
326int 337int
327EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) 338EVP_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}
344LCRYPTO_ALIAS(EVP_PKEY_missing_parameters);
333 345
334int 346int
335EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) 347EVP_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}
355LCRYPTO_ALIAS(EVP_PKEY_cmp_parameters);
343 356
344int 357int
345EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b) 358EVP_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}
378LCRYPTO_ALIAS(EVP_PKEY_cmp);
365 379
366EVP_PKEY * 380EVP_PKEY *
367EVP_PKEY_new(void) 381EVP_PKEY_new(void)
@@ -379,12 +393,14 @@ EVP_PKEY_new(void)
379 393
380 return pkey; 394 return pkey;
381} 395}
396LCRYPTO_ALIAS(EVP_PKEY_new);
382 397
383int 398int
384EVP_PKEY_up_ref(EVP_PKEY *pkey) 399EVP_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}
403LCRYPTO_ALIAS(EVP_PKEY_up_ref);
388 404
389static void 405static void
390evp_pkey_free_pkey_ptr(EVP_PKEY *pkey) 406evp_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}
428LCRYPTO_ALIAS(EVP_PKEY_free);
412 429
413int 430int
414EVP_PKEY_set_type(EVP_PKEY *pkey, int type) 431EVP_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}
448LCRYPTO_ALIAS(EVP_PKEY_set_type);
431 449
432int 450int
433EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len) 451EVP_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}
468LCRYPTO_ALIAS(EVP_PKEY_set_type_str);
450 469
451int 470int
452EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) 471EVP_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}
478LCRYPTO_ALIAS(EVP_PKEY_assign);
459 479
460EVP_PKEY * 480EVP_PKEY *
461EVP_PKEY_new_raw_private_key(int type, ENGINE *engine, 481EVP_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}
508LCRYPTO_ALIAS(EVP_PKEY_new_raw_private_key);
488 509
489EVP_PKEY * 510EVP_PKEY *
490EVP_PKEY_new_raw_public_key(int type, ENGINE *engine, 511EVP_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}
538LCRYPTO_ALIAS(EVP_PKEY_new_raw_public_key);
517 539
518int 540int
519EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, 541EVP_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}
555LCRYPTO_ALIAS(EVP_PKEY_get_raw_private_key);
533 556
534int 557int
535EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, 558EVP_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}
572LCRYPTO_ALIAS(EVP_PKEY_get_raw_public_key);
549 573
550EVP_PKEY * 574EVP_PKEY *
551EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len, 575EVP_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}
604LCRYPTO_ALIAS(EVP_PKEY_new_CMAC_key);
580 605
581void * 606void *
582EVP_PKEY_get0(const EVP_PKEY *pkey) 607EVP_PKEY_get0(const EVP_PKEY *pkey)
583{ 608{
584 return pkey->pkey.ptr; 609 return pkey->pkey.ptr;
585} 610}
611LCRYPTO_ALIAS(EVP_PKEY_get0);
586 612
587const unsigned char * 613const unsigned char *
588EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len) 614EVP_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}
628LCRYPTO_ALIAS(EVP_PKEY_get0_hmac);
602 629
603#ifndef OPENSSL_NO_RSA 630#ifndef OPENSSL_NO_RSA
604RSA * 631RSA *
@@ -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}
640LCRYPTO_ALIAS(EVP_PKEY_get0_RSA);
613 641
614RSA * 642RSA *
615EVP_PKEY_get1_RSA(EVP_PKEY *pkey) 643EVP_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}
654LCRYPTO_ALIAS(EVP_PKEY_get1_RSA);
626 655
627int 656int
628EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) 657EVP_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}
664LCRYPTO_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}
677LCRYPTO_ALIAS(EVP_PKEY_get0_DSA);
647 678
648DSA * 679DSA *
649EVP_PKEY_get1_DSA(EVP_PKEY *pkey) 680EVP_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}
691LCRYPTO_ALIAS(EVP_PKEY_get1_DSA);
660 692
661int 693int
662EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) 694EVP_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}
701LCRYPTO_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}
714LCRYPTO_ALIAS(EVP_PKEY_get0_EC_KEY);
681 715
682EC_KEY * 716EC_KEY *
683EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) 717EVP_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}
728LCRYPTO_ALIAS(EVP_PKEY_get1_EC_KEY);
694 729
695int 730int
696EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key) 731EVP_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}
738LCRYPTO_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}
752LCRYPTO_ALIAS(EVP_PKEY_get0_DH);
716 753
717DH * 754DH *
718EVP_PKEY_get1_DH(EVP_PKEY *pkey) 755EVP_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}
766LCRYPTO_ALIAS(EVP_PKEY_get1_DH);
729 767
730int 768int
731EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key) 769EVP_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}
776LCRYPTO_ALIAS(EVP_PKEY_set1_DH);
738#endif 777#endif
739 778
740int 779int
@@ -747,18 +786,21 @@ EVP_PKEY_type(int type)
747 786
748 return NID_undef; 787 return NID_undef;
749} 788}
789LCRYPTO_ALIAS(EVP_PKEY_type);
750 790
751int 791int
752EVP_PKEY_id(const EVP_PKEY *pkey) 792EVP_PKEY_id(const EVP_PKEY *pkey)
753{ 793{
754 return pkey->type; 794 return pkey->type;
755} 795}
796LCRYPTO_ALIAS(EVP_PKEY_id);
756 797
757int 798int
758EVP_PKEY_base_id(const EVP_PKEY *pkey) 799EVP_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}
803LCRYPTO_ALIAS(EVP_PKEY_base_id);
762 804
763static int 805static int
764unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent, const char *kstr) 806unsup_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}
824LCRYPTO_ALIAS(EVP_PKEY_print_public);
782 825
783int 826int
784EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent, 827EVP_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}
835LCRYPTO_ALIAS(EVP_PKEY_print_private);
792 836
793int 837int
794EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent, 838EVP_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}
845LCRYPTO_ALIAS(EVP_PKEY_print_params);
801 846
802int 847int
803EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid) 848EVP_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}
855LCRYPTO_ALIAS(EVP_PKEY_get_default_digest_nid);