7659d42468
* src/gpgme.c (gpgme_set_ctx_flag): Add flags "export-session-key" and "override-session-key". (gpgme_get_ctx_flag): Ditto. (gpgme_set_export_session_keys): Remove. (gpgme_get_export_session_keys): Remove. * src/gpgme.def, src/libgpgme.vers: Remove them. * src/context.h (struct gpgme_context): Add field override_session_key. * src/decrypt-verify.c (decrypt_verify_start): Pass override_session_key value to the engine. * src/decrypt.c (decrypt_start): Ditto. * src/engine.c (_gpgme_engine_op_decrypt): Ditto. (_gpgme_engine_op_decrypt_verify): Ditto. * src/engine-backend.h (struct engine_ops): Extend DECRYPT and DECRYPT_VERIFY_START with override_session_key. * src/engine-uiserver.c (_uiserver_decrypt): Add stub arg override_session_key. (uiserver_decrypt): Ditto. (uiserver_decrypt_verify): Ditto. * src/engine-gpgsm.c (gpgsm_decrypt): Ditto. * src/engine-gpg.c (gpg_decrypt): Add arg override_session_key and set corresponding gpg option. * tests/run-decrypt.c (print_result): Print the session key if available. (main): Add options --export-session-key and --override-session-key. -- To keep the number of context manipulation functions at bay, this patches removes the just added gpgme_set_export_session_keys and gpgme_get_export_session_keys by flags for the generic context function. The patch also implements the --override-session-key feature. GnuPG-bug-id: 2754 Signed-off-by: Werner Koch <wk@gnupg.org>
215 lines
5.4 KiB
C
215 lines
5.4 KiB
C
/* run-decrypt.c - Helper to perform a verify operation
|
|
Copyright (C) 2009 g10 Code GmbH
|
|
2016 Intevation GmbH
|
|
|
|
This file is part of GPGME.
|
|
|
|
GPGME is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU Lesser General Public License as
|
|
published by the Free Software Foundation; either version 2.1 of
|
|
the License, or (at your option) any later version.
|
|
|
|
GPGME 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/* We need to include config.h so that we know whether we are building
|
|
with large file system (LFS) support. */
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include <gpgme.h>
|
|
|
|
#define PGM "run-decrypt"
|
|
|
|
#include "run-support.h"
|
|
|
|
|
|
static int verbose;
|
|
|
|
static gpg_error_t
|
|
status_cb (void *opaque, const char *keyword, const char *value)
|
|
{
|
|
(void)opaque;
|
|
fprintf (stderr, "status_cb: %s %s\n", keyword, value);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void
|
|
print_result (gpgme_decrypt_result_t result)
|
|
{
|
|
gpgme_recipient_t recp;
|
|
int count = 0;
|
|
|
|
printf ("Original file name: %s\n", nonnull(result->file_name));
|
|
printf ("Wrong key usage: %i\n", result->wrong_key_usage);
|
|
printf ("Unsupported algorithm: %s\n",
|
|
nonnull(result->unsupported_algorithm));
|
|
if (result->session_key)
|
|
printf ("Session key: %s\n", result->session_key);
|
|
|
|
for (recp = result->recipients; recp->next; recp = recp->next)
|
|
{
|
|
printf ("recipient %d\n", count++);
|
|
printf (" status ....: %s\n", gpgme_strerror (recp->status));
|
|
printf (" keyid: %s\n", nonnull (recp->keyid));
|
|
printf (" algo ...: %s\n", gpgme_pubkey_algo_name (recp->pubkey_algo));
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
show_usage (int ex)
|
|
{
|
|
fputs ("usage: " PGM " [options] FILE\n\n"
|
|
"Options:\n"
|
|
" --verbose run in verbose mode\n"
|
|
" --status print status lines from the backend\n"
|
|
" --openpgp use the OpenPGP protocol (default)\n"
|
|
" --cms use the CMS protocol\n"
|
|
" --export-session-key show the session key\n"
|
|
" --override-session-key STRING use STRING as session key\n"
|
|
, stderr);
|
|
exit (ex);
|
|
}
|
|
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
int last_argc = -1;
|
|
gpgme_error_t err;
|
|
gpgme_ctx_t ctx;
|
|
gpgme_protocol_t protocol = GPGME_PROTOCOL_OpenPGP;
|
|
FILE *fp_in = NULL;
|
|
gpgme_data_t in = NULL;
|
|
gpgme_data_t out = NULL;
|
|
gpgme_decrypt_result_t result;
|
|
int print_status = 0;
|
|
int export_session_key = 0;
|
|
const char *override_session_key = NULL;
|
|
|
|
if (argc)
|
|
{ argc--; argv++; }
|
|
|
|
while (argc && last_argc != argc )
|
|
{
|
|
last_argc = argc;
|
|
if (!strcmp (*argv, "--"))
|
|
{
|
|
argc--; argv++;
|
|
break;
|
|
}
|
|
else if (!strcmp (*argv, "--help"))
|
|
show_usage (0);
|
|
else if (!strcmp (*argv, "--verbose"))
|
|
{
|
|
verbose = 1;
|
|
argc--; argv++;
|
|
}
|
|
else if (!strcmp (*argv, "--status"))
|
|
{
|
|
print_status = 1;
|
|
argc--; argv++;
|
|
}
|
|
else if (!strcmp (*argv, "--openpgp"))
|
|
{
|
|
protocol = GPGME_PROTOCOL_OpenPGP;
|
|
argc--; argv++;
|
|
}
|
|
else if (!strcmp (*argv, "--cms"))
|
|
{
|
|
protocol = GPGME_PROTOCOL_CMS;
|
|
argc--; argv++;
|
|
}
|
|
else if (!strcmp (*argv, "--export-session-key"))
|
|
{
|
|
export_session_key = 1;
|
|
argc--; argv++;
|
|
}
|
|
else if (!strcmp (*argv, "--override-session-key"))
|
|
{
|
|
argc--; argv++;
|
|
if (!argc)
|
|
show_usage (1);
|
|
override_session_key = *argv;
|
|
argc--; argv++;
|
|
}
|
|
else if (!strncmp (*argv, "--", 2))
|
|
show_usage (1);
|
|
|
|
}
|
|
|
|
if (argc < 1 || argc > 2)
|
|
show_usage (1);
|
|
|
|
fp_in = fopen (argv[0], "rb");
|
|
if (!fp_in)
|
|
{
|
|
err = gpgme_error_from_syserror ();
|
|
fprintf (stderr, PGM ": can't open `%s': %s\n",
|
|
argv[0], gpgme_strerror (err));
|
|
exit (1);
|
|
}
|
|
|
|
init_gpgme (protocol);
|
|
|
|
err = gpgme_new (&ctx);
|
|
fail_if_err (err);
|
|
gpgme_set_protocol (ctx, protocol);
|
|
if (print_status)
|
|
{
|
|
gpgme_set_status_cb (ctx, status_cb, NULL);
|
|
gpgme_set_ctx_flag (ctx, "full-status", "1");
|
|
}
|
|
if (export_session_key)
|
|
gpgme_set_ctx_flag (ctx, "export-session-key", "1");
|
|
if (override_session_key)
|
|
gpgme_set_ctx_flag (ctx, "override-session-key", override_session_key);
|
|
|
|
err = gpgme_data_new_from_stream (&in, fp_in);
|
|
if (err)
|
|
{
|
|
fprintf (stderr, PGM ": error allocating data object: %s\n",
|
|
gpgme_strerror (err));
|
|
exit (1);
|
|
}
|
|
|
|
err = gpgme_data_new (&out);
|
|
if (err)
|
|
{
|
|
fprintf (stderr, PGM ": error allocating data object: %s\n",
|
|
gpgme_strerror (err));
|
|
exit (1);
|
|
}
|
|
|
|
err = gpgme_op_decrypt (ctx, in, out);
|
|
result = gpgme_op_decrypt_result (ctx);
|
|
if (err)
|
|
{
|
|
fprintf (stderr, PGM ": decrypt failed: %s\n", gpgme_strerror (err));
|
|
exit (1);
|
|
}
|
|
if (result) {
|
|
print_result (result);
|
|
print_data (out);
|
|
}
|
|
|
|
gpgme_data_release (out);
|
|
gpgme_data_release (in);
|
|
|
|
gpgme_release (ctx);
|
|
return 0;
|
|
}
|