Module Name: src
Committed By: rillig
Date: Tue Feb 25 20:23:19 UTC 2025
Modified Files:
src/sbin/efi: Makefile certs.c
Log Message:
efi: don't use compound expressions as initializers
Lint doesn't like them, even though GCC accepts them.
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/efi/Makefile src/sbin/efi/certs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/efi/Makefile
diff -u src/sbin/efi/Makefile:1.1 src/sbin/efi/Makefile:1.2
--- src/sbin/efi/Makefile:1.1 Mon Feb 24 13:47:55 2025
+++ src/sbin/efi/Makefile Tue Feb 25 20:23:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/02/24 13:47:55 christos Exp $
+# $NetBSD: Makefile,v 1.2 2025/02/25 20:23:19 rillig Exp $
WARNS=9
@@ -16,10 +16,6 @@ LDADD+= -lutil
PROG= efi
MAN= ${PROG}.8
-LINTFLAGS.certs.c += -X177
-LINTFLAGS.devpath3.c += -X177
-LINTFLAGS.devpath4.c += -X177
-
SRCS= main.c
SRCS+= bootvar.c
SRCS+= certs.c
Index: src/sbin/efi/certs.c
diff -u src/sbin/efi/certs.c:1.1 src/sbin/efi/certs.c:1.2
--- src/sbin/efi/certs.c:1.1 Mon Feb 24 13:47:55 2025
+++ src/sbin/efi/certs.c Tue Feb 25 20:23:19 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: certs.c,v 1.1 2025/02/24 13:47:55 christos Exp $ */
+/* $NetBSD: certs.c,v 1.2 2025/02/25 20:23:19 rillig Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: certs.c,v 1.1 2025/02/24 13:47:55 christos Exp $");
+__RCSID("$NetBSD: certs.c,v 1.2 2025/02/25 20:23:19 rillig Exp $");
#endif /* not lint */
#include <assert.h>
@@ -43,56 +43,56 @@ __RCSID("$NetBSD: certs.c,v 1.1 2025/02/
*/
#define EFI_CERT_SHA256_GUID \
- ((uuid_t){0xc1c41626,0x504c,0x4092,0xac,0xa9,\
- {0x41,0xf9,0x36,0x93,0x43,0x28}})
+ {0xc1c41626,0x504c,0x4092,0xac,0xa9,\
+ {0x41,0xf9,0x36,0x93,0x43,0x28}}
#define EFI_CERT_RSA2048_GUID \
- ((uuid_t){0x3c5766e8,0x269c,0x4e34,0xaa,0x14,\
- {0xed,0x77,0x6e,0x85,0xb3,0xb6}})
+ {0x3c5766e8,0x269c,0x4e34,0xaa,0x14,\
+ {0xed,0x77,0x6e,0x85,0xb3,0xb6}}
#define EFI_CERT_RSA2048_SHA256_GUID \
- ((uuid_t){0xe2b36190,0x879b,0x4a3d,0xad,0x8d,\
- {0xf2,0xe7,0xbb,0xa3,0x27,0x84}})
+ {0xe2b36190,0x879b,0x4a3d,0xad,0x8d,\
+ {0xf2,0xe7,0xbb,0xa3,0x27,0x84}}
#define EFI_CERT_SHA1_GUID \
- ((uuid_t){0x826ca512,0xcf10,0x4ac9,0xb1,0x87,\
- {0xbe,0x01,0x49,0x66,0x31,0xbd}})
+ {0x826ca512,0xcf10,0x4ac9,0xb1,0x87,\
+ {0xbe,0x01,0x49,0x66,0x31,0xbd}}
#define EFI_CERT_RSA2048_SHA1_GUID \
- ((uuid_t){0x67f8444f,0x8743,0x48f1,0xa3,0x28,\
- {0x1e,0xaa,0xb8,0x73,0x60,0x80}})
+ {0x67f8444f,0x8743,0x48f1,0xa3,0x28,\
+ {0x1e,0xaa,0xb8,0x73,0x60,0x80}}
#define EFI_CERT_X509_GUID \
- ((uuid_t){0xa5c059a1,0x94e4,0x4aa7,0x87,0xb5,\
- {0xab,0x15,0x5c,0x2b,0xf0,0x72}})
+ {0xa5c059a1,0x94e4,0x4aa7,0x87,0xb5,\
+ {0xab,0x15,0x5c,0x2b,0xf0,0x72}}
#define EFI_CERT_SHA224_GUID \
- ((uuid_t){0x0b6e5233,0xa65c,0x44c9,0x94,0x07,\
- {0xd9,0xab,0x83,0xbf,0xc8,0xbd}})
+ {0x0b6e5233,0xa65c,0x44c9,0x94,0x07,\
+ {0xd9,0xab,0x83,0xbf,0xc8,0xbd}}
#define EFI_CERT_SHA384_GUID \
- ((uuid_t){0xff3e5307,0x9fd0,0x48c9,0x85,0xf1,\
- {0x8a,0xd5,0x6c,0x70,0x1e,0x01}})
+ {0xff3e5307,0x9fd0,0x48c9,0x85,0xf1,\
+ {0x8a,0xd5,0x6c,0x70,0x1e,0x01}}
#define EFI_CERT_SHA512_GUID \
- ((uuid_t){0x093e0fae,0xa6c4,0x4f50,0x9f,0x1b,\
- {0xd4,0x1e,0x2b,0x89,0xc1,0x9a}})
+ {0x093e0fae,0xa6c4,0x4f50,0x9f,0x1b,\
+ {0xd4,0x1e,0x2b,0x89,0xc1,0x9a}}
#define EFI_CERT_X509_SHA256_GUID \
- ((uuid_t){0x3bd2a492,0x96c0,0x4079,0xb4,0x20,\
- {0xfc,0xf9,0x8e,0xf1,0x03,0xed}})
+ {0x3bd2a492,0x96c0,0x4079,0xb4,0x20,\
+ {0xfc,0xf9,0x8e,0xf1,0x03,0xed}}
#define EFI_CERT_X509_SHA384_GUID \
- ((uuid_t){0x7076876e,0x80c2,0x4ee6,0xaa,0xd2,\
- {0x28,0xb3,0x49,0xa6,0x86,0x5b}})
+ {0x7076876e,0x80c2,0x4ee6,0xaa,0xd2,\
+ {0x28,0xb3,0x49,0xa6,0x86,0x5b}}
#define EFI_CERT_X509_SHA512_GUID \
- ((uuid_t){0x446dbf63,0x2502,0x4cda,0xbc,0xfa,\
- {0x24,0x65,0xd2,0xb0,0xfe,0x9d}})
+ {0x446dbf63,0x2502,0x4cda,0xbc,0xfa,\
+ {0x24,0x65,0xd2,0xb0,0xfe,0x9d}}
#define EFI_CERT_EXTERNAL_MANAGEMENT_GUID \
- ((uuid_t){0x452e8ced,0xdfff,0x4b8c,0xae,0x01,\
- {0x51,0x18,0x86,0x2e,0x68,0x2c}})
+ {0x452e8ced,0xdfff,0x4b8c,0xae,0x01,\
+ {0x51,0x18,0x86,0x2e,0x68,0x2c}}
#define EFI_CERT_GUIDS \
_X(SHA256, sigfn0, 16 + 32) \
