Parse INQUIRE_MAXLEN in the passphrase callback.
* src/passphrase.c (_gpgme_passphrase_status_handler): Parse GPGME_STATUS_INQUIRE_MAXLEN. * src/passphrase.c (_gpgme_passphrase_command_handler): Send the INQUIRE_MAXLEN status message. -- Fixes passing this status message along when decrypting symmetric data from gpg.
This commit is contained in:
parent
70b3e5964e
commit
ccbaccbf2e
@ -41,6 +41,7 @@ typedef struct
|
||||
char *uid_hint;
|
||||
char *passphrase_info;
|
||||
int bad_passphrase;
|
||||
char *maxlen;
|
||||
} *op_data_t;
|
||||
|
||||
|
||||
@ -53,6 +54,7 @@ release_op_data (void *hook)
|
||||
free (opd->passphrase_info);
|
||||
if (opd->uid_hint)
|
||||
free (opd->uid_hint);
|
||||
free (opd->maxlen);
|
||||
}
|
||||
|
||||
|
||||
@ -73,6 +75,11 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code,
|
||||
|
||||
switch (code)
|
||||
{
|
||||
case GPGME_STATUS_INQUIRE_MAXLEN:
|
||||
free (opd->maxlen);
|
||||
if (!(opd->maxlen = strdup (args)))
|
||||
return gpg_error_from_syserror ();
|
||||
break;
|
||||
case GPGME_STATUS_USERID_HINT:
|
||||
if (opd->uid_hint)
|
||||
free (opd->uid_hint);
|
||||
@ -141,6 +148,11 @@ _gpgme_passphrase_command_handler (void *priv, gpgme_status_code_t code,
|
||||
if (processed)
|
||||
*processed = 1;
|
||||
|
||||
if (ctx->status_cb && opd->maxlen)
|
||||
err = ctx->status_cb (ctx->status_cb_value, "INQUIRE_MAXLEN",
|
||||
opd->maxlen);
|
||||
|
||||
if (!err)
|
||||
err = ctx->passphrase_cb (ctx->passphrase_cb_value,
|
||||
opd->uid_hint, opd->passphrase_info,
|
||||
opd->bad_passphrase, fd);
|
||||
|
Loading…
Reference in New Issue
Block a user