mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
d528d0b065
* g10/gpg.c (aAddRecipients, aChangeRecipients): New consts. (opts): Add --add-recipients and --change-recipients. (main): Handle them. * g10/gpg.h (struct server_control_s): Add fields modify_recipients, clear_recipients, and last_read_ctb. * g10/armor.c (was_armored): New. * g10/decrypt.c (decrypt_message): Add optional arg 'remusr'. Handle re-encryption if desired. * g10/encrypt.c (write_pubkey_enc): Factor info printing out to ... (show_encrypted_for_user_info): new. (reencrypt_to_new_recipients): New. * g10/packet.h (struct parse_packet_ctx_s): Add fields only_fookey_enc and last_ctb. (init_parse_packet): Clear them. * g10/parse-packet.c (parse): Store CTB in the context. Early return on pubkey_enc and symkey_enc packets if requested. * g10/mainproc.c (proc_encrypted): Allow for PKT being NULL. Return early in modify-recipients mode. (proc_encryption_packets): Add two optional args 'r_dek' and 'r_list'. Adjust callers. Call do_proc_packets in modify-recipients mode depending on the optional args. (do_proc_packets): Add arg 'keep_dek_and_list'. Adjust callers. Save the last read CTB in CTRL and return after the last fooenc_enc packets. -- This basically works but does not yet handle symmetric encrypted packets (symkey_enc). GnuPG-bug-id: 1825 (Yes, this is an at least 9 year old feature request)
329 lines
8.3 KiB
C
329 lines
8.3 KiB
C
/* decrypt.c - decrypt and verify data
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
|
* 2007, 2009 Free Software Foundation, Inc.
|
|
* Copyright (C) 2024 g10 Code GmbH
|
|
*
|
|
* 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 <https://www.gnu.org/licenses/>.
|
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include "gpg.h"
|
|
#include "options.h"
|
|
#include "packet.h"
|
|
#include "../common/status.h"
|
|
#include "../common/iobuf.h"
|
|
#include "keydb.h"
|
|
#include "../common/util.h"
|
|
#include "main.h"
|
|
#include "../common/status.h"
|
|
#include "../common/i18n.h"
|
|
|
|
|
|
|
|
/* Assume that the input is an encrypted message and decrypt
|
|
* (and if signed, verify the signature on) it.
|
|
* This command differs from the default operation, as it never
|
|
* writes to the filename which is included in the file and it
|
|
* rejects files which don't begin with an encrypted message.
|
|
*
|
|
* REMUSR is only used in the modify_recipients mode and speicifies
|
|
* the additional or new recipients to use.
|
|
*/
|
|
gpg_error_t
|
|
decrypt_message (ctrl_t ctrl, const char *filename, strlist_t remusr)
|
|
{
|
|
gpg_error_t err;
|
|
iobuf_t fp;
|
|
armor_filter_context_t *afx = NULL;
|
|
progress_filter_context_t *pfx;
|
|
DEK *dek = NULL;
|
|
struct pubkey_enc_list *pkenc_list = NULL;
|
|
|
|
pfx = new_progress_context ();
|
|
|
|
/* Open the message file. */
|
|
fp = iobuf_open (filename);
|
|
if (fp && is_secured_file (iobuf_get_fd (fp)))
|
|
{
|
|
iobuf_close (fp);
|
|
fp = NULL;
|
|
gpg_err_set_errno (EPERM);
|
|
}
|
|
if ( !fp )
|
|
{
|
|
err = gpg_error_from_syserror ();
|
|
log_error (_("can't open '%s': %s\n"), print_fname_stdin(filename),
|
|
gpg_strerror (err));
|
|
release_progress_context (pfx);
|
|
return err;
|
|
}
|
|
|
|
/* Push the progress filter unless we are in add recipient mode.
|
|
* The latter may also work but for now we better avoid any possible
|
|
* complications. */
|
|
if (!ctrl->modify_recipients)
|
|
handle_progress (pfx, fp, filename);
|
|
|
|
if ( !opt.no_armor )
|
|
{
|
|
if ( use_armor_filter( fp ) )
|
|
{
|
|
afx = new_armor_context ();
|
|
push_armor_filter ( afx, fp );
|
|
}
|
|
}
|
|
|
|
if (!opt.outfile)
|
|
{
|
|
opt.outfile = "-";
|
|
opt.flags.dummy_outfile = 1;
|
|
}
|
|
else
|
|
opt.flags.dummy_outfile = 0;
|
|
if (!ctrl->modify_recipients)
|
|
err = proc_encryption_packets (ctrl, NULL, fp, NULL, NULL);
|
|
else
|
|
err = proc_encryption_packets (ctrl, NULL, fp, &dek, &pkenc_list);
|
|
if (opt.flags.dummy_outfile)
|
|
opt.outfile = NULL;
|
|
|
|
if (ctrl->modify_recipients && (err || !dek) )
|
|
log_error (_("modifiying the recipients is not possible: %s\n"),
|
|
err? gpg_strerror (err) : _("decryption failed"));
|
|
else if (ctrl->modify_recipients)
|
|
{
|
|
/* We apply an armor to the output if --armor was used or if the
|
|
* input was already armored and --no-armor was not given. */
|
|
int armor = opt.armor || (was_armored (afx) && !opt.no_armor);
|
|
|
|
err = reencrypt_to_new_recipients (ctrl, armor, filename, fp,
|
|
remusr, dek, pkenc_list);
|
|
}
|
|
|
|
xfree (dek);
|
|
while (pkenc_list)
|
|
{
|
|
struct pubkey_enc_list *tmp = pkenc_list->next;
|
|
|
|
release_pubkey_enc_parts (&pkenc_list->d);
|
|
xfree (pkenc_list);
|
|
pkenc_list = tmp;
|
|
}
|
|
iobuf_close (fp);
|
|
release_armor_context (afx);
|
|
release_progress_context (pfx);
|
|
return err;
|
|
}
|
|
|
|
|
|
/* Same as decrypt_message but takes a file descriptor for input and
|
|
output. Only used by the unfinished server mode. */
|
|
gpg_error_t
|
|
decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd,
|
|
gnupg_fd_t output_fd)
|
|
{
|
|
#ifdef HAVE_W32_SYSTEM
|
|
/* No server mode yet. */
|
|
(void)ctrl;
|
|
(void)input_fd;
|
|
(void)output_fd;
|
|
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
|
#else
|
|
gpg_error_t err;
|
|
IOBUF fp;
|
|
armor_filter_context_t *afx = NULL;
|
|
progress_filter_context_t *pfx;
|
|
|
|
if (opt.outfp)
|
|
return gpg_error (GPG_ERR_BUG);
|
|
|
|
pfx = new_progress_context ();
|
|
|
|
/* Open the message file. */
|
|
fp = iobuf_fdopen_nc (input_fd, "rb");
|
|
if (fp && is_secured_file (iobuf_get_fd (fp)))
|
|
{
|
|
iobuf_close (fp);
|
|
fp = NULL;
|
|
gpg_err_set_errno (EPERM);
|
|
}
|
|
if (!fp)
|
|
{
|
|
char xname[64];
|
|
|
|
err = gpg_error_from_syserror ();
|
|
snprintf (xname, sizeof xname, "[fd %d]", input_fd);
|
|
log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err));
|
|
release_progress_context (pfx);
|
|
return err;
|
|
}
|
|
|
|
if (is_secured_file (output_fd))
|
|
{
|
|
char xname[64];
|
|
|
|
err = gpg_error (GPG_ERR_EPERM);
|
|
snprintf (xname, sizeof xname, "[fd %d]", FD_DBG (output_fd));
|
|
log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err));
|
|
iobuf_close (fp);
|
|
release_progress_context (pfx);
|
|
return err;
|
|
}
|
|
|
|
opt.outfp = open_stream_nc (output_fd, "w");
|
|
if (!opt.outfp)
|
|
{
|
|
char xname[64];
|
|
|
|
err = gpg_error_from_syserror ();
|
|
snprintf (xname, sizeof xname, "[fd %d]", FD_DBG (output_fd));
|
|
log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err));
|
|
iobuf_close (fp);
|
|
release_progress_context (pfx);
|
|
return err;
|
|
}
|
|
|
|
if (!opt.no_armor)
|
|
{
|
|
if (use_armor_filter (fp))
|
|
{
|
|
afx = new_armor_context ();
|
|
push_armor_filter ( afx, fp );
|
|
}
|
|
}
|
|
|
|
err = proc_encryption_packets (ctrl, NULL, fp, NULL, NULL);
|
|
|
|
iobuf_close (fp);
|
|
es_fclose (opt.outfp);
|
|
opt.outfp = NULL;
|
|
release_armor_context (afx);
|
|
release_progress_context (pfx);
|
|
return err;
|
|
#endif
|
|
}
|
|
|
|
|
|
void
|
|
decrypt_messages (ctrl_t ctrl, int nfiles, char *files[])
|
|
{
|
|
IOBUF fp;
|
|
progress_filter_context_t *pfx;
|
|
char *p, *output = NULL;
|
|
int rc=0,use_stdin=0;
|
|
unsigned int lno=0;
|
|
|
|
if (opt.outfile)
|
|
{
|
|
log_error(_("--output doesn't work for this command\n"));
|
|
return;
|
|
}
|
|
|
|
pfx = new_progress_context ();
|
|
|
|
if(!nfiles)
|
|
use_stdin=1;
|
|
|
|
for(;;)
|
|
{
|
|
char line[2048];
|
|
char *filename=NULL;
|
|
|
|
if(use_stdin)
|
|
{
|
|
if(fgets(line, DIM(line), stdin))
|
|
{
|
|
lno++;
|
|
if (!*line || line[strlen(line)-1] != '\n')
|
|
log_error("input line %u too long or missing LF\n", lno);
|
|
else
|
|
{
|
|
line[strlen(line)-1] = '\0';
|
|
filename=line;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if(nfiles)
|
|
{
|
|
filename=*files;
|
|
nfiles--;
|
|
files++;
|
|
}
|
|
}
|
|
|
|
if(filename==NULL)
|
|
break;
|
|
|
|
print_file_status(STATUS_FILE_START, filename, 3);
|
|
output = make_outfile_name(filename);
|
|
if (!output)
|
|
goto next_file;
|
|
fp = iobuf_open(filename);
|
|
if (fp)
|
|
iobuf_ioctl (fp, IOBUF_IOCTL_NO_CACHE, 1, NULL);
|
|
if (fp && is_secured_file (iobuf_get_fd (fp)))
|
|
{
|
|
iobuf_close (fp);
|
|
fp = NULL;
|
|
gpg_err_set_errno (EPERM);
|
|
}
|
|
if (!fp)
|
|
{
|
|
log_error(_("can't open '%s'\n"), print_fname_stdin(filename));
|
|
goto next_file;
|
|
}
|
|
|
|
handle_progress (pfx, fp, filename);
|
|
|
|
if (!opt.no_armor)
|
|
{
|
|
if (use_armor_filter(fp))
|
|
{
|
|
armor_filter_context_t *afx = new_armor_context ();
|
|
rc = push_armor_filter (afx, fp);
|
|
if (rc)
|
|
log_error("failed to push armor filter");
|
|
release_armor_context (afx);
|
|
}
|
|
}
|
|
rc = proc_packets (ctrl,NULL, fp);
|
|
iobuf_close(fp);
|
|
if (rc)
|
|
log_error("%s: decryption failed: %s\n", print_fname_stdin(filename),
|
|
gpg_strerror (rc));
|
|
p = get_last_passphrase();
|
|
set_next_passphrase(p);
|
|
xfree (p);
|
|
|
|
next_file:
|
|
/* Note that we emit file_done even after an error. */
|
|
write_status( STATUS_FILE_DONE );
|
|
xfree(output);
|
|
reset_literals_seen();
|
|
}
|
|
|
|
set_next_passphrase(NULL);
|
|
release_progress_context (pfx);
|
|
}
|