2001-12-14 Marcus Brinkmann <marcus@g10code.de>

	* 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  <marcus@g10code.de>

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 166f6315f6b7ac18781b19b64b6524a753021467..ed32880b5d8774350db7d7aabc6d04b8beafa451 100644 (file)
--- a/gpgme/ChangeLog
+++ b/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  <marcus@g10code.de>
 

diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 366a631eed766412bfe636dfb896f880fcaa6357..073f1df3b06be1a667209657e9a0a7347316a6e9 100644 (file)
--- a/gpgme/engine-gpgsm.c
+++ b/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/gpgme/sign.c b/gpgme/sign.c
index 448381d78b0c9d2614015e9afab94a334f27e340..e31c5ad115ef8624c3dd4350057aa109d0b3a84b 100644 (file)
--- a/gpgme/sign.c
+++ b/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)