security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +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-05-03 04:44:12 +00:00
parent 19df6dc9e3
commit 3bcccb1666
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2007-05-02 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).
2007-04-26 Marcus Brinkmann <marcus@g10code.de> 2007-04-26 Marcus Brinkmann <marcus@g10code.de>
* passphrase.c (passphrase_to_dek): Write missing passphrase * passphrase.c (passphrase_to_dek): Write missing passphrase

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.
* *
@ -192,6 +192,7 @@ decrypt_messages(int nfiles, char *files[])
/* Note that we emit file_done even after an error. */ /* Note that we emit file_done even after an error. */
write_status( STATUS_FILE_DONE ); write_status( STATUS_FILE_DONE );
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.
* *
@ -102,6 +102,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 - OpenPGP packet definitions /* packet.h - OpenPGP 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.
* *
@ -368,6 +368,7 @@ struct notation
}; };
/*-- mainproc.c --*/ /*-- mainproc.c --*/
void reset_literals_seen(void);
int proc_packets( void *ctx, iobuf_t a ); int proc_packets( void *ctx, iobuf_t a );
int proc_signature_packets( void *ctx, iobuf_t a, int proc_signature_packets( void *ctx, iobuf_t a,
strlist_t signedfiles, const char *sigfile ); strlist_t signedfiles, const char *sigfile );

5
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.
* *
@ -178,6 +179,8 @@ verify_one_file( const char *name )
iobuf_close(fp); iobuf_close(fp);
write_status( STATUS_FILE_DONE ); write_status( STATUS_FILE_DONE );
reset_literals_seen();
leave: leave:
release_armor_context (afx); release_armor_context (afx);
release_progress_context (pfx); release_progress_context (pfx);