aboutsummaryrefslogtreecommitdiffstats
path: root/g10/mainproc.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2010-09-06 19:57:42 +0000
committerWerner Koch <[email protected]>2010-09-06 19:57:42 +0000
commit299ed4c9e26f16ce5365ed69dde5e109aa4e4f9e (patch)
tree76ec60edc1f48dff9ad7b1d968ebedab0692dc14 /g10/mainproc.c
parentMerge secret keys during import (diff)
downloadgnupg-299ed4c9e26f16ce5365ed69dde5e109aa4e4f9e.tar.gz
gnupg-299ed4c9e26f16ce5365ed69dde5e109aa4e4f9e.zip
Removed more secret key related code.
It builds fine and passes some of the tests but there are quite some features which don't work yet.
Diffstat (limited to '')
-rw-r--r--g10/mainproc.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 87e99126a..02ffae92e 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -58,7 +58,6 @@ struct mainproc_context
{
struct mainproc_context *anchor; /* May be useful in the future. */
PKT_public_key *last_pubkey;
- PKT_secret_key *last_seckey;
PKT_user_id *last_user_id;
md_filter_context_t mfx;
int sigs_only; /* Process only signatures and reject all other stuff. */
@@ -1118,15 +1117,13 @@ list_node( CTX c, KBNODE node )
u32 keyid[2];
if( c->list->pkt->pkttype == PKT_PUBLIC_KEY
- || c->list->pkt->pkttype == PKT_SECRET_KEY ) {
- if( c->list->pkt->pkttype == PKT_PUBLIC_KEY )
- keyid_from_pk( c->list->pkt->pkt.public_key, keyid );
- else
- keyid_from_sk( c->list->pkt->pkt.secret_key, keyid );
-
- if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] )
- is_selfsig = 1;
- }
+ || c->list->pkt->pkttype == PKT_SECRET_KEY )
+ {
+ keyid_from_pk (c->list->pkt->pkt.public_key, keyid);
+
+ if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] )
+ is_selfsig = 1;
+ }
}
if( opt.with_colons ) {
putchar(':');