From c5fa20dba312d0c6596ecf83414a8e83d7dab584 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sat, 14 May 2005 02:38:31 +0000 Subject: * build-packet.c (do_comment): Removed. (build_packet): Ignore comment packets. * export.c (do_export_stream): Don't export comment packets any longer. * options.h, g10.c (main): Remove --sk-comments and --no-sk-comments options, and replace with no-op. --- g10/export.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'g10/export.c') diff --git a/g10/export.c b/g10/export.c index 73aa750e9..b91c0442e 100644 --- a/g10/export.c +++ b/g10/export.c @@ -240,10 +240,11 @@ do_export_stream( IOBUF out, STRLIST users, int secret, continue; } - /* don't export any comment packets but those in the - * secret keyring */ - if( !secret && node->pkt->pkttype == PKT_COMMENT ) - continue; + /* We used to use comment packets, but not any longer. In + case we still have comments on a key, strip them here + before we call build_packet(). */ + if( node->pkt->pkttype == PKT_COMMENT ) + continue; /* make sure that ring_trust packets never get exported */ if (node->pkt->pkttype == PKT_RING_TRUST) @@ -335,7 +336,8 @@ do_export_stream( IOBUF out, STRLIST users, int secret, || node->pkt->pkt.signature->keyid[1]!=keyid[1])) continue; - /* do not export packets which are marked as not exportable */ + /* do not export packets which are marked as not + exportable */ if(!(options&EXPORT_LOCAL_SIGS) && !node->pkt->pkt.signature->flags.exportable) continue; /* not exportable */ -- cgit