Attachment 111105 Details for Bug 66396 – systemd-cryptsetup patch

[patch] systemd-cryptsetup patch

systemd_cryptsetup_luksheader_2.patch (text/plain), 3.42 KB, created by Chaser on 2014-12-21 12:16:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chaser

Created: 2014-12-21 12:16:35 UTC

Size: 3.42 KB

patch

obsolete

>--- a/src/cryptsetup/cryptsetup.c	2014-12-20 13:19:46.000000000 +0200
>+++ b/src/cryptsetup/cryptsetup.c	2014-12-21 13:50:42.145250355 +0200
>@@ -43,6 +43,7 @@
> static unsigned arg_keyfile_size = 0;
> static unsigned arg_keyfile_offset = 0;
> static char *arg_hash = NULL;
>+static char *arg_header = NULL;
> static unsigned arg_tries = 3;
> static bool arg_readonly = false;
> static bool arg_verify = false;
>@@ -136,6 +137,23 @@
>                 free(arg_hash);
>                 arg_hash = t;
> 
>+        } else if (startswith(option, "header=")) {
>+                arg_type = CRYPT_LUKS1;
>+
>+                if(!path_is_absolute(option+7)) {
>+                        log_error("Header path '%s' is not absolute.", option+7);
>+                        return -1; // fatal
>+                }
>+
>+                if(arg_header) {
>+                        log_error("Duplicate header= options");
>+                        return -1; // fatal
>+                }
>+
>+                arg_header = strdup(option+7);
>+                if (!arg_header)
>+                        return log_oom();
>+
>         } else if (startswith(option, "tries=")) {
> 
>                 if (safe_atou(option+6, &arg_tries) < 0) {
>@@ -375,6 +393,7 @@
> static int attach_luks_or_plain(struct crypt_device *cd,
>                                 const char *name,
>                                 const char *key_file,
>+                                const char *data_device,
>                                 char **passwords,
>                                 uint32_t flags) {
>         int r = 0;
>@@ -384,8 +403,16 @@
>         assert(name);
>         assert(key_file || passwords);
> 
>-        if (!arg_type || streq(arg_type, CRYPT_LUKS1))
>+        if (!arg_type || streq(arg_type, CRYPT_LUKS1)) {
>                 r = crypt_load(cd, CRYPT_LUKS1, NULL);
>+                if (r < 0) {
>+                        log_error("crypt_load() failed on device %s.\n", crypt_get_device_name(cd));
>+                        return r;
>+                }
>+
>+                if (data_device)
>+                        r = crypt_set_data_device(cd, data_device);
>+        }
> 
>         if ((!arg_type && r < 0) || streq_ptr(arg_type, CRYPT_PLAIN)) {
>                 struct crypt_params_plain params = {};
>@@ -560,6 +587,14 @@
>                 name = name_buffer ? name_buffer : argv[2];
> 
>                 k = crypt_init(&cd, argv[3]);
>+
>+                if(arg_header) {
>+                        log_debug("LUKS header: %s", arg_header);
>+                        k = crypt_init(&cd, arg_header);
>+                } else {
>+                        k = crypt_init(&cd, argv[3]);
>+                }
>+
>                 if (k) {
>                         log_error_errno(k, "crypt_init() failed: %m");
>                         goto finish;
>@@ -610,7 +645,7 @@
>                         if (streq_ptr(arg_type, CRYPT_TCRYPT))
>                                 k = attach_tcrypt(cd, argv[2], key_file, passwords, flags);
>                         else
>-                                k = attach_luks_or_plain(cd, argv[2], key_file, passwords, flags);
>+                                k = attach_luks_or_plain(cd, argv[2], key_file, ( arg_header ? argv[3] : NULL), passwords, flags);
>                         if (k >= 0)
>                                 break;
>                         else if (k == -EAGAIN) {
>@@ -661,6 +696,7 @@
> 
>         free(arg_cipher);
>         free(arg_hash);
>+        free(arg_header);
>         strv_free(arg_tcrypt_keyfiles);
> 
>         return r;

Actions: View | Splinter Review

Attachments on bug 66396: 103783 | 111105 | 111106

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.