security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

* export.c (do_export_stream): Allow export-minimal to work with secret

Browse Source 
keys, even though a non-selfsig secret key signature is rare.
This commit is contained in:
David Shaw 2004-11-26 16:48:05 +00:00
parent dae90866f4
commit 3ea642d8ae
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,5 +1,9 @@
2004-11-26 David Shaw <dshaw@jabberwocky.com> 2004-11-26 David Shaw <dshaw@jabberwocky.com>
* export.c (do_export_stream): Allow export-minimal to work with
secret keys, even though a non-selfsig secret key signature is
rare.
* options.h, export.c (parse_export_options, do_export_stream), * options.h, export.c (parse_export_options, do_export_stream),
import.c (parse_import_options, import_keys_internal): Make the import.c (parse_import_options, import_keys_internal): Make the
import-options and export-options distinct since they can be mixed import-options and export-options distinct since they can be mixed

11
g10/export.c
View File

@ -145,7 +145,7 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
KEYDB_SEARCH_DESC *desc = NULL; KEYDB_SEARCH_DESC *desc = NULL;
KEYDB_HANDLE kdbhd; KEYDB_HANDLE kdbhd;
STRLIST sl; STRLIST sl;
u32 pk_keyid[2]; u32 keyid[2];
*any = 0; *any = 0;
init_packet( &pkt ); init_packet( &pkt );
@ -220,10 +220,13 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
keystr(sk_keyid)); keystr(sk_keyid));
continue; continue;
} }
if(options&EXPORT_MINIMAL)
keyid_from_sk(sk,keyid);
} }
else if((options&EXPORT_MINIMAL) else if((options&EXPORT_MINIMAL)
&& (node=find_kbnode(keyblock,PKT_PUBLIC_KEY))) && (node=find_kbnode(keyblock,PKT_PUBLIC_KEY)))
keyid_from_pk(node->pkt->pkt.public_key,pk_keyid); keyid_from_pk(node->pkt->pkt.public_key,keyid);
/* and write it */ /* and write it */
for( kbctx=NULL; (node = walk_kbnode( keyblock, &kbctx, 0 )); ) { for( kbctx=NULL; (node = walk_kbnode( keyblock, &kbctx, 0 )); ) {
@ -317,8 +320,8 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
0x13). A designated revocation is not stripped. */ 0x13). A designated revocation is not stripped. */
if((options&EXPORT_MINIMAL) if((options&EXPORT_MINIMAL)
&& IS_UID_SIG(node->pkt->pkt.signature) && IS_UID_SIG(node->pkt->pkt.signature)
&& (node->pkt->pkt.signature->keyid[0]!=pk_keyid[0] && (node->pkt->pkt.signature->keyid[0]!=keyid[0]
|| node->pkt->pkt.signature->keyid[1]!=pk_keyid[1])) || node->pkt->pkt.signature->keyid[1]!=keyid[1]))
continue; continue;
/* do not export packets which are marked as not exportable */ /* do not export packets which are marked as not exportable */