GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: Add sender and file name to encrypt

Browse Source 
* src/gpgme-json.c (hlp_encrypt, op_encrypt): Support sender
and file_name.
This commit is contained in:
Andre Heinecke 2018-08-23 20:49:26 +02:00
parent f62dd4bb27
commit a5f8dac77d
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gpgme-json.c
View File

@ -1607,6 +1607,8 @@ static const char hlp_encrypt[] =
"protocol: Either \"openpgp\" (default) or \"cms\".\n" "protocol: Either \"openpgp\" (default) or \"cms\".\n"
"signing_keys: Similar to the keys parameter for added signing.\n" "signing_keys: Similar to the keys parameter for added signing.\n"
" (openpgp only)" " (openpgp only)"
"file_name: The file name associated with the data.\n"
"sender: Sender info to embed in a signature.\n"
"\n" "\n"
"Optional boolean flags (default is false):\n" "Optional boolean flags (default is false):\n"
"base64: Input data is base64 encoded.\n" "base64: Input data is base64 encoded.\n"
@ -1634,12 +1636,14 @@ op_encrypt (cjson_t request, cjson_t result)
char **signing_patterns = NULL; char **signing_patterns = NULL;
int opt_mime; int opt_mime;
char *keystring = NULL; char *keystring = NULL;
char *file_name = NULL;
gpgme_data_t input = NULL; gpgme_data_t input = NULL;
gpgme_data_t output = NULL; gpgme_data_t output = NULL;
int abool; int abool;
gpgme_encrypt_flags_t encrypt_flags = 0; gpgme_encrypt_flags_t encrypt_flags = 0;
gpgme_ctx_t keylist_ctx = NULL; gpgme_ctx_t keylist_ctx = NULL;
gpgme_key_t key = NULL; gpgme_key_t key = NULL;
cjson_t j_tmp = NULL;
if ((err = get_protocol (request, &protocol))) if ((err = get_protocol (request, &protocol)))
goto leave; goto leave;
@ -1676,6 +1680,17 @@ op_encrypt (cjson_t request, cjson_t result)
if (abool) if (abool)
encrypt_flags |= GPGME_ENCRYPT_WANT_ADDRESS; encrypt_flags |= GPGME_ENCRYPT_WANT_ADDRESS;
j_tmp = cJSON_GetObjectItem (request, "file_name");
if (j_tmp && cjson_is_string (j_tmp))
{
file_name = j_tmp->valuestring;
}
j_tmp = cJSON_GetObjectItem (request, "sender");
if (j_tmp && cjson_is_string (j_tmp))
{
gpgme_set_sender (ctx, j_tmp->valuestring);
}
/* Get the keys. */ /* Get the keys. */
err = get_keys (request, "keys", &keystring); err = get_keys (request, "keys", &keystring);
@ -1724,6 +1739,10 @@ op_encrypt (cjson_t request, cjson_t result)
if (opt_mime) if (opt_mime)
gpgme_data_set_encoding (input, GPGME_DATA_ENCODING_MIME); gpgme_data_set_encoding (input, GPGME_DATA_ENCODING_MIME);
if (file_name)
{
gpgme_data_set_file_name (input, file_name);
}
/* Create an output data object. */ /* Create an output data object. */
err = gpgme_data_new (&output); err = gpgme_data_new (&output);
@ -1765,6 +1784,8 @@ op_encrypt (cjson_t request, cjson_t result)
xfree_array (signing_patterns); xfree_array (signing_patterns);
xfree (keystring); xfree (keystring);
release_onetime_context (keylist_ctx); release_onetime_context (keylist_ctx);
/* Reset sender in case the context is reused */
gpgme_set_sender (ctx, NULL);
gpgme_key_unref (key); gpgme_key_unref (key);
gpgme_signers_clear (ctx); gpgme_signers_clear (ctx);
release_context (ctx); release_context (ctx);