diff options
Diffstat (limited to '0005-Cryptomount-support-for-hyphens-in-UUID.patch')
| -rw-r--r-- | 0005-Cryptomount-support-for-hyphens-in-UUID.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/0005-Cryptomount-support-for-hyphens-in-UUID.patch b/0005-Cryptomount-support-for-hyphens-in-UUID.patch index f6ed18a66d7b..b875f66ea3ce 100644 --- a/0005-Cryptomount-support-for-hyphens-in-UUID.patch +++ b/0005-Cryptomount-support-for-hyphens-in-UUID.patch @@ -58,39 +58,6 @@ diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c index 4ebe21b4e..80a760670 100644 --- a/grub-core/disk/luks.c +++ b/grub-core/disk/luks.c -@@ -68,9 +68,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, - int check_boot, grub_file_t hdr) - { - grub_cryptodisk_t newdev; -- const char *iptr; - struct grub_luks_phdr header; -- char *optr; - char uuid[sizeof (header.uuid) + 1]; - char ciphername[sizeof (header.cipherName) + 1]; - char ciphermode[sizeof (header.cipherMode) + 1]; -@@ -104,22 +102,6 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, - || grub_be_to_cpu16 (header.version) != 1) - return NULL; - -- optr = uuid; -- for (iptr = header.uuid; iptr < &header.uuid[ARRAY_SIZE (header.uuid)]; -- iptr++) -- { -- if (*iptr != '-') -- *optr++ = *iptr; -- } -- *optr = 0; -- -- if (check_uuid && grub_strcasecmp (check_uuid, uuid) != 0) -- { -- grub_dprintf ("luks", "%s != %s\n", uuid, check_uuid); -- return NULL; -- } -- -- - /* Make sure that strings are null terminated. */ - grub_memcpy (ciphername, header.cipherName, sizeof (header.cipherName)); - ciphername[sizeof (header.cipherName)] = 0; @@ -127,6 +109,14 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid, ciphermode[sizeof (header.cipherMode)] = 0; grub_memcpy (hashspec, header.hashSpec, sizeof (header.hashSpec)); |