security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* options.h, import.c (parse_import_options, delete_inv_parts): Add

Browse source 
import-unusable-sigs flag to enable importing unusable (currently:
expired) sigs.

* options.h, export.c (parse_export_options, do_export_stream): Add
export-unusable-sigs flag to enable exporting unusable (currently:
expired) sigs.
This commit is contained in:
David Shaw 2005-01-01 21:21:11 +00:00
parent 2193ab9fc7
commit fbee22ac0c
4 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
g10/import.c
View file

@ -93,6 +93,7 @@ parse_import_options(char *str,unsigned int *options,int noisy)
{"fast-import",IMPORT_FAST,NULL},
{"convert-sk-to-pk",IMPORT_SK2PK,NULL},
{"merge-only",IMPORT_MERGE_ONLY,NULL},
{"import-unusable-sigs",IMPORT_UNUSABLE_SIGS,NULL},
/* Aliases for backward compatibility */
{"allow-local-sigs",IMPORT_LOCAL_SIGS,NULL},
{"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL},
@ -1557,8 +1558,26 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
node->pkt->pkt.signature->sig_class);
delete_kbnode(node);
}
else if(node->pkt->pkttype==PKT_SIGNATURE
&& IS_UID_SIG(node->pkt->pkt.signature)
&& node->pkt->pkt.signature->flags.expired
&& (node->pkt->pkt.signature->keyid[0]!=keyid[0]
|| node->pkt->pkt.signature->keyid[1]!=keyid[1])
&& !(options&IMPORT_UNUSABLE_SIGS))
{
if(opt.verbose)
{
char *kid=m_strdup(keystr(keyid));
log_info(_("key %s: expired signature from key %s -"
" skipped\n"),kid,
keystr(node->pkt->pkt.signature->keyid));
m_free(kid);
}
delete_kbnode(node);
}
else if( (node->flag & 4) ) /* marked for deletion */
delete_kbnode( node );
delete_kbnode( node );
}
/* note: because keyblock is the public key, it is never marked