clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: I362352dcb341658501899267c2ff3ad044ed5912
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/subprojects/libcr51sign/include/libcr51sign/cr51_image_descriptor.h b/subprojects/libcr51sign/include/libcr51sign/cr51_image_descriptor.h
index e52fb84..d1f28a5 100644
--- a/subprojects/libcr51sign/include/libcr51sign/cr51_image_descriptor.h
+++ b/subprojects/libcr51sign/include/libcr51sign/cr51_image_descriptor.h
@@ -393,10 +393,9 @@
0,
"bad payload_security_version alignment");
-_Static_assert(offsetof(struct image_mauv, version_denylist) %
- sizeof(uint64_t) ==
- 0,
- "bad denylist alignment");
+_Static_assert(
+ offsetof(struct image_mauv, version_denylist) % sizeof(uint64_t) == 0,
+ "bad denylist alignment");
// When A/B updates are enabled, SPS_EEPROM_LOCKDOWN_IMMUTABLE is invalid.
enum sps_eeprom_lockdown_status
diff --git a/subprojects/libcr51sign/include/libcr51sign/libcr51sign.h b/subprojects/libcr51sign/include/libcr51sign/libcr51sign.h
index 99936b0..e1e1ace 100644
--- a/subprojects/libcr51sign/include/libcr51sign/libcr51sign.h
+++ b/subprojects/libcr51sign/include/libcr51sign/libcr51sign.h
@@ -231,10 +231,9 @@
//
// @return nonzero on error, zero on success
-enum libcr51sign_validation_failure_reason
- libcr51sign_validate(const struct libcr51sign_ctx* ctx,
- struct libcr51sign_intf* intf,
- struct libcr51sign_validated_regions* image_regions);
+enum libcr51sign_validation_failure_reason libcr51sign_validate(
+ const struct libcr51sign_ctx* ctx, struct libcr51sign_intf* intf,
+ struct libcr51sign_validated_regions* image_regions);
// Function to convert error code to string format
// @param[in] ec - error code
@@ -249,9 +248,8 @@
//
// @return nonzero on error, zero on success
-enum libcr51sign_validation_failure_reason
- get_hash_type_from_signature(enum signature_scheme scheme,
- enum hash_type* type);
+enum libcr51sign_validation_failure_reason get_hash_type_from_signature(
+ enum signature_scheme scheme, enum hash_type* type);
#ifdef __cplusplus
} // extern "C"
diff --git a/subprojects/libcr51sign/include/libcr51sign/libcr51sign_mauv.h b/subprojects/libcr51sign/include/libcr51sign/libcr51sign_mauv.h
index 9b0e814..78ddefa 100644
--- a/subprojects/libcr51sign/include/libcr51sign/libcr51sign_mauv.h
+++ b/subprojects/libcr51sign/include/libcr51sign/libcr51sign_mauv.h
@@ -26,10 +26,9 @@
{
#endif
-failure_reason validate_payload_image_mauv(const struct libcr51sign_ctx* ctx,
- const struct libcr51sign_intf* intf,
- uint32_t payload_blob_offset,
- uint32_t payload_blob_size);
+failure_reason validate_payload_image_mauv(
+ const struct libcr51sign_ctx* ctx, const struct libcr51sign_intf* intf,
+ uint32_t payload_blob_offset, uint32_t payload_blob_size);
#ifdef __cplusplus
} // extern "C"
diff --git a/subprojects/libcr51sign/src/libcr51sign.c b/subprojects/libcr51sign/src/libcr51sign.c
index e5f5cf7..6632f8e 100644
--- a/subprojects/libcr51sign/src/libcr51sign.c
+++ b/subprojects/libcr51sign/src/libcr51sign.c
@@ -32,7 +32,7 @@
#endif
// True of x is a power of two
-#define POWER_OF_TWO(x) ((x) && !((x) & ((x)-1)))
+#define POWER_OF_TWO(x) ((x) && !((x) & ((x) - 1)))
// Maximum version supported. Major revisions are not backwards compatible.
#define MAX_MAJOR_VERSION 1
@@ -451,10 +451,9 @@
// Support validate_payload_regions_helper to remove image_regions as a required
// input.
-static failure_reason
- allocate_and_validate_payload_regions(const struct libcr51sign_ctx* ctx,
- struct libcr51sign_intf* intf,
- uint32_t d_offset)
+static failure_reason allocate_and_validate_payload_regions(
+ const struct libcr51sign_ctx* ctx, struct libcr51sign_intf* intf,
+ uint32_t d_offset)
{
struct libcr51sign_validated_regions image_regions;
return validate_payload_regions(ctx, intf, d_offset, &image_regions);
@@ -497,8 +496,8 @@
// Returns size of signature struct size in |size|
// Returns nonzero on error, zero on success
-static failure_reason get_signature_struct_size(enum signature_scheme scheme,
- uint32_t* size)
+static failure_reason
+ get_signature_struct_size(enum signature_scheme scheme, uint32_t* size)
{
switch (scheme)
{
@@ -517,8 +516,8 @@
}
}
-static failure_reason get_signature_field_offset(enum signature_scheme scheme,
- uint32_t* offset)
+static failure_reason
+ get_signature_field_offset(enum signature_scheme scheme, uint32_t* offset)
{
switch (scheme)
{
@@ -541,12 +540,10 @@
//"raw_signature_offset" with "public_key" over a SHA256/SHA512 digest of
// EEPROM area "data_offset:data_size".
-static failure_reason validate_signature(const struct libcr51sign_ctx* ctx,
- const struct libcr51sign_intf* intf,
- uint32_t data_offset,
- uint32_t data_size,
- enum signature_scheme scheme,
- uint32_t raw_signature_offset)
+static failure_reason validate_signature(
+ const struct libcr51sign_ctx* ctx, const struct libcr51sign_intf* intf,
+ uint32_t data_offset, uint32_t data_size, enum signature_scheme scheme,
+ uint32_t raw_signature_offset)
{
uint8_t signature[LIBCR51SIGN_MAX_SIGNATURE_SIZE];
uint16_t key_size;
@@ -636,11 +633,10 @@
//@param max_size Maximum size of the flash space in bytes.
//@param[out] payload_blob_offset Absolute offset of BLOB data in image
// descriptor (if BLOB data is present)
-static failure_reason
- validate_descriptor(const struct libcr51sign_ctx* ctx,
- const struct libcr51sign_intf* intf, uint32_t offset,
- uint32_t relative_offset, uint32_t max_size,
- uint32_t* const restrict payload_blob_offset)
+static failure_reason validate_descriptor(
+ const struct libcr51sign_ctx* ctx, const struct libcr51sign_intf* intf,
+ uint32_t offset, uint32_t relative_offset, uint32_t max_size,
+ uint32_t* const restrict payload_blob_offset)
{
uint32_t max_descriptor_size, signed_size, signature_scheme,
signature_offset;
@@ -854,10 +850,9 @@
//
// @return nonzero on error, zero on success
-failure_reason
- libcr51sign_validate(const struct libcr51sign_ctx* ctx,
- struct libcr51sign_intf* intf,
- struct libcr51sign_validated_regions* image_regions)
+failure_reason libcr51sign_validate(
+ const struct libcr51sign_ctx* ctx, struct libcr51sign_intf* intf,
+ struct libcr51sign_validated_regions* image_regions)
{
int rv, rv_first_desc = LIBCR51SIGN_SUCCESS;
uint32_t descriptor_offset;
diff --git a/subprojects/libcr51sign/src/libcr51sign_mauv.c b/subprojects/libcr51sign/src/libcr51sign_mauv.c
index 996260b..653a37e 100644
--- a/subprojects/libcr51sign/src/libcr51sign_mauv.c
+++ b/subprojects/libcr51sign/src/libcr51sign_mauv.c
@@ -139,8 +139,8 @@
case BLOB_TYPE_MAGIC_MAUV:
if (!found_image_mauv_data)
{
- *payload_image_mauv_data_offset = current_offset +
- sizeof(struct blob_data);
+ *payload_image_mauv_data_offset =
+ current_offset + sizeof(struct blob_data);
*payload_image_mauv_data_size =
payload_blob_data.blob_payload_size;
found_image_mauv_data = true;
@@ -447,11 +447,10 @@
// image descriptor
//
// @return `failure_reason`
-failure_reason
- validate_payload_image_mauv(const struct libcr51sign_ctx* const ctx,
- const struct libcr51sign_intf* const intf,
- const uint32_t payload_blob_offset,
- const uint32_t payload_blob_size)
+failure_reason validate_payload_image_mauv(
+ const struct libcr51sign_ctx* const ctx,
+ const struct libcr51sign_intf* const intf,
+ const uint32_t payload_blob_offset, const uint32_t payload_blob_size)
{
uint32_t payload_image_mauv_data_size = 0;
struct full_mauv payload_image_mauv_data_buffer = {0};