From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 3 Sep 2025 08:40:21 +0000 (+0200)
Subject: openssl-util: make openssl_load_private_key()'s ret_ui parameter optional
X-Git-Tag: v259-rc1~490^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6db162492b33be55bcff6317a3c03ac7a3d4f36a;p=thirdparty%2Fsystemd.git

openssl-util: make openssl_load_private_key()'s ret_ui parameter optional
---

diff --git a/src/shared/openssl-util.c b/src/shared/openssl-util.c
index 4b5c495df65..8bc6c5c2d68 100644
--- a/src/shared/openssl-util.c
+++ b/src/shared/openssl-util.c
@@ -1726,13 +1726,15 @@ int openssl_load_private_key(
 
         assert(private_key);
         assert(request);
+        assert(ret_private_key);
 
         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;
 
-                *ret_user_interface = NULL;
+                if (ret_user_interface)
+                        *ret_user_interface = NULL;
         } else {
                 _cleanup_(openssl_ask_password_ui_freep) OpenSSLAskPasswordUI *ui = NULL;
                 r = openssl_ask_password_ui_new(request, &ui);
@@ -1757,7 +1759,8 @@ int openssl_load_private_key(
                                         private_key,
                                         private_key_source);
 
-                *ret_user_interface = TAKE_PTR(ui);
+                if (ret_user_interface)
+                        *ret_user_interface = TAKE_PTR(ui);
         }
 
         return 0;