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.
This commit is contained in:
parent
a6cd3a1197
commit
c679ed2477
@ -1144,15 +1144,6 @@ op_decrypt (cjson_t request, cjson_t result)
|
|||||||
if (decrypt_result->is_mime)
|
if (decrypt_result->is_mime)
|
||||||
xjson_AddBoolToObject (result, "mime", 1);
|
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);
|
verify_result = gpgme_op_verify_result (ctx);
|
||||||
if (verify_result && verify_result->signatures)
|
if (verify_result && verify_result->signatures)
|
||||||
{
|
{
|
||||||
@ -1165,6 +1156,15 @@ op_decrypt (cjson_t request, cjson_t result)
|
|||||||
goto leave;
|
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:
|
leave:
|
||||||
release_context (ctx);
|
release_context (ctx);
|
||||||
gpgme_data_release (input);
|
gpgme_data_release (input);
|
||||||
|
Loading…
Reference in New Issue
Block a user