[Gpa-commits] r745 - trunk/src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-02-28 18:03:24 +0100 (Tue, 28 Feb 2006)
New Revision: 745

Modified:
   trunk/src/ChangeLog
   trunk/src/gpafileverifyop.c
Log:
2006-02-28  Marcus Brinkmann  <marcus at g10code.de>

	* gpafileverifyop.c (gpa_file_verify_operation_start): Use
	gpgme_op_decrypt_verify_start for non-detached signatures, so
	decrypted and signed files can be verified.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-02-28 16:41:22 UTC (rev 744)
+++ trunk/src/ChangeLog	2006-02-28 17:03:24 UTC (rev 745)
@@ -1,5 +1,9 @@
 2006-02-28  Marcus Brinkmann  <marcus at g10code.de>
 
+	* gpafileverifyop.c (gpa_file_verify_operation_start): Use
+	gpgme_op_decrypt_verify_start for non-detached signatures, so
+	decrypted and signed files can be verified.
+
 	* keygenwizard.c: Remove comment_page.
 	(gpa_keygen_wizard_comment_page): Function removed.
 	(gpa_keygen_wizard_generate_action): Do not free params.comment.

Modified: trunk/src/gpafileverifyop.c
===================================================================
--- trunk/src/gpafileverifyop.c	2006-02-28 16:41:22 UTC (rev 744)
+++ trunk/src/gpafileverifyop.c	2006-02-28 17:03:24 UTC (rev 745)
@@ -254,6 +254,10 @@
 	  return FALSE;
 	}
       op->plain = NULL;
+
+      /* Start the operation */
+      err = gpgme_op_verify_start (GPA_OPERATION (op)->context->ctx, op->sig,
+				   op->signed_text, op->plain);
     }
   else
     {
@@ -272,11 +276,13 @@
 	}
       op->signed_text_fd = -1;
       op->signed_text = NULL;
+
+      /* Start the operation */
+      err = gpgme_op_decrypt_verify_start (GPA_OPERATION (op)->context->ctx, op->sig,
+					   op->plain);
+
     }
 
-  /* Start the operation */
-  err = gpgme_op_verify_start (GPA_OPERATION (op)->context->ctx, op->sig,
-			       op->signed_text, op->plain);
   if (gpg_err_code (err) != GPG_ERR_NO_ERROR)
     {
       gpa_gpgme_warning (err);