[CRYPTO-LUKS v1 05/19] luks2: Add support for LUKS2 in (proc)/luks_script

[Glenn Washburn]

The sector size in bytes is added to each line and it is allowed to be 4
decimal digits long, which covers the most common cases of 512 and 4096 byte
sectors. The size allocation is updated to reflect this additional field,
allow up to 4 characters and 1 space added.

Signed-off-by: Glenn Washburn <development@efficientek.com>
---
 grub-core/disk/cryptodisk.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index c21be7d52..847337072 100644
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -1210,12 +1210,15 @@ luks_script_get (grub_size_t *sz)
   *sz = 0;
 
   for (i = cryptodisk_list; i != NULL; i = i->next)
-    if (grub_strcmp (i->modname, "luks") == 0)
+    if (grub_strcmp (i->modname, "luks") == 0 ||
+       grub_strcmp (i->modname, "luks2") == 0)
       {
-       size += sizeof ("luks_mount ");
+       size += grub_strlen (i->modname);
+       size += sizeof ("_mount");
        size += grub_strlen (i->uuid);
        size += grub_strlen (i->cipher->cipher->name);
-       size += 54;
+       /* mode + mode_iv + spaces + offset + sector size + ??? + '\n' */
+       size += 5 + 8 + 5 + 20 + 4 + 16 + 1;
        if (i->essiv_hash)
          size += grub_strlen (i->essiv_hash->name);
        size += i->keysize * 2;
@@ -1228,16 +1231,17 @@ luks_script_get (grub_size_t *sz)
   ptr = ret;
 
   for (i = cryptodisk_list; i != NULL; i = i->next)
-    if (grub_strcmp (i->modname, "luks") == 0)
+    if (grub_strcmp (i->modname, "luks") == 0 ||
+       grub_strcmp (i->modname, "luks2") == 0)
       {
        unsigned j;
        const char *iptr;
-       ptr = grub_stpcpy (ptr, "luks_mount ");
+       ptr = grub_stpcpy (ptr, i->modname);
+       ptr = grub_stpcpy (ptr, "_mount ");
        ptr = grub_stpcpy (ptr, i->uuid);
        *ptr++ = ' ';
-       grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset);
-       while (*ptr)
-         ptr++;
+       ptr += grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset);
+       ptr += grub_snprintf (ptr, 6, "%d ", 1 << i->log_sector_size);
        for (iptr = i->cipher->cipher->name; *iptr; iptr++)
          *ptr++ = grub_tolower (*iptr);
        switch (i->mode)
-- 
2.25.1