mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-29 02:22:45 +02:00
* 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.
This commit is contained in:
parent
af77fd89fa
commit
dd746f4e4b
|
@ -1,3 +1,10 @@
|
||||||
|
2004-07-18 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* 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 <dshaw@jabberwocky.com>
|
2004-06-27 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* sign.c (sign_symencrypt_file): Allow using --force-mdc in --sign
|
* sign.c (sign_symencrypt_file): Allow using --force-mdc in --sign
|
||||||
|
|
12
g10/sign.c
12
g10/sign.c
|
@ -1307,18 +1307,6 @@ update_keysig_packet( PKT_signature **ret_sig,
|
||||||
/* create a new signature packet */
|
/* create a new signature packet */
|
||||||
sig = copy_signature (NULL, orig_sig);
|
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
|
/* We need to create a new timestamp so that new sig expiration
|
||||||
calculations are done correctly... */
|
calculations are done correctly... */
|
||||||
sig->timestamp=make_timestamp();
|
sig->timestamp=make_timestamp();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user