Add --enable-fips option. Request new gcrypt if set.

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

diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index c239f87..7510dec 100644 (file)
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2004, Christophe Saout <christophe@saout.de>
  * Copyright (C) 2004-2007, Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-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
@@ -16,7 +16,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 <stdio.h>
@@ -243,22 +243,29 @@ static void hex_key(char *hexkey, size_t key_size, const char *key)
 
 static char *get_params(struct crypt_dm_active_device *dmd)
 {
-       int r, max_size;
-       char *params, *hexkey, *features = "";
+       int r, max_size, null_cipher = 0;
+       char *params, *hexkey;
+       const char *features = "";
 
        if (dmd->flags & CRYPT_ACTIVATE_ALLOW_DISCARDS) {
                if (dm_flags() & DM_DISCARDS_SUPPORTED) {
-                       features =" 1 allow_discards";
+                       features = " 1 allow_discards";
                        log_dbg("Discard/TRIM is allowed.");
                } else
                        log_dbg("Discard/TRIM is not supported by the kernel.");
        }
 
-       hexkey = crypt_safe_alloc(dmd->vk->keylength * 2 + 1);
+       if (!strncmp(dmd->cipher, "cipher_null-", 12))
+               null_cipher = 1;
+
+       hexkey = crypt_safe_alloc(null_cipher ? 2 : (dmd->vk->keylength * 2 + 1));
        if (!hexkey)
                return NULL;
 
-       hex_key(hexkey, dmd->vk->keylength, dmd->vk->key);
+       if (null_cipher)
+               strncpy(hexkey, "-", 2);
+       else
+               hex_key(hexkey, dmd->vk->keylength, dmd->vk->key);
 
        max_size = strlen(hexkey) + strlen(dmd->cipher) +
                   strlen(dmd->device) + strlen(features) + 64;
@@ -294,6 +301,11 @@ static int _dm_simple(int task, const char *name, int udev_wait)
        if (name && !dm_task_set_name(dmt, name))
                goto out;
 
+#if HAVE_DECL_DM_TASK_RETRY_REMOVE
+       /* Used only in DM_DEVICE_REMOVE */
+       if (name && !dm_task_retry_remove(dmt))
+               goto out;
+#endif
        if (udev_wait && !_dm_task_set_cookie(dmt, &cookie, 0))
                goto out;
 
@@ -419,7 +431,6 @@ int dm_create_device(const char *name,
        struct dm_task *dmt = NULL;
        struct dm_info dmi;
        char *params = NULL;
-       char *error = NULL;
        char dev_uuid[DM_UUID_LEN] = {0};
        int r = -EINVAL;
        uint32_t read_ahead = 0;
@@ -430,7 +441,7 @@ int dm_create_device(const char *name,
        if (!params)
                goto out_no_removal;
 
-       if (type && !strncmp(type, "TEMP", 4))
+       if (dmd->flags & CRYPT_ACTIVATE_PRIVATE)
                udev_flags = CRYPT_TEMP_UDEV_FLAGS;
 
        /* All devices must have DM_UUID, only resize on old device is exception */
@@ -496,18 +507,9 @@ out:
                cookie = 0;
        }
 
-       if (r < 0 && !reload) {
-               if (get_error())
-                       error = strdup(get_error());
-
+       if (r < 0 && !reload)
                dm_remove_device(name, 0, 0);
 
-               if (error) {
-                       set_error(error);
-                       free(error);
-               }
-       }
-
 out_no_removal:
        if (cookie && _dm_use_udev())
                (void)_dm_udev_wait(cookie);