From 76ca869197e304daa5a8dd96ea43113ec7b28354 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 6 Apr 2016 11:34:11 +0200 Subject: Revert "g10: Support armored keyrings in gpgv." This reverts commit abb352de51bc964c06007fce43ed6f6caea87c15. --- g10/dearmor.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'g10/dearmor.c') diff --git a/g10/dearmor.c b/g10/dearmor.c index 3f1976f96..3fdd57dae 100644 --- a/g10/dearmor.c +++ b/g10/dearmor.c @@ -35,11 +35,10 @@ #include "i18n.h" /**************** - * 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. + * Take an armor file and write it out without armor */ int -dearmor_file( const char *fname, int outfd ) +dearmor_file( const char *fname ) { armor_filter_context_t *afx; IOBUF inp = NULL, out = NULL; @@ -65,7 +64,7 @@ dearmor_file( const char *fname, int outfd ) push_armor_filter ( afx, inp ); - if( (rc = open_outfile (outfd, fname, 0, 0, &out)) ) + if( (rc = open_outfile (-1, fname, 0, 0, &out)) ) goto leave; while( (c = iobuf_get(inp)) != -1 ) -- cgit v1.2.3