Skip to content

[release/8.0-staging] Re-try loading ENGINE keys with a non-NULL UI_METHOD #109782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 13, 2025
Merged

[release/8.0-staging] Re-try loading ENGINE keys with a non-NULL UI_METHOD #109782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0896db
Re-try loading ENGINE keys with a non-NULL UI_METHOD
vcsjones Nov 11, 2024
136e5f3
Move include since it is REQUIRED
vcsjones Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/native/libs/System.Security.Cryptography.Native/opensslshim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <openssl/sha.h>
#include <openssl/ssl.h>
#include <openssl/tls1.h>
#include <openssl/ui.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>

Expand Down Expand Up @@ -607,6 +608,8 @@ EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
LIGHTUP_FUNCTION(SSL_verify_client_post_handshake) \
LIGHTUP_FUNCTION(SSL_set_post_handshake_auth) \
REQUIRED_FUNCTION(SSL_version) \
REQUIRED_FUNCTION(UI_create_method) \
REQUIRED_FUNCTION(UI_destroy_method) \
FALLBACK_FUNCTION(X509_check_host) \
REQUIRED_FUNCTION(X509_check_purpose) \
REQUIRED_FUNCTION(X509_cmp_current_time) \
Expand Down Expand Up @@ -1124,6 +1127,8 @@ FOR_ALL_OPENSSL_FUNCTIONS
#define SSL_set_post_handshake_auth SSL_set_post_handshake_auth_ptr
#define SSL_version SSL_version_ptr
#define TLS_method TLS_method_ptr
#define UI_create_method UI_create_method_ptr
#define UI_destroy_method UI_destroy_method_ptr
#define X509_check_host X509_check_host_ptr
#define X509_check_purpose X509_check_purpose_ptr
#define X509_cmp_current_time X509_cmp_current_time_ptr
Expand Down
19 changes: 19 additions & 0 deletions src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ static EVP_PKEY* LoadKeyFromEngine(
*haveEngine = 1;
EVP_PKEY* ret = NULL;
ENGINE* engine = NULL;
UI_METHOD* ui = NULL;

// Per https://github.com/openssl/openssl/discussions/21427
// using EVP_PKEY after freeing ENGINE is correct.
Expand All @@ -537,12 +538,30 @@ static EVP_PKEY* LoadKeyFromEngine(
{
ret = load_func(engine, keyName, NULL, NULL);

if (ret == NULL)
{
// Some engines do not tolerate having NULL passed to the ui_method parameter.
// We re-try with a non-NULL UI_METHOD.
ERR_clear_error();
ui = UI_create_method(".NET NULL UI");

if (ui)
{
ret = load_func(engine, keyName, ui, NULL);
}
}

ENGINE_finish(engine);
}

ENGINE_free(engine);
}

if (ui)
{
UI_destroy_method(ui);
}

return ret;
}

Expand Down
Loading