Merge branch 'veritysetup'

[platform/upstream/cryptsetup.git] / lib / loopaes / loopaes.c

diff --git a/lib/loopaes/loopaes.c b/lib/loopaes/loopaes.c
index 7fdd56c..35345eb 100644 (file)
--- a/lib/loopaes/loopaes.c
+++ b/lib/loopaes/loopaes.c
@@ -1,7 +1,7 @@
 /*
  * loop-AES compatible volume handling
  *
- * Copyright (C) 2011, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2011-2012, Red Hat, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <errno.h>
@@ -22,8 +22,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "crypto_backend.h"
+#include "libcryptsetup.h"
 #include "loopaes.h"
+#include "internal.h"
 
 static const char *get_hash(unsigned int key_size)
 {
@@ -185,22 +186,28 @@ int LOOPAES_activate(struct crypt_device *cd,
                     const char *base_cipher,
                     unsigned int keys_count,
                     struct volume_key *vk,
-                    uint64_t offset,
-                    uint64_t skip,
                     uint32_t flags)
 {
-       uint64_t size;
+       char *cipher = NULL;
        uint32_t req_flags;
-       char *cipher;
-       const char *device;
-       int read_only, r;
+       int r;
+       struct crypt_dm_active_device dmd = {
+               .target = DM_CRYPT,
+               .uuid   = crypt_get_uuid(cd),
+               .size   = 0,
+               .flags  = flags,
+               .data_device = crypt_get_device_name(cd),
+               .u.crypt  = {
+                       .cipher = NULL,
+                       .vk     = vk,
+                       .offset = crypt_get_data_offset(cd),
+                       .iv_offset = crypt_get_iv_offset(cd),
+               }
+       };
 
-       size = 0;
-       /* Initial IV (skip) is always the same as offset */
-       device = crypt_get_device_name(cd);
-       read_only = flags & CRYPT_ACTIVATE_READONLY;
 
-       r = device_check_and_adjust(cd, device, 1, &size, &offset, &read_only);
+       r = device_check_and_adjust(cd, dmd.data_device, DEV_EXCL,
+                                   &dmd.size, &dmd.u.crypt.offset, &flags);
        if (r)
                return r;
 
@@ -214,12 +221,11 @@ int LOOPAES_activate(struct crypt_device *cd,
        if (r < 0)
                return -ENOMEM;
 
-       log_dbg("Trying to activate loop-AES device %s using cipher %s.", name, cipher);
-       r = dm_create_device(name, device,
-                            cipher, CRYPT_LOOPAES,
-                            crypt_get_uuid(cd),
-                            size, skip, offset, vk->keylength, vk->key,
-                            read_only, 0);
+       dmd.u.crypt.cipher = cipher;
+       log_dbg("Trying to activate loop-AES device %s using cipher %s.",
+               name, dmd.u.crypt.cipher);
+
+       r = dm_create_device(name, CRYPT_LOOPAES, &dmd, 0);
 
        if (!r && !(dm_flags() & req_flags)) {
                log_err(cd, _("Kernel doesn't support loop-AES compatible mapping.\n"));