security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-24 15:31:41 +02:00
Code Activity

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

Browse Source 
import-unusable-sigs is now a noop.
This commit is contained in:
David Shaw 2005-06-10 03:15:25 +00:00
parent 045433e35c
commit 1594883f2f
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2005-06-09 David Shaw <dshaw@jabberwocky.com> 2005-06-09 David Shaw <dshaw@jabberwocky.com>
* options.h, import.c (parse_import_options, delete_inv_parts):
import-unusable-sigs is now a noop.
* options.h, export.c (do_export_stream), keyedit.c (keyedit_menu, * options.h, export.c (do_export_stream), keyedit.c (keyedit_menu,
menu_clean_subkeys_from_key), trustdb.h, trustdb.c menu_clean_subkeys_from_key), trustdb.h, trustdb.c
(clean_subkeys_from_key): Remove subkey cleaning function. It is (clean_subkeys_from_key): Remove subkey cleaning function. It is

27
g10/import.c
View File

@ -94,10 +94,11 @@ parse_import_options(char *str,unsigned int *options,int noisy)
{"fast-import",IMPORT_FAST,NULL}, {"fast-import",IMPORT_FAST,NULL},
{"convert-sk-to-pk",IMPORT_SK2PK,NULL}, {"convert-sk-to-pk",IMPORT_SK2PK,NULL},
{"merge-only",IMPORT_MERGE_ONLY,NULL}, {"merge-only",IMPORT_MERGE_ONLY,NULL},
{"import-unusable-sigs",IMPORT_UNUSABLE_SIGS,NULL},
/* Aliases for backward compatibility */ /* Aliases for backward compatibility */
{"allow-local-sigs",IMPORT_LOCAL_SIGS,NULL}, {"allow-local-sigs",IMPORT_LOCAL_SIGS,NULL},
{"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL}, {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL},
/* dummy */
{"import-unusable-sigs",0,NULL},
{NULL,0,NULL} {NULL,0,NULL}
}; };
@ -1556,30 +1557,6 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
node->pkt->pkt.signature->sig_class); node->pkt->pkt.signature->sig_class);
delete_kbnode(node); 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))
{
/* Note that we haven't necessarily checked this sig for
validity. We strip it anyway since if it was valid, it
would be expired. If it wasn't valid, it either would
be expired if it was valid, or was altered to the point
that it looked expired (and so doesn't matter terribly
much if it is expired or not). */
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 */ else if( (node->flag & 4) ) /* marked for deletion */
delete_kbnode( node ); delete_kbnode( node );
} }

1
g10/options.h
View File

@ -251,7 +251,6 @@ struct {
#define IMPORT_FAST (1<<2) #define IMPORT_FAST (1<<2)
#define IMPORT_SK2PK (1<<3) #define IMPORT_SK2PK (1<<3)
#define IMPORT_MERGE_ONLY (1<<4) #define IMPORT_MERGE_ONLY (1<<4)
#define IMPORT_UNUSABLE_SIGS (1<<5)
#define EXPORT_LOCAL_SIGS (1<<0) #define EXPORT_LOCAL_SIGS (1<<0)
#define EXPORT_ATTRIBUTES (1<<1) #define EXPORT_ATTRIBUTES (1<<1)