dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 06:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

openssl-util: Make ret_user_interface required output argument

Browse Source 
To avoid the argument accidentally not getting passed anymore during
refactoring, let's make it a required output argument so that callers
are required to provide it.

See 11f47cb700 and
875b568f56.
This commit is contained in:
DaanDeMeyer
2025-12-25 19:24:17 +01:00
committed by Yu Watanabe
parent f29a0b3151
commit ded0f85f7b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/shared/openssl-util.c
View File

@@ -1712,17 +1712,20 @@ int openssl_load_private_key(
int r;
/* The caller must keep the OpenSSLAskPasswordUI object alive as long as the EVP_PKEY object so that
* the user can enter any needed hardware token pin to unlock the private key when needed. */
assert(private_key);
assert(request);
assert(ret_private_key);
assert(ret_user_interface);
if (private_key_source_type == OPENSSL_KEY_SOURCE_FILE) {
r = openssl_load_private_key_from_file(private_key, ret_private_key);
if (r < 0)
return r;
if (ret_user_interface)
*ret_user_interface = NULL;
*ret_user_interface = NULL;
} else {
_cleanup_(openssl_ask_password_ui_freep) OpenSSLAskPasswordUI *ui = NULL;
r = openssl_ask_password_ui_new(request, &ui);
@@ -1747,8 +1750,7 @@ int openssl_load_private_key(
private_key,
private_key_source);
if (ret_user_interface)
*ret_user_interface = TAKE_PTR(ui);
*ret_user_interface = TAKE_PTR(ui);
}
return 0;