diff options
| author | Werner Koch <wk@gnupg.org> | 2016-02-13 17:01:45 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-02-13 17:06:54 +0100 |
| commit | b0e6ab1109d05fc664f46e17d721fe9b01d38115 (patch) | |
| tree | 70cf20d908523ef099962ee90730fd053082b5cf /g13/create.h | |
| parent | g13: Improve dump_keyblob. (diff) | |
| download | gnupg2-b0e6ab1109d05fc664f46e17d721fe9b01d38115.tar.xz gnupg2-b0e6ab1109d05fc664f46e17d721fe9b01d38115.zip | |
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>
Diffstat (limited to 'g13/create.h')
| -rw-r--r-- | g13/create.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g13/create.h b/g13/create.h index cc4ddfd08..ec4224c40 100644 --- a/g13/create.h +++ b/g13/create.h @@ -20,8 +20,10 @@ #ifndef G13_CREATE_H #define G13_CREATE_H -gpg_error_t g13_create_container (ctrl_t ctrl, const char *filename, - strlist_t keys); +gpg_error_t g13_encrypt_keyblob (ctrl_t ctrl, + void *keyblob, size_t keybloblen, + void **r_encblob, size_t *r_encbloblen); +gpg_error_t g13_create_container (ctrl_t ctrl, const char *filename); #endif /*G13_CREATE_H*/ |