diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/evp/p_lib.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c index 95c7721303..3f88185737 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.61 2024/08/22 12:24:24 tb Exp $ */ | 1 | /* $OpenBSD: p_lib.c,v 1.63 2025/07/02 06:36:52 tb 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 | * |
@@ -111,7 +111,6 @@ | |||
111 | #include <openssl/bio.h> | 111 | #include <openssl/bio.h> |
112 | #include <openssl/cmac.h> | 112 | #include <openssl/cmac.h> |
113 | #include <openssl/crypto.h> | 113 | #include <openssl/crypto.h> |
114 | #include <openssl/err.h> | ||
115 | #include <openssl/evp.h> | 114 | #include <openssl/evp.h> |
116 | #include <openssl/objects.h> | 115 | #include <openssl/objects.h> |
117 | #include <openssl/x509.h> | 116 | #include <openssl/x509.h> |
@@ -129,6 +128,7 @@ | |||
129 | #include <openssl/rsa.h> | 128 | #include <openssl/rsa.h> |
130 | #endif | 129 | #endif |
131 | 130 | ||
131 | #include "err_local.h" | ||
132 | #include "evp_local.h" | 132 | #include "evp_local.h" |
133 | 133 | ||
134 | extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth; | 134 | extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth; |
@@ -628,7 +628,7 @@ LCRYPTO_ALIAS(EVP_PKEY_get0_hmac); | |||
628 | 628 | ||
629 | #ifndef OPENSSL_NO_RSA | 629 | #ifndef OPENSSL_NO_RSA |
630 | RSA * | 630 | RSA * |
631 | EVP_PKEY_get0_RSA(EVP_PKEY *pkey) | 631 | EVP_PKEY_get0_RSA(const EVP_PKEY *pkey) |
632 | { | 632 | { |
633 | if (pkey->type == EVP_PKEY_RSA || pkey->type == EVP_PKEY_RSA_PSS) | 633 | if (pkey->type == EVP_PKEY_RSA || pkey->type == EVP_PKEY_RSA_PSS) |
634 | return pkey->pkey.rsa; | 634 | return pkey->pkey.rsa; |
@@ -639,7 +639,7 @@ EVP_PKEY_get0_RSA(EVP_PKEY *pkey) | |||
639 | LCRYPTO_ALIAS(EVP_PKEY_get0_RSA); | 639 | LCRYPTO_ALIAS(EVP_PKEY_get0_RSA); |
640 | 640 | ||
641 | RSA * | 641 | RSA * |
642 | EVP_PKEY_get1_RSA(EVP_PKEY *pkey) | 642 | EVP_PKEY_get1_RSA(const EVP_PKEY *pkey) |
643 | { | 643 | { |
644 | RSA *rsa; | 644 | RSA *rsa; |
645 | 645 | ||
@@ -665,7 +665,7 @@ LCRYPTO_ALIAS(EVP_PKEY_set1_RSA); | |||
665 | 665 | ||
666 | #ifndef OPENSSL_NO_DSA | 666 | #ifndef OPENSSL_NO_DSA |
667 | DSA * | 667 | DSA * |
668 | EVP_PKEY_get0_DSA(EVP_PKEY *pkey) | 668 | EVP_PKEY_get0_DSA(const EVP_PKEY *pkey) |
669 | { | 669 | { |
670 | if (pkey->type != EVP_PKEY_DSA) { | 670 | if (pkey->type != EVP_PKEY_DSA) { |
671 | EVPerror(EVP_R_EXPECTING_A_DSA_KEY); | 671 | EVPerror(EVP_R_EXPECTING_A_DSA_KEY); |
@@ -676,7 +676,7 @@ EVP_PKEY_get0_DSA(EVP_PKEY *pkey) | |||
676 | LCRYPTO_ALIAS(EVP_PKEY_get0_DSA); | 676 | LCRYPTO_ALIAS(EVP_PKEY_get0_DSA); |
677 | 677 | ||
678 | DSA * | 678 | DSA * |
679 | EVP_PKEY_get1_DSA(EVP_PKEY *pkey) | 679 | EVP_PKEY_get1_DSA(const EVP_PKEY *pkey) |
680 | { | 680 | { |
681 | DSA *dsa; | 681 | DSA *dsa; |
682 | 682 | ||
@@ -702,7 +702,7 @@ LCRYPTO_ALIAS(EVP_PKEY_set1_DSA); | |||
702 | 702 | ||
703 | #ifndef OPENSSL_NO_EC | 703 | #ifndef OPENSSL_NO_EC |
704 | EC_KEY * | 704 | EC_KEY * |
705 | EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey) | 705 | EVP_PKEY_get0_EC_KEY(const EVP_PKEY *pkey) |
706 | { | 706 | { |
707 | if (pkey->type != EVP_PKEY_EC) { | 707 | if (pkey->type != EVP_PKEY_EC) { |
708 | EVPerror(EVP_R_EXPECTING_A_EC_KEY); | 708 | EVPerror(EVP_R_EXPECTING_A_EC_KEY); |
@@ -713,7 +713,7 @@ EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey) | |||
713 | LCRYPTO_ALIAS(EVP_PKEY_get0_EC_KEY); | 713 | LCRYPTO_ALIAS(EVP_PKEY_get0_EC_KEY); |
714 | 714 | ||
715 | EC_KEY * | 715 | EC_KEY * |
716 | EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey) | 716 | EVP_PKEY_get1_EC_KEY(const EVP_PKEY *pkey) |
717 | { | 717 | { |
718 | EC_KEY *key; | 718 | EC_KEY *key; |
719 | 719 | ||
@@ -740,7 +740,7 @@ LCRYPTO_ALIAS(EVP_PKEY_set1_EC_KEY); | |||
740 | 740 | ||
741 | #ifndef OPENSSL_NO_DH | 741 | #ifndef OPENSSL_NO_DH |
742 | DH * | 742 | DH * |
743 | EVP_PKEY_get0_DH(EVP_PKEY *pkey) | 743 | EVP_PKEY_get0_DH(const EVP_PKEY *pkey) |
744 | { | 744 | { |
745 | if (pkey->type != EVP_PKEY_DH) { | 745 | if (pkey->type != EVP_PKEY_DH) { |
746 | EVPerror(EVP_R_EXPECTING_A_DH_KEY); | 746 | EVPerror(EVP_R_EXPECTING_A_DH_KEY); |
@@ -751,7 +751,7 @@ EVP_PKEY_get0_DH(EVP_PKEY *pkey) | |||
751 | LCRYPTO_ALIAS(EVP_PKEY_get0_DH); | 751 | LCRYPTO_ALIAS(EVP_PKEY_get0_DH); |
752 | 752 | ||
753 | DH * | 753 | DH * |
754 | EVP_PKEY_get1_DH(EVP_PKEY *pkey) | 754 | EVP_PKEY_get1_DH(const EVP_PKEY *pkey) |
755 | { | 755 | { |
756 | DH *dh; | 756 | DH *dh; |
757 | 757 | ||