security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

tools/gpgtar: Implement symmetric encryption.

Browse source 
* tests/openpgp/gpgtar.test: Add test case.
* tools/gpgtar-create.c (gpgtar_create): Pass '--symmetric' flag to
gpg.
* tools/gpgtar.c (parse_arguments): We do handle the argument now.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2015-12-01 12:01:12 +01:00
parent 45c814f348
commit 582e684a48
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/gpgtar-create.c
View file

@ -896,9 +896,16 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
if (err)
goto leave;
/* '--encrypt' may be combined with '--symmetric', but 'encrypt'
is set either way. Clear it if no recipients are specified.
XXX: Fix command handling. */
if (opt.symmetric && opt.recipients == NULL)
encrypt = 0;
argv = xtrycalloc (strlist_length (opt.gpg_arguments)
+ 2 * strlist_length (opt.recipients)
+ 1 + !!encrypt + !!sign + 2 * !!opt.user,
+ 1 + !!encrypt + !!sign + 2 * !!opt.user
+ !!opt.symmetric,
sizeof *argv);
if (argv == NULL)
{
@ -915,6 +922,8 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
argv[i++] = "--local-user";
argv[i++] = opt.user;
}
if (opt.symmetric)
argv[i++] = "--symmetric";
for (arg = opt.recipients; arg; arg = arg->next)
{
argv[i++] = "--recipient";
@ -925,7 +934,8 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
argv[i++] = NULL;
assert (i == strlist_length (opt.gpg_arguments)
+ 2 * strlist_length (opt.recipients)
+ 1 + !!encrypt + !!sign + 2 * !!opt.user);
+ 1 + !!encrypt + !!sign + 2 * !!opt.user
+ !!opt.symmetric);
err = sh_exec_tool_stream (opt.gpg_program, argv,
outstream, cipher_stream);