Merge branch 'veritysetup'

[platform/upstream/cryptsetup.git] / lib / utils_dm.h

diff --git a/lib/utils_dm.h b/lib/utils_dm.h
index 39fcf68..ea64b9e 100644 (file)
--- a/lib/utils_dm.h
+++ b/lib/utils_dm.h
@@ -39,36 +39,43 @@ struct crypt_params_verity;
 uint32_t dm_flags(void);
 
 #define DM_ACTIVE_DEVICE       (1 << 0)
-#define DM_ACTIVE_CIPHER       (1 << 1)
-#define DM_ACTIVE_UUID         (1 << 2)
-#define DM_ACTIVE_KEYSIZE      (1 << 3)
-#define DM_ACTIVE_KEY          (1 << 4)
+#define DM_ACTIVE_UUID         (1 << 1)
 
-struct crypt_dm_active_device {
-       const char *device;
-       const char *cipher;
-       const char *uuid;
+#define DM_ACTIVE_CRYPT_CIPHER (1 << 2)
+#define DM_ACTIVE_CRYPT_KEYSIZE        (1 << 3)
+#define DM_ACTIVE_CRYPT_KEY    (1 << 4)
 
-       /* Active key for device */
-       struct volume_key *vk;
+#define DM_ACTIVE_VERITY_ROOT_HASH     (1 << 5)
+#define DM_ACTIVE_VERITY_HASH_DEVICE   (1 << 6)
+#define DM_ACTIVE_VERITY_PARAMS                (1 << 7)
 
-       /* struct crypt_active_device */
-       uint64_t offset;        /* offset in sectors */
-       uint64_t iv_offset;     /* IV initilisation sector */
+struct crypt_dm_active_device {
+       enum { DM_CRYPT = 0, DM_VERITY } target;
        uint64_t size;          /* active device size */
        uint32_t flags;         /* activation flags */
-};
-
-struct crypt_dm_active_verity {
+       const char *uuid;
        const char *data_device;
-       const char *hash_device;
+       union {
+       struct {
+               const char *cipher;
 
-       const char *root_hash;
-       size_t root_hash_size;
+               /* Active key for device */
+               struct volume_key *vk;
 
-       uint64_t hash_offset;   /* hash offset (not header) */
-       uint64_t size;          /* active device size */
-       uint32_t flags;         /* activation flags */
+               /* struct crypt_active_device */
+               uint64_t offset;        /* offset in sectors */
+               uint64_t iv_offset;     /* IV initilisation sector */
+       } crypt;
+       struct {
+               const char *hash_device;
+
+               const char *root_hash;
+               uint32_t root_hash_size;
+
+               uint64_t hash_offset;   /* hash offset in blocks (not header) */
+               struct crypt_params_verity *vp;
+       } verity;
+       } u;
 };
 
 const char *dm_get_dir(void);
@@ -80,15 +87,10 @@ int dm_status_suspended(const char *name);
 int dm_status_verity_ok(const char *name);
 int dm_query_device(const char *name, uint32_t get_flags,
                    struct crypt_dm_active_device *dmd);
-int dm_query_verity(const char *name,
-                   struct crypt_dm_active_verity *dmd);
 int dm_create_device(const char *name,
                      const char *type,
                      struct crypt_dm_active_device *dmd,
                      int reload);
-int dm_create_verity(const char *name,
-                    struct crypt_params_verity *params,
-                    struct crypt_dm_active_verity *dmd);
 int dm_suspend_and_wipe_key(const char *name);
 int dm_resume_and_reinstate_key(const char *name,
                                size_t key_size,