03bcb7f4c1
2003-05-27 Marcus Brinkmann <marcus@g10code.de> * gpgme.texi (Passphrase Callback): Document new prototype. gpgme/ 2003-05-26 Marcus Brinkmann <marcus@g10code.de> * engine.h (EngineCommandHandler): Change last argument to int fd. * gpgme.h (gpgme_passphrase_cb_t): Rewritten to take parts of the description and fd. (gpgme_edit_cb_t): Change last argument to int fd. * ops.h (_gpgme_passphrase_command_handler_internal): New prototype. * passphrase.c: Include <assert.h>. (op_data_t): Rename userid_hint to uid_hint, remove last_pw_handle. (release_op_data): Check values before calling free. (_gpgme_passphrase_status_handler): Likewise. (_gpgme_passphrase_command_handler_internal): New function. (_gpgme_passphrase_command_handler): Rewritten. * edit.c (edit_status_handler): Pass -1 as fd argument. (command_handler): Update prototype. New variable processed. Use it to store return value of _gpgme_passphrase_command_handler_internal which is now used instead _gpgme_passphrase_command_handler. Use it also to check if we should call the user's edit function. Pass fd to user's edit function. * rungpg.c (struct gpg_object_s): Change type of cmd.cb_data to void *. (gpg_release): Check value before calling free. Do not release cmd.cb_data. (command_cb): Function removed. (command_handler): New function. Thus we don't use a data object for command handler stuff anymore, but handle it directly. This allows proper error reporting (cancel of passphrase requests, for example). Also all callbacks work via direct writes to the file descriptor (so that passphrases are not kept in insecure memory). (gpg_set_command_handler): Rewritten to use even more ugly hacks. (read_status): Check cmd.keyword before calling free. Install command_handler as the I/O callback handler with GPG as private data. tests/ 2003-05-27 Marcus Brinkmann <marcus@g10code.de> * (t-decrypt-verify.c, t-decrypt.c, t-edit.c, t-encrypt-sign.c, t-encrypt-sym.c, t-sign.c, t-signers.c): Include <unistd.h>. (passphrase_cb): Rewritten. * t-edit.c (edit_fnc): Rewritten.
129 lines
3.1 KiB
C
129 lines
3.1 KiB
C
/* t-decrypt.c - regression test
|
|
Copyright (C) 2000 Werner Koch (dd9jn)
|
|
Copyright (C) 2001, 2003 g10 Code 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 General Public License as published by
|
|
the Free Software Foundation; either version 2 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
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GPGME; if not, write to the Free Software Foundation,
|
|
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
|
|
#include <gpgme.h>
|
|
|
|
#define fail_if_err(err) \
|
|
do \
|
|
{ \
|
|
if (err) \
|
|
{ \
|
|
fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
|
|
__FILE__, __LINE__, gpgme_strerror (err)); \
|
|
exit (1); \
|
|
} \
|
|
} \
|
|
while (0)
|
|
|
|
|
|
static void
|
|
print_data (gpgme_data_t dh)
|
|
{
|
|
#define BUF_SIZE 512
|
|
char buf[BUF_SIZE + 1];
|
|
int ret;
|
|
|
|
ret = gpgme_data_seek (dh, 0, SEEK_SET);
|
|
if (ret)
|
|
fail_if_err (GPGME_File_Error);
|
|
while ((ret = gpgme_data_read (dh, buf, BUF_SIZE)) > 0)
|
|
fwrite (buf, ret, 1, stdout);
|
|
if (ret < 0)
|
|
fail_if_err (GPGME_File_Error);
|
|
}
|
|
|
|
|
|
static gpgme_error_t
|
|
passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
|
|
int last_was_bad, int fd)
|
|
{
|
|
write (fd, "abc\n", 4);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static char *
|
|
make_filename (const char *fname)
|
|
{
|
|
const char *srcdir = getenv ("srcdir");
|
|
char *buf;
|
|
|
|
if (!srcdir)
|
|
srcdir = ".";
|
|
buf = malloc (strlen(srcdir) + strlen(fname) + 2);
|
|
if (!buf)
|
|
{
|
|
fprintf (stderr, "%s:%d: could not allocate string: %s\n",
|
|
__FILE__, __LINE__, strerror (errno));
|
|
exit (1);
|
|
}
|
|
strcpy (buf, srcdir);
|
|
strcat (buf, "/");
|
|
strcat (buf, fname);
|
|
return buf;
|
|
}
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
gpgme_ctx_t ctx;
|
|
gpgme_error_t err;
|
|
gpgme_data_t in, out;
|
|
gpgme_decrypt_result_t result;
|
|
const char *cipher_1_asc = make_filename ("cipher-1.asc");
|
|
char *agent_info;
|
|
|
|
err = gpgme_new (&ctx);
|
|
fail_if_err (err);
|
|
|
|
agent_info = getenv("GPG_AGENT_INFO");
|
|
if (!(agent_info && strchr (agent_info, ':')))
|
|
gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
|
|
|
|
err = gpgme_data_new_from_file (&in, cipher_1_asc, 1);
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_data_new (&out);
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_op_decrypt (ctx, in, out);
|
|
fail_if_err (err);
|
|
result = gpgme_op_decrypt_result (ctx);
|
|
if (result->unsupported_algorithm)
|
|
{
|
|
fprintf (stderr, "%s:%i: unsupported algorithm: %s\n",
|
|
__FILE__, __LINE__, result->unsupported_algorithm);
|
|
exit (1);
|
|
}
|
|
print_data (out);
|
|
|
|
gpgme_data_release (in);
|
|
gpgme_data_release (out);
|
|
gpgme_release (ctx);
|
|
return 0;
|
|
}
|