aboutsummaryrefslogtreecommitdiffstats
path: root/g10/import.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/import.c')
-rw-r--r--g10/import.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/g10/import.c b/g10/import.c
index 4fb6f5690..cec24b8ad 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -60,7 +60,6 @@ static int import( IOBUF inp, const char* fname,
struct stats_s *stats, unsigned int options );
static int read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root );
static void revocation_present(KBNODE keyblock);
-static void remove_bad_stuff (KBNODE keyblock);
static int import_one( const char *fname, KBNODE keyblock,
struct stats_s *stats, unsigned int options);
static int import_secret_one( const char *fname, KBNODE keyblock,
@@ -260,7 +259,6 @@ import( IOBUF inp, const char* fname,
}
while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) {
- remove_bad_stuff (keyblock);
if( keyblock->pkt->pkttype == PKT_PUBLIC_KEY )
rc = import_one( fname, keyblock, stats, options );
else if( keyblock->pkt->pkttype == PKT_SECRET_KEY )
@@ -450,22 +448,6 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
return rc;
}
-
-static void
-remove_bad_stuff (KBNODE keyblock)
-{
- KBNODE node;
-
- for (node=keyblock; node; node = node->next ) {
- if( node->pkt->pkttype == PKT_SIGNATURE ) {
- /* delete the subpackets we used to use for the
- verification cache */
- delete_sig_subpkt (node->pkt->pkt.signature->unhashed,
- SIGSUBPKT_PRIV_VERIFY_CACHE);
- }
- }
-}
-
/* Walk through the subkeys on a pk to find if we have the PKS
disease: multiple subkeys with their binding sigs stripped, and the
sig for the first subkey placed after the last subkey. That is,