diff options
| author | David Shaw <[email protected]> | 2004-08-08 13:28:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-08-08 13:28:04 +0000 |
| commit | 5d98f7afe503b10ad2d4d4d11d510b58fb001268 (patch) | |
| tree | 2863ec1f38f48a3252bd1340902d958a637cb950 /g10/sign.c | |
| parent | * gpg.sgml: Remove show-long-keyids since it is replaced by (diff) | |
| download | gnupg-5d98f7afe503b10ad2d4d4d11d510b58fb001268.tar.gz gnupg-5d98f7afe503b10ad2d4d4d11d510b58fb001268.zip | |
* plaintext.c (handle_plaintext): Bigger buffer for extra safety.
* g10.c (main): New alias --throw-keyid for --throw-keyids, so that it
continues to work in old configuration files. Noted by Jens Adam.
* pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2.
* status.c (do_get_from_fd): Flush stdout if status isn't flushing it for
us. This guarantees that any menus that were displayed before the prompt
don't get stuck in a buffer. Noted by Peter Palfrader. This is Debian
bug #254072.
* sign.c (update_keysig_packet): Revert change of 2004-05-18. It is not
appropriate to strip policy and notations when remaking a sig. That
should only happen when specifically requested by the user.
Diffstat (limited to 'g10/sign.c')
| -rw-r--r-- | g10/sign.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/g10/sign.c b/g10/sign.c index efa936f0f..3ba6d6e0b 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -1,6 +1,6 @@ /* sign.c - sign data - * Copyright (C) 1998, 1999, 2000, 2001, 2002, - * 2003 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1387,18 +1387,6 @@ update_keysig_packet( PKT_signature **ret_sig, /* create a new signature packet */ sig = copy_signature (NULL, orig_sig); - - /* We've copied the signature, subpackets and all, but we don't - want any old policies or notations coming over: the signature - is being remade, so these need to be restated as well. Note - that other subpackets like backsigs come over as well, but we - want to keep those. We don't delete policies or notations from - the unhashed area - since we don't put them there, this is a - case of not messing about with things that we are not - responsible for. */ - - delete_sig_subpkt(sig->hashed,SIGSUBPKT_POLICY); - delete_sig_subpkt(sig->hashed,SIGSUBPKT_NOTATION); /* We need to create a new timestamp so that new sig expiration calculations are done correctly... */ |