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: Add encryption and decryption support to gpgtar.

Browse source 
* tools/Makefile.am: Amend CFLAGS and LDADD.
* tools/gpgtar-create.c (gpgtar_create): Add encrypt flag and encrypt
stream if requested.
* tools/gpgtar-extract.c (gpgtar_extract): Likewise for decryption.
* tools/gpgtar-list.c (gpgtar_list): Likewise.
* tools/gpgtar.c (main): Initialize npth and assuan.  Parse recipient
and local user, and note which flags are currently ignored.  Adapt
calls to gpgtar_list and friends.
(tar_and_encrypt): Drop stub function and prototype.
(decrypt_and_untar): Likewise.
(decrypt_and_list): Likewise.
* tools/gpgtar.h (gpgtar_{create,extract,list}): Add encryption or
decryption argument.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2015-11-24 18:39:30 +01:00
parent 03bf88f32c
commit 40dbee86f3
6 changed files with 118 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tools/gpgtar-extract.c
View file

@ -28,6 +28,7 @@
#include <assert.h>
#include "i18n.h"
#include "../common/call-gpg.h"
#include "../common/sysutils.h"
#include "gpgtar.h"
@ -265,10 +266,11 @@ create_directory (const char *dirprefix)
void
gpgtar_extract (const char *filename)
gpgtar_extract (const char *filename, int decrypt)
{
gpg_error_t err;
estream_t stream;
estream_t cipher_stream = NULL;
tar_header_t header = NULL;
const char *dirprefix = NULL;
char *dirname = NULL;
@ -292,6 +294,24 @@ gpgtar_extract (const char *filename)
if (stream == es_stdin)
es_set_binary (es_stdin);
if (decrypt)
{
cipher_stream = stream;
stream = es_fopenmem (0, "rwb");
if (! stream)
{
err = gpg_error_from_syserror ();
goto leave;
}
err = gpg_decrypt_stream (NULL, NULL, cipher_stream, stream);
if (err)
goto leave;
err = es_fseek (stream, 0, SEEK_SET);
if (err)
goto leave;
}
if (filename)
{
dirprefix = strrchr (filename, '/');
@ -340,5 +360,7 @@ gpgtar_extract (const char *filename)
xfree (dirname);
if (stream != es_stdin)
es_fclose (stream);
if (stream != cipher_stream)
es_fclose (cipher_stream);
return;
}