mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* getkey.c (merge_selfsigs_main): Make sure the revocation key list starts
clean as this function may be called more than once (e.g. from functions in --edit). * g10.c, encode.c (encode_crypt), sign.c (sign_file, sign_symencrypt_file): Make --compress-algo work like the documentation says. It should be like --cipher-algo and --digest-algo in that it can override the preferences calculation and impose the setting the user wants. No --compress-algo setting allows the usual preferences calculation to take place. * main.h, compress.c (compress_filter): use new DEFAULT_COMPRESS_ALGO define, and add a sanity check for compress algo value.
This commit is contained in:
parent
4cb36096ec
commit
0c3ac11549
7 changed files with 85 additions and 44 deletions
|
@ -1192,6 +1192,12 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
|
|||
/* first pass: find the latest direct key self-signature.
|
||||
* We assume that the newest one overrides all others
|
||||
*/
|
||||
|
||||
/* In case this key was already merged */
|
||||
m_free(pk->revkey);
|
||||
pk->revkey=NULL;
|
||||
pk->numrevkeys=0;
|
||||
|
||||
signode = NULL;
|
||||
sigdate = 0; /* helper to find the latest signature */
|
||||
for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue