From e382a7eaded3ec6b38114988ae9b0723bb48002a Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 21 Jun 2007 13:43:33 -0400 Subject: [PATCH] Add support for LUKS encrypted partitions This patch adds support for cryptsetup-luks (http://luks.endorphin.org) UUIDs to libblkid. This is required p.e. to avoid hardcoding device names for encrypted partitions. Could you please take a look at it and consider inclusion in the next e2fsprogs release ? Signed-off-by: Karsten Hopp --- lib/blkid/ChangeLog | 4 ++++ lib/blkid/probe.c | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index d2de7b9..a4b469b 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,7 @@ +2007-05-22 Karsten Hopp + + * probe.c (probe_luks): Add support for cryptsetup-luks partitions + 2007-06-19 Theodore Tso * probe.c (probe_ntfs): Add probe function which is more paranoid diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 211c8bd..0a1d8db 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -575,6 +575,18 @@ static int probe_jfs(struct blkid_probe *probe, return 0; } +static int probe_luks(struct blkid_probe *probe, + struct blkid_magic *id __BLKID_ATTR((unused)), + unsigned char *buf) +{ + unsigned char uuid[40]; + /* 168 is the offset to the 40 character uuid: + * http://luks.endorphin.org/LUKS-on-disk-format.pdf */ + strncpy(uuid, buf+168, 40); + blkid_set_tag(probe->dev, "UUID", uuid, sizeof(uuid)); + return 0; +} + static int probe_romfs(struct blkid_probe *probe, struct blkid_magic *id __BLKID_ATTR((unused)), unsigned char *buf) @@ -882,6 +894,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 }, + { "crypt_LUKS", 0, 0, 6, "LUKS\xba\xbe", probe_luks }, { NULL, 0, 0, 0, NULL, NULL } }; -- 1.8.3.1