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

To allow building sbsign with -Werror=flex-array-member-not-at-end.
2025-04-04 20:54:53 +09:00
parent b547f3eb92
commit a8d4be01f4
2 changed files with 6 additions and 7 deletions
@@ -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;