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
32
g13/g13.c
32
g13/g13.c
|
@ -459,7 +459,7 @@ main ( int argc, char **argv)
|
|||
if (default_config)
|
||||
{
|
||||
if (parse_debug)
|
||||
log_info (_("NOTE: no default option file '%s'\n"), configname);
|
||||
log_info (_("Note: no default option file '%s'\n"), configname);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -625,6 +625,8 @@ main ( int argc, char **argv)
|
|||
/* Now that we have the options parsed we need to update the default
|
||||
control structure. */
|
||||
g13_init_default_ctrl (&ctrl);
|
||||
ctrl.recipients = recipients;
|
||||
recipients = NULL;
|
||||
|
||||
if (nogreeting)
|
||||
greeting = 0;
|
||||
|
@ -646,7 +648,7 @@ main ( int argc, char **argv)
|
|||
|
||||
for (i=0; i < argc; i++)
|
||||
if (argv[i][0] == '-' && argv[i][1] == '-')
|
||||
log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
|
||||
log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
|
||||
}
|
||||
|
||||
|
||||
|
@ -698,7 +700,7 @@ main ( int argc, char **argv)
|
|||
strlist_t sl;
|
||||
int failed = 0;
|
||||
|
||||
for (sl = recipients; sl; sl = sl->next)
|
||||
for (sl = ctrl->recipients; sl; sl = sl->next)
|
||||
if (check_encryption_key ())
|
||||
failed = 1;
|
||||
if (failed)
|
||||
|
@ -738,7 +740,7 @@ main ( int argc, char **argv)
|
|||
log_error ("server exited with error: %s <%s>\n",
|
||||
gpg_strerror (err), gpg_strsource (err));
|
||||
else
|
||||
shutdown_pending++;
|
||||
g13_request_shutdown ();
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -747,12 +749,12 @@ main ( int argc, char **argv)
|
|||
if (argc != 1)
|
||||
wrong_args ("--create filename");
|
||||
start_idle_task ();
|
||||
err = g13_create_container (&ctrl, argv[0], recipients);
|
||||
err = g13_create_container (&ctrl, argv[0]);
|
||||
if (err)
|
||||
log_error ("error creating a new container: %s <%s>\n",
|
||||
gpg_strerror (err), gpg_strsource (err));
|
||||
else
|
||||
shutdown_pending++;
|
||||
g13_request_shutdown ();
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -797,6 +799,16 @@ void
|
|||
g13_deinit_default_ctrl (ctrl_t ctrl)
|
||||
{
|
||||
call_syshelp_release (ctrl);
|
||||
FREE_STRLIST (ctrl->recipients);
|
||||
}
|
||||
|
||||
|
||||
/* Request a shutdown. This can be used when the process should
|
||||
* finish instead of running the idle task. */
|
||||
void
|
||||
g13_request_shutdown (void)
|
||||
{
|
||||
shutdown_pending++;
|
||||
}
|
||||
|
||||
|
||||
|
@ -932,9 +944,11 @@ idle_task (void *dummy_arg)
|
|||
}
|
||||
|
||||
if (ret <= 0)
|
||||
/* Interrupt or timeout. Will be handled when calculating the
|
||||
next timeout. */
|
||||
continue;
|
||||
{
|
||||
/* Interrupt or timeout. Will be handled when calculating the
|
||||
next timeout. */
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Here one would add processing of file descriptors. */
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue