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

g10: Support armored keyrings in gpgv.

Browse source 
* doc/gpgv.texi: Document the feature.
* g10/Makefile.am (gpgv2_SOURCES): Add dearmor.c.
* g10/dearmor.c (dearmor_file): Add sink argument.
* g10/gpg.c (main): Adapt accordingly.
* g10/gpgv.c (make_temp_dir): New function.
(main): De-armor keyrings.
* g10/main.h (dearmor_file): Adapt prototype.

GnuPG-bug-id: 2290
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-04-04 17:05:50 +02:00
parent dd5902cc45
commit abb352de51
6 changed files with 137 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
g10/dearmor.c
View file

@ -35,10 +35,11 @@
#include "i18n.h"
/****************
* Take an armor file and write it out without armor
* Take an armor file and write it out without armor. If outfd is not
* -1, the output will be written to the given file descriptor.
*/
int
dearmor_file( const char *fname )
dearmor_file( const char *fname, int outfd )
{
armor_filter_context_t *afx;
IOBUF inp = NULL, out = NULL;
@ -64,7 +65,7 @@ dearmor_file( const char *fname )
push_armor_filter ( afx, inp );
if( (rc = open_outfile (-1, fname, 0, 0, &out)) )
if( (rc = open_outfile (outfd, fname, 0, 0, &out)) )
goto leave;
while( (c = iobuf_get(inp)) != -1 )