Attachment 156054 Details for Bug 242421 – proposed patch

[patch] proposed patch

e2fsprogs-1.39-luks.patch (text/plain), 1.75 KB, created by Karsten Hopp on 2007-06-04 09:23:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karsten Hopp

Created: 2007-06-04 09:23:46 UTC

Size: 1.75 KB

patch

obsolete

>--- e2fsprogs-1.39/lib/blkid/ChangeLog.luksuuid	2007-05-22 20:51:54.000000000 +0200
>+++ e2fsprogs-1.39/lib/blkid/ChangeLog	2007-05-22 20:55:08.000000000 +0200
>@@ -0,0 +1,4 @@
>+2007-05-22  Karsten Hopp  <karsten@redhat.com> 
>+
>+	* probe.c (probe_luks): Add support for cryptsetup-luks partitions
>+
>--- e2fsprogs-1.39/lib/blkid/probe.c.luksuuid	2007-05-22 14:48:12.000000000 +0200
>+++ e2fsprogs-1.39/lib/blkid/probe.c	2007-05-22 20:49:17.000000000 +0200
>@@ -468,6 +468,27 @@ static int probe_jfs(struct blkid_probe 
> 	return 0;
> }
> 
>+/* check it manually as using LUKS_read_phdr from libcryptsetup
>+ * prints too many warnings if it isn't a luks partition and would add a
>+ * dependency on the lib */
>+static int probe_luks(struct blkid_probe *probe,
>+		       struct blkid_magic *id __BLKID_ATTR((unused)), 
>+		       unsigned char *buf)
>+{
>+	unsigned char *luks_magic = "LUKS\xba\xbe";
>+	unsigned char *p_buf = buf;
>+	unsigned char uuid[40];
>+	if(strncmp(buf, luks_magic, strlen(luks_magic)) == 0)   /* ID matches, continue */
>+	{
>+	/* 168 is the offset to the 40 character uuid: http://luks.endorphin.org/LUKS-on-disk-format.pdf */
>+		p_buf += 168;
>+		strncpy(uuid, p_buf, 40);
>+		blkid_set_tag(probe->dev, "UUID", uuid, sizeof(uuid));
>+		blkid_set_tag(probe->dev, "SEC_TYPE", "crypt_LUKS", sizeof("luks"));
>+	}
>+	return 0;
>+}
>+
> static int probe_romfs(struct blkid_probe *probe,
> 		       struct blkid_magic *id __BLKID_ATTR((unused)), 
> 		       unsigned char *buf)
>@@ -775,6 +796,7 @@ static struct blkid_magic type_array[] =
>   { "ocfs2",	 2,	 0,  6,	"OCFSV2",		probe_ocfs2 },
>   { "ocfs2",	 4,	 0,  6,	"OCFSV2",		probe_ocfs2 },
>   { "ocfs2",	 8,	 0,  6,	"OCFSV2",		probe_ocfs2 },
>+  { "luks",		 0,	 0,	 6,	"LUKS\xba\xbe",			probe_luks },
>   {   NULL,	 0,	 0,  0, NULL,			NULL }
> };
>

Actions: View | Diff

Attachments on bug 242421: 156054