diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2003-03-24 21:05:53 +0100 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2003-03-24 21:05:53 +0100 |
| commit | d2548b3f600785c6ed062f945f52cc2ab861b6d3 (patch) | |
| tree | 07a07e8731d49f5ee39472456ec27b6cbe6d2ff8 /g10/import.c | |
| parent | * acinclude.m4 (GNUPG_CHECK_ENDIAN): When crosscompiling assume (diff) | |
| download | gnupg2-d2548b3f600785c6ed062f945f52cc2ab861b6d3.tar.xz gnupg2-d2548b3f600785c6ed062f945f52cc2ab861b6d3.zip | |
* keydb.h: Err on the side of making an unknown signature a SIG rather
than a CERT.
* import.c (delete_inv_parts): Discard any key signatures that aren't key
types (i.e. 0x00, 0x01, etc.)
* g10.c (main): Add deprecated option warning for --list-ownertrust. Add
--compression-algo alias for --compress-algo. Change --version output
strings to match "showpref" strings, and make translatable.
* status.c (do_get_from_fd): Accept 'y' as well as 'Y' for --command-fd
boolean input.
* trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX)
* keyedit.c (show_key_with_all_names_colon): Show no-ks-modify flag.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/g10/import.c b/g10/import.c index 83ae0b804..b49b20217 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1378,6 +1378,14 @@ delete_inv_parts( const char *fname, KBNODE keyblock, (ulong)keyid[1]); delete_kbnode( node ); } + else if( node->pkt->pkttype == PKT_SIGNATURE + && !IS_CERT(node->pkt->pkt.signature)) + { + log_error(_("key %08lX: unexpected signature class (0x%02X) -" + " skipped\n"),(ulong)keyid[1], + node->pkt->pkt.signature->sig_class); + delete_kbnode(node); + } else if( (node->flag & 4) ) /* marked for deletion */ delete_kbnode( node ); } |