GRUB2: Cryptomount enhancements: Hotfix

2 files changed, 39 insertions, 0 deletions

diff --git a/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch b/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch
new file mode 100644
index 00000000..1db782c2
--- /dev/null
+++ b/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch
@@ -0,0 +1,37 @@
+From 499a25b7499305a2c86a1e2b83e8d515c821d5d0 Mon Sep 17 00:00:00 2001
+From: Klemens Nanni <contact@autoboot.org>
+Date: Tue, 15 Sep 2015 16:00:03 +0200
+Subject: [PATCH] grub-core/disk/cryptodisk.c: Point to const char
+
+---
+ grub-core/disk/cryptodisk.c | 2 +-
+ include/grub/cryptodisk.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
+index d36d16b..05b7cd7 100644
+--- a/grub-core/disk/cryptodisk.c
++++ b/grub-core/disk/cryptodisk.c
+@@ -114,7 +114,7 @@ gf_mul_be (grub_uint8_t *o, const grub_uint8_t *a, const grub_uint8_t *b)
+ }
+ 
+ int
+-grub_cryptodisk_uuidcmp(char *uuid_a, char *uuid_b)
++grub_cryptodisk_uuidcmp(const char *uuid_a, const char *uuid_b)
+ {
+   while ((*uuid_a != '\0') && (*uuid_b != '\0'))
+     {
+diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h
+index a564f2c..89263ee 100644
+--- a/include/grub/cryptodisk.h
++++ b/include/grub/cryptodisk.h
+@@ -168,5 +168,5 @@ grub_cryptodisk_t grub_cryptodisk_create (grub_disk_t disk, char *uuid,
+ 				   char *ciphername, char *ciphermode, char *digest);
+ 
+ int
+-grub_cryptodisk_uuidcmp(char *uuid_a, char *uuid_b);
++grub_cryptodisk_uuidcmp(const char *uuid_a, const char *uuid_b);
+ #endif
+-- 
+2.5.1
+
diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub
index 7a7b1727..66fd68b7 100755
--- a/resources/scripts/helpers/download/grub
+++ b/resources/scripts/helpers/download/grub
@@ -55,6 +55,8 @@ git am "../resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-fi
 git am "../resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch"
 git am "../resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch"
 git am "../resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch"
+# hotfix from kl3 (merged from autoboot)
+git am "../resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch"
 
 cd "../"
 printf "\n\n"