diff options
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/sign.c | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 82dcd3804..309a637e6 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2004-07-18 David Shaw <[email protected]> + + * 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. + 2004-06-27 David Shaw <[email protected]> * sign.c (sign_symencrypt_file): Allow using --force-mdc in --sign diff --git a/g10/sign.c b/g10/sign.c index 86a524b2b..e8f5191b7 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -1306,18 +1306,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... */ |