9eef09369b
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.
159 lines
3.6 KiB
C
159 lines
3.6 KiB
C
/* passphrase.c - Passphrase callback.
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 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. */
|
||
|
||
#if HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
#include <stdio.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <assert.h>
|
||
|
||
#include "gpgme.h"
|
||
#include "context.h"
|
||
#include "ops.h"
|
||
|
||
|
||
typedef struct
|
||
{
|
||
int no_passphrase;
|
||
char *uid_hint;
|
||
char *passphrase_info;
|
||
int bad_passphrase;
|
||
} *op_data_t;
|
||
|
||
|
||
static void
|
||
release_op_data (void *hook)
|
||
{
|
||
op_data_t opd = (op_data_t) hook;
|
||
|
||
if (opd->passphrase_info)
|
||
free (opd->passphrase_info);
|
||
if (opd->uid_hint)
|
||
free (opd->uid_hint);
|
||
}
|
||
|
||
|
||
gpgme_error_t
|
||
_gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code,
|
||
char *args)
|
||
{
|
||
gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
|
||
gpgme_error_t err;
|
||
op_data_t opd;
|
||
|
||
if (!ctx->passphrase_cb)
|
||
return 0;
|
||
|
||
err = _gpgme_op_data_lookup (ctx, OPDATA_PASSPHRASE, (void **) &opd,
|
||
sizeof (*opd), release_op_data);
|
||
if (err)
|
||
return err;
|
||
|
||
switch (code)
|
||
{
|
||
case GPGME_STATUS_USERID_HINT:
|
||
if (opd->uid_hint)
|
||
free (opd->uid_hint);
|
||
if (!(opd->uid_hint = strdup (args)))
|
||
return GPGME_Out_Of_Core;
|
||
break;
|
||
|
||
case GPGME_STATUS_BAD_PASSPHRASE:
|
||
opd->bad_passphrase++;
|
||
opd->no_passphrase = 0;
|
||
break;
|
||
|
||
case GPGME_STATUS_GOOD_PASSPHRASE:
|
||
opd->bad_passphrase = 0;
|
||
opd->no_passphrase = 0;
|
||
break;
|
||
|
||
case GPGME_STATUS_NEED_PASSPHRASE:
|
||
case GPGME_STATUS_NEED_PASSPHRASE_SYM:
|
||
if (opd->passphrase_info)
|
||
free (opd->passphrase_info);
|
||
opd->passphrase_info = strdup (args);
|
||
if (!opd->passphrase_info)
|
||
return GPGME_Out_Of_Core;
|
||
break;
|
||
|
||
case GPGME_STATUS_MISSING_PASSPHRASE:
|
||
opd->no_passphrase = 1;
|
||
break;
|
||
|
||
case GPGME_STATUS_EOF:
|
||
if (opd->no_passphrase || opd->bad_passphrase)
|
||
return GPGME_Bad_Passphrase;
|
||
break;
|
||
|
||
default:
|
||
/* Ignore all other codes. */
|
||
break;
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
|
||
gpgme_error_t
|
||
_gpgme_passphrase_command_handler_internal (void *priv,
|
||
gpgme_status_code_t code,
|
||
const char *key, int fd,
|
||
int *processed)
|
||
{
|
||
gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
|
||
gpgme_error_t err;
|
||
op_data_t opd;
|
||
|
||
assert (ctx->passphrase_cb);
|
||
|
||
err = _gpgme_op_data_lookup (ctx, OPDATA_PASSPHRASE, (void **) &opd,
|
||
sizeof (*opd), release_op_data);
|
||
if (err)
|
||
return err;
|
||
|
||
if (code == GPGME_STATUS_GET_HIDDEN && !strcmp (key, "passphrase.enter"))
|
||
{
|
||
if (processed)
|
||
processed = 1;
|
||
|
||
err = ctx->passphrase_cb (ctx->passphrase_cb_value,
|
||
opd->uid_hint, opd->passphrase_info,
|
||
opd->bad_passphrase, fd);
|
||
|
||
/* Reset bad passphrase flag, in case it is correct now. */
|
||
opd->bad_passphrase = 0;
|
||
|
||
return err;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
gpgme_error_t
|
||
_gpgme_passphrase_command_handler (void *priv, gpgme_status_code_t code,
|
||
const char *key, int fd)
|
||
{
|
||
return _gpgme_passphrase_command_handler_internal (priv, code, key, fd,
|
||
NULL);
|
||
}
|