diff options
Diffstat (limited to 'src/lib/libcrypto/pem/pvkfmt.c')
| -rw-r--r-- | src/lib/libcrypto/pem/pvkfmt.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c index 1417a7b3c0..816d8b7dc0 100644 --- a/src/lib/libcrypto/pem/pvkfmt.c +++ b/src/lib/libcrypto/pem/pvkfmt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pvkfmt.c,v 1.26 2022/11/26 16:08:53 tb Exp $ */ | 1 | /* $OpenBSD: pvkfmt.c,v 1.27 2023/07/07 13:40:44 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 2005. | 3 | * project 2005. |
| 4 | */ | 4 | */ |
| @@ -414,24 +414,28 @@ b2i_PrivateKey(const unsigned char **in, long length) | |||
| 414 | { | 414 | { |
| 415 | return do_b2i(in, length, 0); | 415 | return do_b2i(in, length, 0); |
| 416 | } | 416 | } |
| 417 | LCRYPTO_ALIAS(b2i_PrivateKey); | ||
| 417 | 418 | ||
| 418 | EVP_PKEY * | 419 | EVP_PKEY * |
| 419 | b2i_PublicKey(const unsigned char **in, long length) | 420 | b2i_PublicKey(const unsigned char **in, long length) |
| 420 | { | 421 | { |
| 421 | return do_b2i(in, length, 1); | 422 | return do_b2i(in, length, 1); |
| 422 | } | 423 | } |
| 424 | LCRYPTO_ALIAS(b2i_PublicKey); | ||
| 423 | 425 | ||
| 424 | EVP_PKEY * | 426 | EVP_PKEY * |
| 425 | b2i_PrivateKey_bio(BIO *in) | 427 | b2i_PrivateKey_bio(BIO *in) |
| 426 | { | 428 | { |
| 427 | return do_b2i_bio(in, 0); | 429 | return do_b2i_bio(in, 0); |
| 428 | } | 430 | } |
| 431 | LCRYPTO_ALIAS(b2i_PrivateKey_bio); | ||
| 429 | 432 | ||
| 430 | EVP_PKEY * | 433 | EVP_PKEY * |
| 431 | b2i_PublicKey_bio(BIO *in) | 434 | b2i_PublicKey_bio(BIO *in) |
| 432 | { | 435 | { |
| 433 | return do_b2i_bio(in, 1); | 436 | return do_b2i_bio(in, 1); |
| 434 | } | 437 | } |
| 438 | LCRYPTO_ALIAS(b2i_PublicKey_bio); | ||
| 435 | 439 | ||
| 436 | static void | 440 | static void |
| 437 | write_ledword(unsigned char **out, unsigned int dw) | 441 | write_ledword(unsigned char **out, unsigned int dw) |
| @@ -646,12 +650,14 @@ i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk) | |||
| 646 | { | 650 | { |
| 647 | return do_i2b_bio(out, pk, 0); | 651 | return do_i2b_bio(out, pk, 0); |
| 648 | } | 652 | } |
| 653 | LCRYPTO_ALIAS(i2b_PrivateKey_bio); | ||
| 649 | 654 | ||
| 650 | int | 655 | int |
| 651 | i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk) | 656 | i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk) |
| 652 | { | 657 | { |
| 653 | return do_i2b_bio(out, pk, 1); | 658 | return do_i2b_bio(out, pk, 1); |
| 654 | } | 659 | } |
| 660 | LCRYPTO_ALIAS(i2b_PublicKey_bio); | ||
| 655 | 661 | ||
| 656 | #ifndef OPENSSL_NO_RC4 | 662 | #ifndef OPENSSL_NO_RC4 |
| 657 | 663 | ||
| @@ -837,6 +843,7 @@ b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u) | |||
| 837 | freezero(buf, buflen); | 843 | freezero(buf, buflen); |
| 838 | return ret; | 844 | return ret; |
| 839 | } | 845 | } |
| 846 | LCRYPTO_ALIAS(b2i_PVK_bio); | ||
| 840 | 847 | ||
| 841 | static int | 848 | static int |
| 842 | i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel, pem_password_cb *cb, | 849 | i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel, pem_password_cb *cb, |
| @@ -930,6 +937,7 @@ i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, pem_password_cb *cb, void *u) | |||
| 930 | } | 937 | } |
| 931 | return outlen; | 938 | return outlen; |
| 932 | } | 939 | } |
| 940 | LCRYPTO_ALIAS(i2b_PVK_bio); | ||
| 933 | 941 | ||
| 934 | #endif | 942 | #endif |
| 935 | 943 | ||
