]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bootctl-install: Use i2d_PKCS7() instead of i2d_PKCS7_SIGNED()
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 25 Feb 2025 07:32:33 +0000 (08:32 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 25 Feb 2025 09:49:53 +0000 (09:49 +0000)
For a detached signature, these are equivalent so let's use i2d_PKCS7()
like we do everywhere else.

src/bootctl/bootctl-install.c

index 884521bcfa9513fcf22636ff177c191c8cec2952..4171e4aeee05aeaf0f05ca217bc8349f656916b5 100644 (file)
@@ -683,7 +683,7 @@ static int install_secure_boot_auto_enroll(const char *esp, X509 *certificate, E
                                                ERR_error_string(ERR_get_error(), NULL));
 
                 _cleanup_free_ uint8_t *sig = NULL;
-                int sigsz = i2d_PKCS7_SIGNED(p7->d.sign, &sig);
+                int sigsz = i2d_PKCS7(p7, &sig);
                 if (sigsz < 0)
                         return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to convert PKCS7 signature to DER: %s",
                                                ERR_error_string(ERR_get_error(), NULL));