From b0e6ab1109d05fc664f46e17d721fe9b01d38115 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 13 Feb 2016 17:01:45 +0100 Subject: g13: Second chunk of code to support dm-crypt. * g13/be-dmcrypt.c, g13/be-dmcrypt.h: New. * g13/Makefile.am (g13_SOURCES): Add them. * g13/backend.c: Include be-dmcrypt.h and call-syshelp.h. (no_such_backend): Rename to _no_such_backend and provide replacement macro. (be_is_supported_conttype): Support DM-Crypt. (be_take_lock_for_create): Call set_segvice for DM-Crypt. (be_create_new_keys): Make it a dummy for DM-Crypt. (be_create_container): Call be_dmcrypt_create_container. (be_mount_container): call be_dmcrypt_mount_container. * g13/g13-syshelp.c (main): Enable verbose mode. * g13/g13tuple.c (get_tupledesc_data): New. * g13/g13tuple.h (unref_tupledesc): New. * g13/g13.h (server_control_): Add field "recipients". * g13/g13.c (main): Fix setting of recipients via cmdline. (g13_deinit_default_ctrl): Release recipients list. (g13_request_shutdown): New. Replace all direct update of shutdown_pending by calls this function. * g13/server.c (server_local_s): Remove field recipients which is now part of CTRL. (reset_notify, cmd_recipient, cmd_create): Adjust for this change. * g13/create.c (encrypt_keyblob): Rename to g13_encrypt_keyblob. (g13_create_container): Support DM-Crypt. * g13/mount.c (parse_header): Allow for meta data copies. (g13_mount_container): Support DM-Crypt. * g13/sh-cmd.c (cmd_create): Make it work. (cmd_mount): New. * g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Make it work. (sh_dmcrypt_mount_container): New. -- With this patch we can now create an encrypted partition and partly mount it (i.e. setup keys and create the mapped device). We do not yet create a file system or mount that file system Signed-off-by: Werner Koch --- g13/g13-syshelp.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'g13/g13-syshelp.c') diff --git a/g13/g13-syshelp.c b/g13/g13-syshelp.c index c09a5e917..cbb5f8dbf 100644 --- a/g13/g13-syshelp.c +++ b/g13/g13-syshelp.c @@ -270,6 +270,10 @@ main ( int argc, char **argv) strerror (errno)); opt.homedir = default_homedir (); + /* Fixme: We enable verbose mode here because there is currently no + way to do this when starting g13-syshelp. To fix that we should + add a g13-syshelp.conf file in /etc/gnupg. */ + opt.verbose = 1; /* First check whether we have a debug option on the commandline. */ orig_argc = argc; -- cgit v1.2.3