mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
f7968db30b
* g13/g13.c (aSuspend, aResume): New. (opts): Add commands --suspend and --resume. (main): Implement dummy command aUmount. Implement commands aResume and aSuspend. * g13/sh-cmd.c (cmd_suspend): New. (cmd_resume): New. (register_commands): Add commands RESUME and SUSPEND. * g13/server.c (cmd_suspend): New. (cmd_resume): New. (register_commands): Add commands RESUME and SUSPEND. * g13/be-dmcrypt.c (be_dmcrypt_suspend_container): New. (be_dmcrypt_resume_container): New. * g13/backend.c (be_suspend_container): New. (be_resume_container): New. * g13/suspend.c, g13/suspend.h: New. * g13/mount.c (parse_header, read_keyblob_prefix, read_keyblob) (decrypt_keyblob, g13_is_container): Move to ... * g13/keyblob.c: new file. (keyblob_read): Rename to g13_keyblob_read and make global. (keyblob_decrypt): Rename to g13_keyblob_decrypt and make global. * g13/sh-dmcrypt.c (check_blockdev): Add arg expect_busy. (sh_dmcrypt_suspend_container): New. (sh_dmcrypt_resume_container): New. * g13/call-syshelp.c (call_syshelp_run_suspend): New. (call_syshelp_run_resume): New. -- The --suspend command can be used before a hibernate operation to make the encrypted partition inaccessible and wipe the key from the memory. Before --suspend is called a sync(1) should be run to make sure that their are no dirty buffers (dmsetup, as called by g13, actually does this for you but it does not harm to do it anyway. After the partition has been suspended a echo 3 >proc/sys/vm/drop_caches required to flush all caches which may still have content from the encrypted partition. The --resume command reverses the effect of the suspend but to do this it needs to decrypt again. Now, if the .gnupg directory lives on the encrypted partition this will be problematic because due to the suspend all processes accessing data on the encrypted partition will be put into an uninterruptible sleep (ps(1) shows a state of 'D'). This needs to be avoided. A workaround is to have a separate GnuPG home directory (say, "~/.gnupg-fallback") with only the public keys required to decrypt the partition along with a properly setup conf files. A GNUPGHOME=$(pwd)/.gnupg-fallback g13 --resume should then be able to resume the encrypted partition using the private key stored on a smartcard. The implementation is pretty basic right now but useful to me. Signed-off-by: Werner Koch <wk@gnupg.org>
100 lines
2.4 KiB
C
100 lines
2.4 KiB
C
/* be-dmcrypt.c - The DM-Crypt based backend
|
|
* Copyright (C) 2015 Werner Koch
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
|
|
#include "g13.h"
|
|
#include "i18n.h"
|
|
#include "keyblob.h"
|
|
#include "call-syshelp.h"
|
|
#include "be-dmcrypt.h"
|
|
|
|
|
|
/* Create the container using the current device.
|
|
* information in TUPLES. */
|
|
gpg_error_t
|
|
be_dmcrypt_create_container (ctrl_t ctrl)
|
|
{
|
|
gpg_error_t err;
|
|
|
|
err = call_syshelp_run_create (ctrl, CONTTYPE_DM_CRYPT);
|
|
|
|
return err;
|
|
}
|
|
|
|
|
|
/* Mount the container described by the filename FNAME and the keyblob
|
|
* information in TUPLES. On success the runner id is stored at R_ID. */
|
|
gpg_error_t
|
|
be_dmcrypt_mount_container (ctrl_t ctrl,
|
|
const char *fname, const char *mountpoint,
|
|
tupledesc_t tuples)
|
|
{
|
|
gpg_error_t err;
|
|
|
|
err = call_syshelp_set_device (ctrl, fname);
|
|
if (err)
|
|
goto leave;
|
|
|
|
err = call_syshelp_run_mount (ctrl, CONTTYPE_DM_CRYPT, mountpoint, tuples);
|
|
|
|
leave:
|
|
return err;
|
|
}
|
|
|
|
|
|
/* Suspend the container described by the filename FNAME. */
|
|
gpg_error_t
|
|
be_dmcrypt_suspend_container (ctrl_t ctrl, const char *fname)
|
|
{
|
|
gpg_error_t err;
|
|
|
|
err = call_syshelp_set_device (ctrl, fname);
|
|
if (err)
|
|
goto leave;
|
|
|
|
err = call_syshelp_run_suspend (ctrl, CONTTYPE_DM_CRYPT);
|
|
|
|
leave:
|
|
return err;
|
|
}
|
|
|
|
|
|
/* Resume the container described by the filename FNAME and the keyblob
|
|
* information in TUPLES. */
|
|
gpg_error_t
|
|
be_dmcrypt_resume_container (ctrl_t ctrl, const char *fname, tupledesc_t tuples)
|
|
{
|
|
gpg_error_t err;
|
|
|
|
err = call_syshelp_set_device (ctrl, fname);
|
|
if (err)
|
|
goto leave;
|
|
|
|
err = call_syshelp_run_resume (ctrl, CONTTYPE_DM_CRYPT, tuples);
|
|
|
|
leave:
|
|
return err;
|
|
}
|