mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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 <wk@gnupg.org>
This commit is contained in:
parent
13f745b50d
commit
b0e6ab1109
18 changed files with 955 additions and 125 deletions
10
g13/server.c
10
g13/server.c
|
@ -45,8 +45,6 @@ struct server_local_s
|
|||
assuan_context_t assuan_ctx;
|
||||
|
||||
char *containername; /* Malloced active containername. */
|
||||
|
||||
strlist_t recipients; /* List of recipients. */
|
||||
};
|
||||
|
||||
|
||||
|
@ -194,7 +192,7 @@ reset_notify (assuan_context_t ctx, char *line)
|
|||
xfree (ctrl->server_local->containername);
|
||||
ctrl->server_local->containername = NULL;
|
||||
|
||||
FREE_STRLIST (ctrl->server_local->recipients);
|
||||
FREE_STRLIST (ctrl->recipients);
|
||||
|
||||
assuan_close_input_fd (ctx);
|
||||
assuan_close_output_fd (ctx);
|
||||
|
@ -372,7 +370,7 @@ cmd_recipient (assuan_context_t ctx, char *line)
|
|||
|
||||
line = skip_options (line);
|
||||
|
||||
if (!add_to_strlist_try (&ctrl->server_local->recipients, line))
|
||||
if (!add_to_strlist_try (&ctrl->recipients, line))
|
||||
err = gpg_error_from_syserror ();
|
||||
|
||||
return leave_cmd (ctx, err);
|
||||
|
@ -438,11 +436,11 @@ cmd_create (assuan_context_t ctx, char *line)
|
|||
}
|
||||
|
||||
/* Create container. */
|
||||
err = g13_create_container (ctrl, line, ctrl->server_local->recipients);
|
||||
err = g13_create_container (ctrl, line);
|
||||
|
||||
if (!err)
|
||||
{
|
||||
FREE_STRLIST (ctrl->server_local->recipients);
|
||||
FREE_STRLIST (ctrl->recipients);
|
||||
|
||||
/* Store the filename. */
|
||||
ctrl->server_local->containername = xtrystrdup (line);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue