diff --git a/src/efivars.h b/src/efivars.h index c7ae3e3..08bfeff 100644 --- a/src/efivars.h +++ b/src/efivars.h @@ -35,8 +35,17 @@ #include #define EFI_CERT_TYPE_PKCS7_GUID \ - {0x4aafd29d, 0x68df, 0x49ee, \ - {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7}} + { 0x4aafd29d, 0x68df, 0x49ee, \ + { 0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7 } } + +#define EFI_CERT_X509_GUID \ + { 0xa5c059a1, 0x94e4, 0x4aa7, \ + { 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 } } + +#define EFI_CERT_SHA256_GUID \ + { 0xc1c41626, 0x504c, 0x4092, \ + { 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 } } + #ifndef EFI_VARIABLE_NON_VOLATILE #define EFI_VARIABLE_NON_VOLATILE 0x00000001 diff --git a/src/sbsiglist.c b/src/sbsiglist.c index 30f202f..2af577f 100644 --- a/src/sbsiglist.c +++ b/src/sbsiglist.c @@ -69,14 +69,6 @@ static struct option options[] = { { NULL, 0, NULL, 0 }, }; -#define EFI_CERT_X509_GUID \ - { 0xa5c059a1, 0x94e4, 0x4aa7, \ - { 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 } } - -#define EFI_CERT_SHA256_GUID \ - { 0xc1c41626, 0x504c, 0x4092, \ - { 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 } } - struct cert_type { const char *name; const EFI_GUID guid;