X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcryptsetup.c;h=c80572aed9672f26c0255cbac561182b21a017dc;hb=853856101be1c396afcb0ec1338774d62c863337;hp=997a61a06320f5e0d3c293153acd0f1a737ac333;hpb=260ab287953153a8b4ae13133adfdfc2b3514a46;p=elogind.git diff --git a/src/cryptsetup.c b/src/cryptsetup.c index 997a61a06..c80572aed 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -21,8 +21,10 @@ #include #include +#include #include +#include #include "log.h" #include "util.h" @@ -30,7 +32,6 @@ static const char *opt_type = NULL; /* LUKS1 or PLAIN */ static char *opt_cipher = NULL; -static char *opt_cipher_mode = NULL; static unsigned opt_key_size = 0; static char *opt_hash = NULL; static unsigned opt_tries = 0; @@ -38,6 +39,18 @@ static bool opt_readonly = false; static bool opt_verify = false; static usec_t opt_timeout = 0; +/* Options Debian's crypttab knows we don't: + + offset= + skip= + precheck= + check= + checkargs= + noearly= + loud= + keyscript= +*/ + static int parse_one_option(const char *option) { assert(option); @@ -70,15 +83,6 @@ static int parse_one_option(const char *option) { free(opt_hash); opt_hash = t; - } else if (startswith(option, "mode=")) { - char *t; - - if (!(t = strdup(option+5))) - return -ENOMEM; - - free(opt_cipher_mode); - opt_cipher_mode = t; - } else if (startswith(option, "tries=")) { if (safe_atou(option+6, &opt_tries) < 0) { @@ -137,12 +141,47 @@ static void log_glue(int level, const char *msg, void *usrptr) { log_debug("%s", msg); } +static char *disk_description(const char *path) { + struct udev *udev = NULL; + struct udev_device *device = NULL; + struct stat st; + char *description = NULL; + const char *model; + + assert(path); + + if (stat(path, &st) < 0) + return NULL; + + if (!S_ISBLK(st.st_mode)) + return NULL; + + if (!(udev = udev_new())) + return NULL; + + if (!(device = udev_device_new_from_devnum(udev, 'b', st.st_rdev))) + goto finish; + + if ((model = udev_device_get_property_value(device, "ID_MODEL_FROM_DATABASE")) || + (model = udev_device_get_property_value(device, "ID_MODEL"))) + description = strdup(model); + +finish: + if (device) + udev_device_unref(device); + + if (udev) + udev_unref(udev); + + return description; +} + int main(int argc, char *argv[]) { int r = EXIT_FAILURE; struct crypt_device *cd = NULL; - char *password = NULL; - const char *cipher = NULL, *cipher_mode = NULL, *hash = NULL; - crypt_status_info status; + char *password = NULL, *truncated_cipher = NULL; + const char *cipher = NULL, *cipher_mode = NULL, *hash = NULL, *name = NULL; + char *description = NULL; if (argc < 3) { log_error("This program requires at least two arguments."); @@ -159,13 +198,17 @@ int main(int argc, char *argv[]) { unsigned try; const char *key_file = NULL; usec_t until; + crypt_status_info status; if (argc < 4) { log_error("attach requires at least two arguments."); goto finish; } - if (argc >= 5 && argv[4][0] && !streq(argv[4], "-")) { + if (argc >= 5 && + argv[4][0] && + !streq(argv[4], "-") && + !streq(argv[4], "none")) { if (!path_is_absolute(argv[4])) log_error("Password file path %s is not absolute. Ignoring.", argv[4]); @@ -176,6 +219,12 @@ int main(int argc, char *argv[]) { if (argc >= 6 && argv[5][0] && !streq(argv[5], "-")) parse_options(argv[5]); + /* A delicious drop of snake oil */ + mlockall(MCL_FUTURE); + + description = disk_description(argv[3]); + name = description ? description : argv[2]; + if ((k = crypt_init(&cd, argv[3]))) { log_error("crypt_init() failed: %s", strerror(-k)); goto finish; @@ -197,10 +246,25 @@ int main(int argc, char *argv[]) { opt_tries = opt_tries > 0 ? opt_tries : 3; opt_key_size = (opt_key_size > 0 ? opt_key_size : 256); - cipher = opt_cipher ? opt_cipher : "aes"; - cipher_mode = opt_cipher_mode ? opt_cipher_mode : "cbc-essiv:sha256"; hash = opt_hash ? opt_hash : "ripemd160"; + if (opt_cipher) { + size_t l; + + l = strcspn(opt_cipher, "-"); + + if (!(truncated_cipher = strndup(opt_cipher, l))) { + log_error("Out of memory"); + goto finish; + } + + cipher = truncated_cipher; + cipher_mode = opt_cipher[l] ? opt_cipher+l+1 : "plain"; + } else { + cipher = "aes"; + cipher_mode = "cbc-essiv:sha256"; + } + for (try = 0; try < opt_tries; try++) { bool pass_volume_key = false; @@ -208,8 +272,17 @@ int main(int argc, char *argv[]) { password = NULL; if (!key_file) { + char *text; + + if (asprintf(&text, "Please enter passphrase for disk %s!", name) < 0) { + log_error("Out of memory"); + goto finish; + } + + k = ask_password_auto(text, "drive-harddisk", until, &password); + free(text); - if ((k = ask_password_auto("Please enter passphrase for disk:", "drive-harddisk", until, &password)) < 0) { + if (k < 0) { log_error("Failed to query password: %s", strerror(-k)); goto finish; } @@ -217,7 +290,15 @@ int main(int argc, char *argv[]) { if (opt_verify) { char *password2 = NULL; - if ((k = ask_password_auto("Please enter passphrase for disk (verification):", "drive-harddisk", until, &password2)) < 0) { + if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", name) < 0) { + log_error("Out of memory"); + goto finish; + } + + k = ask_password_auto(text, "drive-harddisk", until, &password2); + free(text); + + if (k < 0) { log_error("Failed to query verification password: %s", strerror(-k)); goto finish; } @@ -305,6 +386,7 @@ int main(int argc, char *argv[]) { if (try >= opt_tries) { log_error("Too many attempts."); r = EXIT_FAILURE; + goto finish; } } else if (streq(argv[1], "detach")) { @@ -335,10 +417,13 @@ finish: crypt_free(cd); free(opt_cipher); - free(opt_cipher_mode); free(opt_hash); + free(truncated_cipher); + free(password); + free(description); + return r; }