From: Marcus Brinkmann Date: Fri, 14 Dec 2001 22:32:31 +0000 (+0000) Subject: 2001-12-14 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~1191 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d35eef640a094626e28ba62a8eec48cdcad4e53c;p=gpgme.git 2001-12-14 Marcus Brinkmann * engine-gpgsm.c (_gpgme_gpgsm_op_verify): Put TEXT into message_data, not SIG. (_gpgme_gpgsm_op_sign): Use `--detached', not `--detach'. * sign.c (sign_status_handler): Call _gpgme_passphrase_status_handler early. 2001-12-14 Marcus Brinkmann --- diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 166f631..ed32880 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -2,6 +2,10 @@ * engine-gpgsm.c (_gpgme_gpgsm_op_verify): Put TEXT into message_data, not SIG. + (_gpgme_gpgsm_op_sign): Use `--detached', not `--detach'. + + * sign.c (sign_status_handler): Call + _gpgme_passphrase_status_handler early. 2001-12-14 Marcus Brinkmann diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c index 366a631..073f1df 100644 --- a/trunk/gpgme/engine-gpgsm.c +++ b/trunk/gpgme/engine-gpgsm.c @@ -453,7 +453,7 @@ _gpgme_gpgsm_op_sign (GpgsmObject gpgsm, GpgmeData in, GpgmeData out, return mk_error (Invalid_Value); gpgsm->command = xtrystrdup (mode == GPGME_SIG_MODE_DETACH - ? "SIGN --detach" : "SIGN"); + ? "SIGN --detached" : "SIGN"); if (!gpgsm->command) return mk_error (Out_Of_Core); diff --git a/trunk/gpgme/sign.c b/trunk/gpgme/sign.c index 448381d..e31c5ad 100644 --- a/trunk/gpgme/sign.c +++ b/trunk/gpgme/sign.c @@ -138,6 +138,8 @@ append_xml_siginfo (GpgmeData *rdh, char *args) static void sign_status_handler (GpgmeCtx ctx, GpgStatusCode code, char *args) { + _gpgme_passphrase_status_handler (ctx, code, args); + if (ctx->out_of_core) return; if (!ctx->result.sign)