Add support for GPG signature enforcement on booted

[petitboot] / lib / pb-protocol / pb-protocol.c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 9091709cd095b145cd3572d345a16070ac4ad996..1560ef797fe1ed31f0e0c98bf9ad215092f44eba 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -37,6 +37,7 @@
  *    4-byte len, initrd_file
  *    4-byte len, dtb_file
  *    4-byte len, boot_args
+ *    4-byte len, args_sig_file
  *
  * action = 0x2: device remove message
  *  payload:
@@ -49,6 +50,7 @@
  *   4-byte len, initrd_file
  *   4-byte len, dtb_file
  *   4-byte len, boot_args
+ *   4-byte len, args_sig_file
  *
  */
 
@@ -72,6 +74,7 @@ void pb_protocol_dump_device(const struct device *dev, const char *text,
                fprintf(stream, "%s\t\tinit: %s\n", text, opt->initrd_file);
                fprintf(stream, "%s\t\tdtb:  %s\n", text, opt->dtb_file);
                fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args);
+               fprintf(stream, "%s\t\tasig: %s\n", text, opt->args_sig_file);
        }
 }
 
@@ -197,6 +200,7 @@ int pb_protocol_boot_option_len(const struct boot_option *opt)
                4 + optional_strlen(opt->initrd_file) +
                4 + optional_strlen(opt->dtb_file) +
                4 + optional_strlen(opt->boot_args) +
+               4 + optional_strlen(opt->args_sig_file) +
                sizeof(opt->is_default);
 }
 
@@ -206,7 +210,9 @@ int pb_protocol_boot_len(const struct boot_command *boot)
                4 + optional_strlen(boot->boot_image_file) +
                4 + optional_strlen(boot->initrd_file) +
                4 + optional_strlen(boot->dtb_file) +
-               4 + optional_strlen(boot->boot_args);
+               4 + optional_strlen(boot->boot_args) +
+               4 + optional_strlen(boot->args_sig_file) +
+               4 + optional_strlen(boot->tty);
 }
 
 int pb_protocol_boot_status_len(const struct boot_status *status)
@@ -310,6 +316,12 @@ int pb_protocol_config_len(const struct config *config)
 
        len += 4; /* allow_writes */
 
+       len += 4; /* n_tty */
+       for (i = 0; i < config->n_tty; i++)
+               len += 4 + optional_strlen(config->tty_list[i]);
+
+       len += 4 + optional_strlen(config->boot_tty);
+
        len += 4 + optional_strlen(config->lang);
 
        return len;
@@ -353,6 +365,7 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt,
        pos += pb_protocol_serialise_string(pos, opt->initrd_file);
        pos += pb_protocol_serialise_string(pos, opt->dtb_file);
        pos += pb_protocol_serialise_string(pos, opt->boot_args);
+       pos += pb_protocol_serialise_string(pos, opt->args_sig_file);
 
        *(bool *)pos = opt->is_default;
        pos += sizeof(bool);
@@ -373,6 +386,8 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot,
        pos += pb_protocol_serialise_string(pos, boot->initrd_file);
        pos += pb_protocol_serialise_string(pos, boot->dtb_file);
        pos += pb_protocol_serialise_string(pos, boot->boot_args);
+       pos += pb_protocol_serialise_string(pos, boot->args_sig_file);
+       pos += pb_protocol_serialise_string(pos, boot->tty);
 
        assert(pos <= buf + buf_len);
        (void)buf_len;
@@ -553,6 +568,13 @@ int pb_protocol_serialise_config(const struct config *config,
        *(uint32_t *)pos = config->allow_writes;
        pos += 4;
 
+       *(uint32_t *)pos = __cpu_to_be32(config->n_tty);
+       pos += 4;
+       for (i = 0; i < config->n_tty; i++)
+               pos += pb_protocol_serialise_string(pos, config->tty_list[i]);
+
+       pos += pb_protocol_serialise_string(pos, config->boot_tty);
+
        pos += pb_protocol_serialise_string(pos, config->lang);
 
        assert(pos <= buf + buf_len);
@@ -735,6 +757,9 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt,
        if (read_string(opt, &pos, &len, &opt->boot_args))
                goto out;
 
+       if (read_string(opt, &pos, &len, &opt->args_sig_file))
+               goto out;
+
        if (len < sizeof(bool))
                goto out;
        opt->is_default = *(bool *)(pos);
@@ -770,6 +795,12 @@ int pb_protocol_deserialise_boot_command(struct boot_command *cmd,
        if (read_string(cmd, &pos, &len, &cmd->boot_args))
                goto out;
 
+       if (read_string(cmd, &pos, &len, &cmd->args_sig_file))
+               goto out;
+
+       if (read_string(cmd, &pos, &len, &cmd->tty))
+               goto out;
+
        rc = 0;
 
 out:
@@ -1069,6 +1100,21 @@ int pb_protocol_deserialise_config(struct config *config,
                goto out;
        config->allow_writes = !!tmp;
 
+       if (read_u32(&pos, &len, &config->n_tty))
+               goto out;
+
+       config->tty_list = talloc_array(config, char *, config->n_tty);
+       for (i = 0; i < config->n_tty; i++) {
+               if (read_string(config->tty_list, &pos, &len, &str))
+                       goto out;
+               config->tty_list[i] = str;
+       }
+
+       if (read_string(config, &pos, &len, &str))
+               goto out;
+
+       config->boot_tty = str;
+
        if (read_string(config, &pos, &len, &str))
                goto out;