upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-03 22:01:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

using OpenSSL3 API for EVP PKEY type name reporting

Browse source 
Signed-off-by: Michael Baentsch <info@baentsch.ch>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <20230319075441.13021-1-info@baentsch.ch>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26439.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Michael Baentsch 2023-03-19 08:54:41 +01:00 committed by Gert Doering
parent 514eefb14a
commit 6c111be9b1
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/openvpn/ssl_openssl.c
View file

@ -1501,7 +1501,11 @@ tls_ctx_use_management_external_key(struct tls_root_ctx *ctx)
}
EVP_PKEY_free(privkey);
#else /* ifdef HAVE_XKEY_PROVIDER */
#if OPENSSL_VERSION_NUMBER < 0x30000000L
if (EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
#else /* OPENSSL_VERSION_NUMBER < 0x30000000L */
if (EVP_PKEY_is_a(pkey, "RSA"))
#endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */
{
if (!tls_ctx_use_external_rsa_key(ctx, pkey))
{
@ -1509,7 +1513,11 @@ tls_ctx_use_management_external_key(struct tls_root_ctx *ctx)
}
}
#if (OPENSSL_VERSION_NUMBER > 0x10100000L) && !defined(OPENSSL_NO_EC)
#if OPENSSL_VERSION_NUMBER < 0x30000000L
else if (EVP_PKEY_id(pkey) == EVP_PKEY_EC)
#else /* OPENSSL_VERSION_NUMBER < 0x30000000L */
else if (EVP_PKEY_is_a(pkey, "EC"))
#endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */
{
if (!tls_ctx_use_external_ec_key(ctx, pkey))
{
@ -2064,10 +2072,15 @@ print_cert_details(X509 *cert, char *buf, size_t buflen)
}
int typeid = EVP_PKEY_id(pkey);
#if OPENSSL_VERSION_NUMBER < 0x30000000L
bool is_ec = typeid == EVP_PKEY_EC;
#else
bool is_ec = EVP_PKEY_is_a(pkey, "EC");
#endif
#ifndef OPENSSL_NO_EC
char groupname[256];
if (typeid == EVP_PKEY_EC)
if (is_ec)
{
size_t len;
if (EVP_PKEY_get_group_name(pkey, groupname, sizeof(groupname), &len))
@ -2080,9 +2093,9 @@ print_cert_details(X509 *cert, char *buf, size_t buflen)
}
}
#endif
if (EVP_PKEY_id(pkey) != 0)
if (typeid != 0)
{
int typeid = EVP_PKEY_id(pkey);
#if OPENSSL_VERSION_NUMBER < 0x30000000L
type = OBJ_nid2sn(typeid);
/* OpenSSL reports rsaEncryption, dsaEncryption and
@ -2104,6 +2117,13 @@ print_cert_details(X509 *cert, char *buf, size_t buflen)
{
type = "unknown type";
}
#else /* OpenSSL >= 3 */
type = EVP_PKEY_get0_type_name(pkey);
if (type == NULL)
{
type = "(error getting public key type)";
}
#endif /* if OPENSSL_VERSION_NUMBER < 0x30000000L */
}
char sig[128] = { 0 };