commit 57940fb271deb83458b69a0393dbd28f07d48e69
author Andrew Scull <ascull@google.com> Thu Apr 08 10:29:27 2021 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Apr 09 10:31:25 2021 +0000
tree a3005856824a2de49513b747bdde9b37722c196c
parent 5c482c0eeda3c4d916f582697fdd8a59d3c275fd

Initialize DiceOpswith named initializers

To allow for smoother modifications of the DiceOps struct, use named
rather than positional initializers.

Change-Id: I04030fe05cba6db44edece57d2a207f89f522269
Reviewed-on: https://pigweed-review.googlesource.com/c/open-dice/+/40220
Reviewed-by: Darren Krahn <dkrahn@google.com>
Commit-Queue: Andrew Scull <ascull@google.com>
Pigweed-Auto-Submit: Andrew Scull <ascull@google.com>

src/dice_standalone_main.c

diff --git a/src/dice_standalone_main.c b/src/dice_standalone_main.c
index 605494f..5d68b9e 100644
--- a/src/dice_standalone_main.c
+++ b/src/dice_standalone_main.c
@@ -60,7 +60,10 @@
 int main(int argc, char** argv) {
   (void)argc;
   (void)argv;
-  const DiceOps ops = {0, FakeHash, FakeKdf, FakeCertificate, DiceClearMemory};
+  const DiceOps ops = {.hash = FakeHash,
+                       .kdf = FakeKdf,
+                       .generate_certificate = FakeCertificate,
+                       .clear_memory = DiceClearMemory};
   uint8_t cdi_buffer[DICE_CDI_SIZE];
   uint8_t cert_buffer[2048];
   size_t cert_size;

src/dice_with_boringssl_ops_main.c

diff --git a/src/dice_with_boringssl_ops_main.c b/src/dice_with_boringssl_ops_main.c
index 0be4639..3906117 100644
--- a/src/dice_with_boringssl_ops_main.c
+++ b/src/dice_with_boringssl_ops_main.c
@@ -21,8 +21,10 @@
 int main(int argc, char** argv) {
   (void)argc;
   (void)argv;
-  const DiceOps ops = {0, DiceBsslHashOp, DiceBsslKdfOp,
-                       DiceBsslGenerateCertificateOp, DiceClearMemory};
+  const DiceOps ops = {.hash = DiceBsslHashOp,
+                       .kdf = DiceBsslKdfOp,
+                       .generate_certificate = DiceBsslGenerateCertificateOp,
+                       .clear_memory = DiceClearMemory};
   uint8_t cdi_buffer[DICE_CDI_SIZE];
   uint8_t cert_buffer[2048];
   size_t cert_size;

src/dice_with_cbor_cert_main.c

diff --git a/src/dice_with_cbor_cert_main.c b/src/dice_with_cbor_cert_main.c
index ecc757f..7d59308 100644
--- a/src/dice_with_cbor_cert_main.c
+++ b/src/dice_with_cbor_cert_main.c
@@ -22,8 +22,10 @@
 int main(int argc, char** argv) {
   (void)argc;
   (void)argv;
-  const DiceOps ops = {0, DiceBsslHashOp, DiceBsslKdfOp,
-                       DiceGenerateCborCertificateOp, DiceClearMemory};
+  const DiceOps ops = {.hash = DiceBsslHashOp,
+                       .kdf = DiceBsslKdfOp,
+                       .generate_certificate = DiceGenerateCborCertificateOp,
+                       .clear_memory = DiceClearMemory};
   uint8_t cdi_buffer[DICE_CDI_SIZE];
   uint8_t cert_buffer[2048];
   size_t cert_size;

src/dice_with_cbor_template_cert_main.c

diff --git a/src/dice_with_cbor_template_cert_main.c b/src/dice_with_cbor_template_cert_main.c
index ecaea07..b54f12d 100644
--- a/src/dice_with_cbor_template_cert_main.c
+++ b/src/dice_with_cbor_template_cert_main.c
@@ -22,9 +22,11 @@
 int main(int argc, char** argv) {
   (void)argc;
   (void)argv;
-  const DiceOps ops = {0, DiceBsslHashOp, DiceBsslKdfOp,
-                       DiceGenerateCborCertificateFromTemplateOp,
-                       DiceClearMemory};
+  const DiceOps ops = {
+      .hash = DiceBsslHashOp,
+      .kdf = DiceBsslKdfOp,
+      .generate_certificate = DiceGenerateCborCertificateFromTemplateOp,
+      .clear_memory = DiceClearMemory};
   uint8_t cdi_buffer[DICE_CDI_SIZE];
   uint8_t cert_buffer[2048];
   size_t cert_size;

src/dice_with_mbedtls_ops_main.c

diff --git a/src/dice_with_mbedtls_ops_main.c b/src/dice_with_mbedtls_ops_main.c
index 60dc5d3..e130a7b 100644
--- a/src/dice_with_mbedtls_ops_main.c
+++ b/src/dice_with_mbedtls_ops_main.c
@@ -21,8 +21,10 @@
 int main(int argc, char** argv) {
   (void)argc;
   (void)argv;
-  const DiceOps ops = {0, DiceMbedtlsHashOp, DiceMbedtlsKdfOp,
-                       DiceMbedtlsGenerateCertificateOp, DiceClearMemory};
+  const DiceOps ops = {.hash = DiceMbedtlsHashOp,
+                       .kdf = DiceMbedtlsKdfOp,
+                       .generate_certificate = DiceMbedtlsGenerateCertificateOp,
+                       .clear_memory = DiceClearMemory};
   uint8_t cdi_buffer[DICE_CDI_SIZE];
   uint8_t cert_buffer[2048];
   size_t cert_size;

src/dice_with_x509_template_cert_main.c

diff --git a/src/dice_with_x509_template_cert_main.c b/src/dice_with_x509_template_cert_main.c
index d74f52e..2cc16b5 100644
--- a/src/dice_with_x509_template_cert_main.c
+++ b/src/dice_with_x509_template_cert_main.c
@@ -22,8 +22,11 @@
 int main(int argc, char** argv) {
   (void)argc;
   (void)argv;
-  const DiceOps ops = {0, DiceBsslHashOp, DiceBsslKdfOp,
-                       DiceGenerateCertificateFromTemplateOp, DiceClearMemory};
+  const DiceOps ops = {
+      .hash = DiceBsslHashOp,
+      .kdf = DiceBsslKdfOp,
+      .generate_certificate = DiceGenerateCertificateFromTemplateOp,
+      .clear_memory = DiceClearMemory};
   uint8_t cdi_buffer[DICE_CDI_SIZE];
   uint8_t cert_buffer[2048];
   size_t cert_size;