[git] GPGME - branch, master, updated. gpgme-1.11.1-17-gc679ed2

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  c679ed24778c997fee72d3613babad8680855882 (commit)
       via  a6cd3a1197eb4efea0950394959c252f24475f67 (commit)
      from  1c0a55a60847563fecf92a383457ab3576aec5d8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c679ed24778c997fee72d3613babad8680855882
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu May 24 13:36:31 2018 +0200

    json: Put signature info before data output
    
    * src/gpgme-json.c (op_decrypt): Move info before data.
    
    --
    This should enable it to first parse signatures before
    handling very large chunks of data.

diff --git a/src/gpgme-json.c b/src/gpgme-json.c
index 9b7e867..a755500 100644
--- a/src/gpgme-json.c
+++ b/src/gpgme-json.c
@@ -1144,15 +1144,6 @@ op_decrypt (cjson_t request, cjson_t result)
   if (decrypt_result->is_mime)
     xjson_AddBoolToObject (result, "mime", 1);
 
-  err = make_data_object (result, output, chunksize, "plaintext", -1);
-  output = NULL;
-
-  if (err)
-    {
-      error_object (result, "Plaintext output failed: %s", gpg_strerror (err));
-      goto leave;
-    }
-
   verify_result = gpgme_op_verify_result (ctx);
   if (verify_result && verify_result->signatures)
     {
@@ -1165,6 +1156,15 @@ op_decrypt (cjson_t request, cjson_t result)
       goto leave;
     }
 
+  err = make_data_object (result, output, chunksize, "plaintext", -1);
+  output = NULL;
+
+  if (err)
+    {
+      error_object (result, "Plaintext output failed: %s", gpg_strerror (err));
+      goto leave;
+    }
+
  leave:
   release_context (ctx);
   gpgme_data_release (input);

commit a6cd3a1197eb4efea0950394959c252f24475f67
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu May 24 13:31:15 2018 +0200

    json: Add sign to help
    
    * src/gpgme-json.c (hlp_help): Add sign.

diff --git a/src/gpgme-json.c b/src/gpgme-json.c
index e885806..9b7e867 100644
--- a/src/gpgme-json.c
+++ b/src/gpgme-json.c
@@ -1445,6 +1445,7 @@ static const char hlp_help[] =
   "help mode.  Supported values for \"op\" are:\n\n"
   "  encrypt     Encrypt data.\n"
   "  decrypt     Decrypt data.\n"
+  "  sign        Sign data.\n"
   "  getmore     Retrieve remaining data.\n"
   "  help        Help overview.";
 static gpg_error_t

-----------------------------------------------------------------------

Summary of changes:
 src/gpgme-json.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org