security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-13 18:21:03 +02:00
Code Activity

* packet.h, mainproc.c (reset_literals_seen): New function to reset

Browse Source 
the literals count.

* verify.c (verify_one_file), decrypt.c (decrypt_messages): Call it
here so we allow multiple literals in --multifile mode (in different
files - not concatenated together).
This commit is contained in:
David Shaw 2007-04-17 04:00:38 +00:00
parent 1fc3e4a299
commit 2e81dd1b98
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,5 +1,12 @@
2007-04-16 David Shaw <dshaw@jabberwocky.com> 2007-04-16 David Shaw <dshaw@jabberwocky.com>
* packet.h, mainproc.c (reset_literals_seen): New function to
reset the literals count.
* verify.c (verify_one_file), decrypt.c (decrypt_messages): Call
it here so we allow multiple literals in --multifile mode (in
different files - not concatenated together).
* gpg.c, pkclist.c: #include <strings.h> for strcasecmp if it is * gpg.c, pkclist.c: #include <strings.h> for strcasecmp if it is
present. Note that autoconf protects us against a strings.h that present. Note that autoconf protects us against a strings.h that
cannot be used together with string.h. cannot be used together with string.h.

5
g10/decrypt.c
View File

@ -1,6 +1,6 @@
/* decrypt.c - verify signed data /* decrypt.c - verify signed data
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
* 2004 Free Software Foundation, Inc. * 2007 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -185,6 +185,7 @@ decrypt_messages(int nfiles, char *files[])
write_status( STATUS_FILE_DONE ); write_status( STATUS_FILE_DONE );
iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */ iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */
xfree(output); xfree(output);
reset_literals_seen();
} }
set_next_passphrase(NULL); set_next_passphrase(NULL);

10
g10/mainproc.c
View File

@ -1,6 +1,6 @@
/* mainproc.c - handle packets /* mainproc.c - handle packets
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
* 2005, 2006 Free Software Foundation, Inc. * 2007 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -88,6 +88,12 @@ static void list_node( CTX c, KBNODE node );
static void proc_tree( CTX c, KBNODE node ); static void proc_tree( CTX c, KBNODE node );
static int literals_seen; static int literals_seen;
void
reset_literals_seen(void)
{
literals_seen=0;
}
static void static void
release_list( CTX c ) release_list( CTX c )
{ {

5
g10/packet.h
View File

@ -1,6 +1,6 @@
/* packet.h - packet definitions /* packet.h - packet definitions
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
* 2006 Free Software Foundation, Inc. * 2007 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -423,6 +423,7 @@ struct notation
}; };
/*-- mainproc.c --*/ /*-- mainproc.c --*/
void reset_literals_seen(void);
int proc_packets( void *ctx, IOBUF a ); int proc_packets( void *ctx, IOBUF a );
int proc_signature_packets( void *ctx, IOBUF a, int proc_signature_packets( void *ctx, IOBUF a,
STRLIST signedfiles, const char *sigfile ); STRLIST signedfiles, const char *sigfile );

4
g10/verify.c
View File

@ -1,5 +1,6 @@
/* verify.c - verify signed data /* verify.c - verify signed data
* Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
* 2007 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -169,6 +170,7 @@ verify_one_file( const char *name )
rc = proc_signature_packets( NULL, fp, NULL, name ); rc = proc_signature_packets( NULL, fp, NULL, name );
iobuf_close(fp); iobuf_close(fp);
write_status( STATUS_FILE_DONE ); write_status( STATUS_FILE_DONE );
reset_literals_seen();
return rc; return rc;
} }