diff options
| author | Werner Koch <[email protected]> | 2017-07-13 15:28:32 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-07-13 16:29:01 +0000 |
| commit | fa1155e89ebb4b16ee95549b8ab72672df3a0c54 (patch) | |
| tree | 515f2f5684c032772406b27e4ea94a91c87e766a /g10/parse-packet.c | |
| parent | doc: Document gnupg version requirement for gpg-preset-passphrase. (diff) | |
| download | gnupg-fa1155e89ebb4b16ee95549b8ab72672df3a0c54.tar.gz gnupg-fa1155e89ebb4b16ee95549b8ab72672df3a0c54.zip | |
gpg: New option --key-origin.
* g10/keydb.h (KEYORG_): Rename to KEYORG_.
* g10/packet.h (PKT_user_id): Rename field keysrc to keyorg. Adjust
users.
(PKT_public_key): Ditto.
(PKT_ring_trust): Ditto.
* g10/options.h (struct opt): Add field key_origin.
* g10/getkey.c (parse_key_origin): New.
* g10/gpg.c (oKeyOrigin): New.
(opts): Add "keys-origin".
(main): Set option.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/parse-packet.c')
| -rw-r--r-- | g10/parse-packet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c index dbb7af84d..0b6ee8b4e 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -2942,7 +2942,7 @@ parse_ring_trust (parse_packet_ctx_t ctx, unsigned long pktlen) int i; unsigned int namelen; - rt.keysrc = iobuf_get_noeof (inp); + rt.keyorg = iobuf_get_noeof (inp); pktlen--; rt.keyupdate = read_32 (inp); pktlen -= 4; @@ -2974,7 +2974,7 @@ parse_ring_trust (parse_packet_ctx_t ctx, unsigned long pktlen) es_fprintf (listfp, ":trust packet: %s upd=%lu src=%d%s", (rt.subtype == RING_TRUST_UID? "uid" : "key"), (unsigned long)rt.keyupdate, - rt.keysrc, + rt.keyorg, (rt.url? " url=":"")); if (rt.url) { @@ -3016,7 +3016,7 @@ parse_ring_trust (parse_packet_ctx_t ctx, unsigned long pktlen) { PKT_user_id *uid = ctx->last_pkt.pkt.user_id; - uid->keysrc = rt.keysrc; + uid->keyorg = rt.keyorg; uid->keyupdate = rt.keyupdate; uid->updateurl = rt.url; rt.url = NULL; @@ -3027,7 +3027,7 @@ parse_ring_trust (parse_packet_ctx_t ctx, unsigned long pktlen) { PKT_public_key *pk = ctx->last_pkt.pkt.public_key; - pk->keysrc = rt.keysrc; + pk->keyorg = rt.keyorg; pk->keyupdate = rt.keyupdate; pk->updateurl = rt.url; rt.url = NULL; |