discover/grub2: Allow to separate the --id argument using a space char

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

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index b4138bbf43e6e4aa781ba5a89768499e9667c138..daf4ec9dbbde2809742897d47b89a003a385f7aa 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -99,13 +99,17 @@ int pb_protocol_serialise_string(char *pos, const char *str)
 {
        int len = 0;
 
+       if (!pos)
+               return 0;
+
        if (str)
                len = strlen(str);
 
        *(uint32_t *)pos = __cpu_to_be32(len);
        pos += sizeof(uint32_t);
 
-       memcpy(pos, str, len);
+       if (str)
+               memcpy(pos, str, len);
 
        return len + sizeof(uint32_t);
 }
@@ -394,6 +398,10 @@ int pb_protocol_authenticate_len(struct auth_message *msg)
                /* enum + password + password */
                return 4 + 4 + optional_strlen(msg->set_password.password) +
                        4 + optional_strlen(msg->set_password.new_password);
+       case AUTH_MSG_DECRYPT:
+               /* enum + password + device id */
+               return 4 + 4 + optional_strlen(msg->decrypt_dev.password) +
+                       4 + optional_strlen(msg->decrypt_dev.device_id);
        default:
                pb_log("%s: invalid input\n", __func__);
                return 0;
@@ -413,9 +421,8 @@ int pb_protocol_serialise_device(const struct device *dev,
        pos += pb_protocol_serialise_string(pos, dev->icon_file);
 
        assert(pos <= buf + buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_serialise_boot_option(const struct boot_option *opt,
@@ -443,9 +450,8 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt,
        pos += 4;
 
        assert(pos <= buf + buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_serialise_boot_command(const struct boot_command *boot,
@@ -462,9 +468,8 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot,
        pos += pb_protocol_serialise_string(pos, boot->console);
 
        assert(pos <= buf + buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_serialise_boot_status(const struct status *status,
@@ -484,9 +489,8 @@ int pb_protocol_serialise_boot_status(const struct status *status,
        pos += sizeof(bool);
 
        assert(pos <= buf + buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
@@ -557,9 +561,8 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
        pos += HWADDR_SIZE;
 
        assert(pos <= buf + buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 static int pb_protocol_serialise_config_interface(char *buf,
@@ -665,9 +668,8 @@ int pb_protocol_serialise_config(const struct config *config,
        pos += pb_protocol_serialise_string(pos, config->lang);
 
        assert(pos <= buf + buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_serialise_url(const char *url, char *buf, int buf_len)
@@ -677,9 +679,8 @@ int pb_protocol_serialise_url(const char *url, char *buf, int buf_len)
        pos += pb_protocol_serialise_string(pos, url);
 
        assert(pos <=buf+buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_serialise_plugin_option(const struct plugin_option *opt,
@@ -703,9 +704,8 @@ int pb_protocol_serialise_plugin_option(const struct plugin_option *opt,
                pos += pb_protocol_serialise_string(pos, opt->executables[i]);
 
        assert(pos <= buf + buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_serialise_temp_autoboot(const struct autoboot_option *opt,
@@ -723,9 +723,9 @@ int pb_protocol_serialise_temp_autoboot(const struct autoboot_option *opt,
                pos += pb_protocol_serialise_string(pos, opt->uuid);
        }
 
-       (void)buf_len;
+       assert(pos <= buf + buf_len);
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_serialise_authenticate(struct auth_message *msg,
@@ -750,15 +750,20 @@ int pb_protocol_serialise_authenticate(struct auth_message *msg,
                pos += pb_protocol_serialise_string(pos,
                                msg->set_password.new_password);
                break;
+       case AUTH_MSG_DECRYPT:
+               pos += pb_protocol_serialise_string(pos,
+                               msg->decrypt_dev.password);
+               pos += pb_protocol_serialise_string(pos,
+                               msg->decrypt_dev.device_id);
+               break;
        default:
                pb_log("%s: invalid msg\n", __func__);
                return -1;
        };
 
        assert(pos <= buf + buf_len);
-       (void)buf_len;
 
-       return 0;
+       return (pos <= buf + buf_len) ? 0 : -1;
 }
 
 int pb_protocol_write_message(int fd, struct pb_protocol_message *message)
@@ -938,7 +943,7 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt,
        if (read_u32(&pos, &len, &opt->type))
                return -1;
 
-       rc = 0;
+       rc = (pos <= message->payload + message->payload_len) ? 0 : -1;
 
 out:
        return rc;
@@ -1439,6 +1444,13 @@ int pb_protocol_deserialise_authenticate(struct auth_message *msg,
                                        &msg->set_password.new_password))
                        return -1;
                break;
+       case AUTH_MSG_DECRYPT:
+               if (read_string(msg, &pos, &len, &msg->decrypt_dev.password))
+                       return -1;
+               if (read_string(msg, &pos, &len,
+                                       &msg->decrypt_dev.device_id))
+                       return -1;
+               break;
        default:
                pb_log("%s: unable to parse\n", __func__);
                return -1;