morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

sbsign: rename WIN_CERTIFICATE -> WIN_CERTIFICATE_HEADER and drop trailing flexible array

Browse Source 
To allow building sbsign with -Werror=flex-array-member-not-at-end.
This commit is contained in:
Yu Watanabe
2025-04-04 01:15:19 +09:00
parent b547f3eb92
commit a8d4be01f4
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/fundamental/efi-fundamental.h
View File

@@ -36,11 +36,10 @@ typedef struct {
uint32_t dwLength;
uint16_t wRevision;
uint16_t wCertificateType;
uint8_t bCertificate[];
} WIN_CERTIFICATE;
} WIN_CERTIFICATE_HEADER;
typedef struct {
WIN_CERTIFICATE Hdr;
WIN_CERTIFICATE_HEADER Hdr;
EFI_GUID CertType;
uint8_t CertData[];
} WIN_CERTIFICATE_UEFI_GUID;

8
src/sbsign/sbsign.c
View File

@@ -669,18 +669,18 @@ static int verb_sign(int argc, char *argv[], void *userdata) {
end += n;
}
uint32_t certsz = offsetof(WIN_CERTIFICATE, bCertificate) + sigsz;
uint32_t certsz = sizeof(WIN_CERTIFICATE_HEADER) + sigsz;
n = pwrite(dstfd,
&(WIN_CERTIFICATE) {
&(WIN_CERTIFICATE_HEADER) {
.wRevision = htole16(0x200),
.wCertificateType = htole16(0x0002), /* PKCS7 signedData */
.dwLength = htole32(ROUND_UP(certsz, 8)),
},
sizeof(WIN_CERTIFICATE),
sizeof(WIN_CERTIFICATE_HEADER),
end);
if (n < 0)
return log_error_errno(errno, "Failed to write certificate header: %m");
if (n != sizeof(WIN_CERTIFICATE))
if (n != sizeof(WIN_CERTIFICATE_HEADER))
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short write while writing certificate header.");
end += n;