1998-01-26 23:09:01 +01:00
|
|
|
/* export.c
|
2003-12-28 04:46:43 +01:00
|
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002
|
|
|
|
* 2003 Free Software Foundation, Inc.
|
1998-01-26 23:09:01 +01:00
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* This file is part of GnuPG.
|
1998-01-26 23:09:01 +01:00
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
1998-01-26 23:09:01 +01:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
1998-01-26 23:09:01 +01:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "options.h"
|
|
|
|
#include "packet.h"
|
|
|
|
#include "errors.h"
|
|
|
|
#include "keydb.h"
|
2002-06-29 15:46:34 +02:00
|
|
|
#include "memory.h"
|
1998-01-26 23:09:01 +01:00
|
|
|
#include "util.h"
|
1998-02-13 21:58:50 +01:00
|
|
|
#include "main.h"
|
1998-11-10 13:59:59 +01:00
|
|
|
#include "i18n.h"
|
1998-01-26 23:09:01 +01:00
|
|
|
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
static int do_export( STRLIST users, int secret, unsigned int options );
|
2003-02-26 18:11:24 +01:00
|
|
|
static int do_export_stream( IOBUF out, STRLIST users, int secret,
|
|
|
|
KBNODE *keyblock_out, unsigned int options,
|
|
|
|
int *any );
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
|
|
|
|
int
|
2003-12-28 04:46:43 +01:00
|
|
|
parse_export_options(char *str,unsigned int *options,int noisy)
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
{
|
2003-05-31 23:52:16 +02:00
|
|
|
struct parse_options export_opts[]=
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
{
|
2004-02-14 06:03:45 +01:00
|
|
|
{"include-non-rfc",EXPORT_INCLUDE_NON_RFC,NULL},
|
|
|
|
{"include-local-sigs",EXPORT_INCLUDE_LOCAL_SIGS,NULL},
|
|
|
|
{"include-attributes",EXPORT_INCLUDE_ATTRIBUTES,NULL},
|
|
|
|
{"include-sensitive-revkeys",EXPORT_INCLUDE_SENSITIVE_REVKEYS,NULL},
|
|
|
|
{NULL,0,NULL}
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
/* add tags for include revoked and disabled? */
|
|
|
|
};
|
|
|
|
|
2003-12-28 04:46:43 +01:00
|
|
|
return parse_options(str,options,export_opts,noisy);
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
}
|
1998-01-26 23:09:01 +01:00
|
|
|
|
|
|
|
/****************
|
1998-04-14 19:51:16 +02:00
|
|
|
* Export the public keys (to standard out or --output).
|
1998-02-13 21:58:50 +01:00
|
|
|
* Depending on opt.armor the output is armored.
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
* options are defined in main.h.
|
2002-07-17 21:48:19 +02:00
|
|
|
* If USERS is NULL, the complete ring will be exported. */
|
1998-01-26 23:09:01 +01:00
|
|
|
int
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
export_pubkeys( STRLIST users, unsigned int options )
|
1998-06-29 14:30:57 +02:00
|
|
|
{
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
return do_export( users, 0, options );
|
1998-06-29 14:30:57 +02:00
|
|
|
}
|
|
|
|
|
1999-01-19 19:37:41 +01:00
|
|
|
/****************
|
|
|
|
* Export to an already opened stream; return -1 if no keys have
|
|
|
|
* been exported
|
|
|
|
*/
|
|
|
|
int
|
2003-02-26 18:11:24 +01:00
|
|
|
export_pubkeys_stream( IOBUF out, STRLIST users,
|
|
|
|
KBNODE *keyblock_out, unsigned int options )
|
1999-01-19 19:37:41 +01:00
|
|
|
{
|
|
|
|
int any, rc;
|
|
|
|
|
2003-02-26 18:11:24 +01:00
|
|
|
rc = do_export_stream( out, users, 0, keyblock_out, options, &any );
|
1999-01-19 19:37:41 +01:00
|
|
|
if( !rc && !any )
|
|
|
|
rc = -1;
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
int
|
|
|
|
export_seckeys( STRLIST users )
|
|
|
|
{
|
1998-12-10 20:20:47 +01:00
|
|
|
return do_export( users, 1, 0 );
|
1998-06-29 14:30:57 +02:00
|
|
|
}
|
|
|
|
|
2000-07-14 19:34:53 +02:00
|
|
|
int
|
|
|
|
export_secsubkeys( STRLIST users )
|
|
|
|
{
|
|
|
|
return do_export( users, 2, 0 );
|
|
|
|
}
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
static int
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
do_export( STRLIST users, int secret, unsigned int options )
|
1998-01-26 23:09:01 +01:00
|
|
|
{
|
1999-01-19 19:37:41 +01:00
|
|
|
IOBUF out = NULL;
|
|
|
|
int any, rc;
|
1998-02-13 21:58:50 +01:00
|
|
|
armor_filter_context_t afx;
|
2002-06-29 15:46:34 +02:00
|
|
|
compress_filter_context_t zfx;
|
1999-01-19 19:37:41 +01:00
|
|
|
|
|
|
|
memset( &afx, 0, sizeof afx);
|
2002-06-29 15:46:34 +02:00
|
|
|
memset( &zfx, 0, sizeof zfx);
|
1999-01-19 19:37:41 +01:00
|
|
|
|
|
|
|
rc = open_outfile( NULL, 0, &out );
|
|
|
|
if( rc )
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
if( opt.armor ) {
|
|
|
|
afx.what = secret?5:1;
|
|
|
|
iobuf_push_filter( out, armor_filter, &afx );
|
|
|
|
}
|
2003-11-15 23:31:58 +01:00
|
|
|
if( opt.compress_keys )
|
|
|
|
push_compress_filter(out,&zfx,default_compress_algo());
|
1999-01-19 19:37:41 +01:00
|
|
|
|
* misc.c (compress_algo_to_string, string_to_compress_algo,
check_compress_algo): Add bzip2.
* compress.c (compress_filter): Make static to help force the use of
push_compress_filter. Remove default algorithm setting since that is done
in push_compress_filter now.
* main.h: Use named algorithm.
* filter.h, compress.c (push_compress_filter, push_compress_filter2): New.
Figure out which is the appropriate compression filter to use, and push it
into place.
* compress.c (handle_compressed), encode.c (encode_simple, encode_crypt),
sign.c (sign_file, sign_symencrypt_file), import.c (read_block), export.c
(do_export): Use push_compress_filter instead of pushing the compression
filter ourselves.
* compress-bz2.c: New. Bzlib versions of the compression filter routines.
* Makefile.am: Include compress-bz2.c if bz2lib is available.
2003-10-31 06:39:02 +01:00
|
|
|
rc = do_export_stream( out, users, secret, NULL, options, &any );
|
1999-01-19 19:37:41 +01:00
|
|
|
if( rc || !any )
|
|
|
|
iobuf_cancel(out);
|
|
|
|
else
|
|
|
|
iobuf_close(out);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-02-26 18:11:24 +01:00
|
|
|
/* If keyblock_out is non-NULL, AND the exit code is zero, then it
|
|
|
|
contains a pointer to the first keyblock found and exported. No
|
|
|
|
other keyblocks are exported. The caller must free it. */
|
1999-01-19 19:37:41 +01:00
|
|
|
static int
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
do_export_stream( IOBUF out, STRLIST users, int secret,
|
2003-02-26 18:11:24 +01:00
|
|
|
KBNODE *keyblock_out, unsigned int options, int *any )
|
1999-01-19 19:37:41 +01:00
|
|
|
{
|
|
|
|
int rc = 0;
|
1998-02-13 21:58:50 +01:00
|
|
|
PACKET pkt;
|
|
|
|
KBNODE keyblock = NULL;
|
|
|
|
KBNODE kbctx, node;
|
2003-02-12 19:43:44 +01:00
|
|
|
size_t ndesc, descindex;
|
2002-06-29 15:46:34 +02:00
|
|
|
KEYDB_SEARCH_DESC *desc = NULL;
|
|
|
|
KEYDB_HANDLE kdbhd;
|
1998-02-13 21:58:50 +01:00
|
|
|
STRLIST sl;
|
|
|
|
|
1999-01-19 19:37:41 +01:00
|
|
|
*any = 0;
|
1998-02-13 21:58:50 +01:00
|
|
|
init_packet( &pkt );
|
2002-06-29 15:46:34 +02:00
|
|
|
kdbhd = keydb_new (secret);
|
1998-02-13 21:58:50 +01:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
if (!users) {
|
|
|
|
ndesc = 1;
|
|
|
|
desc = m_alloc_clear ( ndesc * sizeof *desc);
|
|
|
|
desc[0].mode = KEYDB_SEARCH_MODE_FIRST;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++)
|
|
|
|
;
|
|
|
|
desc = m_alloc ( ndesc * sizeof *desc);
|
|
|
|
|
|
|
|
for (ndesc=0, sl=users; sl; sl = sl->next) {
|
|
|
|
if (classify_user_id (sl->d, desc+ndesc))
|
|
|
|
ndesc++;
|
|
|
|
else
|
|
|
|
log_error (_("key `%s' not found: %s\n"),
|
|
|
|
sl->d, g10_errstr (G10ERR_INV_USER_ID));
|
|
|
|
}
|
1998-02-13 21:58:50 +01:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
/* it would be nice to see which of the given users did
|
|
|
|
actually match one in the keyring. To implement this we
|
|
|
|
need to have a found flag for each entry in desc and to set
|
|
|
|
this we must check all those entries after a match to mark
|
|
|
|
all matched one - currently we stop at the first match. To
|
|
|
|
do this we need an extra flag to enable this feature so */
|
1998-02-13 21:58:50 +01:00
|
|
|
}
|
|
|
|
|
2003-02-12 19:43:44 +01:00
|
|
|
while (!(rc = keydb_search2 (kdbhd, desc, ndesc, &descindex))) {
|
|
|
|
int sha1_warned=0,skip_until_subkey=0;
|
2002-06-29 15:46:34 +02:00
|
|
|
u32 sk_keyid[2];
|
|
|
|
|
|
|
|
if (!users)
|
|
|
|
desc[0].mode = KEYDB_SEARCH_MODE_NEXT;
|
|
|
|
|
|
|
|
/* read the keyblock */
|
|
|
|
rc = keydb_get_keyblock (kdbhd, &keyblock );
|
|
|
|
if( rc ) {
|
|
|
|
log_error (_("error reading keyblock: %s\n"), g10_errstr(rc) );
|
|
|
|
goto leave;
|
|
|
|
}
|
1998-12-10 20:20:47 +01:00
|
|
|
|
|
|
|
/* do not export keys which are incompatible with rfc2440 */
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
if( !(options&EXPORT_INCLUDE_NON_RFC) &&
|
2002-07-17 21:48:19 +02:00
|
|
|
(node = find_kbnode( keyblock, PKT_PUBLIC_KEY )) ) {
|
1998-12-10 20:20:47 +01:00
|
|
|
PKT_public_key *pk = node->pkt->pkt.public_key;
|
|
|
|
if( pk->version == 3 && pk->pubkey_algo > 3 ) {
|
|
|
|
log_info(_("key %08lX: not a rfc2440 key - skipped\n"),
|
|
|
|
(ulong)keyid_from_pk( pk, NULL) );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
1998-02-13 21:58:50 +01:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
node=find_kbnode( keyblock, PKT_SECRET_KEY );
|
|
|
|
if(node)
|
|
|
|
{
|
|
|
|
PKT_secret_key *sk=node->pkt->pkt.secret_key;
|
|
|
|
|
|
|
|
keyid_from_sk(sk,sk_keyid);
|
|
|
|
|
|
|
|
/* we can't apply GNU mode 1001 on an unprotected key */
|
|
|
|
if( secret == 2 && !sk->is_protected )
|
|
|
|
{
|
|
|
|
log_info(_("key %08lX: not protected - skipped\n"),
|
|
|
|
(ulong)sk_keyid[1]);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* no v3 keys with GNU mode 1001 */
|
|
|
|
if( secret == 2 && sk->version == 3 )
|
|
|
|
{
|
|
|
|
log_info(_("key %08lX: PGP 2.x style key - skipped\n"),
|
|
|
|
(ulong)sk_keyid[1]);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2000-07-14 19:34:53 +02:00
|
|
|
|
1998-02-13 21:58:50 +01:00
|
|
|
/* and write it */
|
|
|
|
for( kbctx=NULL; (node = walk_kbnode( keyblock, &kbctx, 0 )); ) {
|
2003-02-12 19:43:44 +01:00
|
|
|
if( skip_until_subkey )
|
|
|
|
{
|
|
|
|
if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY
|
|
|
|
|| node->pkt->pkttype==PKT_SECRET_SUBKEY)
|
|
|
|
skip_until_subkey=0;
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
1998-10-16 18:00:17 +02:00
|
|
|
/* don't export any comment packets but those in the
|
|
|
|
* secret keyring */
|
|
|
|
if( !secret && node->pkt->pkttype == PKT_COMMENT )
|
|
|
|
continue;
|
2003-02-12 19:43:44 +01:00
|
|
|
|
2002-06-29 15:46:34 +02:00
|
|
|
/* make sure that ring_trust packets never get exported */
|
|
|
|
if (node->pkt->pkttype == PKT_RING_TRUST)
|
|
|
|
continue;
|
|
|
|
|
2003-02-12 19:43:44 +01:00
|
|
|
/* If exact is set, then we only export what was requested
|
|
|
|
(plus the primary key, if the user didn't specifically
|
|
|
|
request it) */
|
|
|
|
if(desc[descindex].exact
|
|
|
|
&& (node->pkt->pkttype==PKT_PUBLIC_SUBKEY
|
|
|
|
|| node->pkt->pkttype==PKT_SECRET_SUBKEY))
|
|
|
|
{
|
|
|
|
u32 kid[2];
|
|
|
|
byte fpr[MAX_FINGERPRINT_LEN];
|
|
|
|
size_t fprlen;
|
|
|
|
|
|
|
|
switch(desc[descindex].mode)
|
|
|
|
{
|
|
|
|
case KEYDB_SEARCH_MODE_SHORT_KID:
|
|
|
|
case KEYDB_SEARCH_MODE_LONG_KID:
|
|
|
|
if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY)
|
|
|
|
keyid_from_pk(node->pkt->pkt.public_key,kid);
|
|
|
|
else
|
|
|
|
keyid_from_sk(node->pkt->pkt.secret_key,kid);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case KEYDB_SEARCH_MODE_FPR16:
|
|
|
|
case KEYDB_SEARCH_MODE_FPR20:
|
|
|
|
case KEYDB_SEARCH_MODE_FPR:
|
|
|
|
if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY)
|
|
|
|
fingerprint_from_pk(node->pkt->pkt.public_key,
|
|
|
|
fpr,&fprlen);
|
|
|
|
else
|
|
|
|
fingerprint_from_sk(node->pkt->pkt.secret_key,
|
|
|
|
fpr,&fprlen);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(desc[descindex].mode)
|
|
|
|
{
|
|
|
|
case KEYDB_SEARCH_MODE_SHORT_KID:
|
|
|
|
if (desc[descindex].u.kid[1] != kid[1])
|
|
|
|
skip_until_subkey=1;
|
|
|
|
break;
|
|
|
|
case KEYDB_SEARCH_MODE_LONG_KID:
|
|
|
|
if (desc[descindex].u.kid[0] != kid[0]
|
|
|
|
|| desc[descindex].u.kid[1] != kid[1])
|
|
|
|
skip_until_subkey=1;
|
|
|
|
break;
|
|
|
|
case KEYDB_SEARCH_MODE_FPR16:
|
|
|
|
if (memcmp (desc[descindex].u.fpr, fpr, 16))
|
|
|
|
skip_until_subkey=1;
|
|
|
|
break;
|
|
|
|
case KEYDB_SEARCH_MODE_FPR20:
|
|
|
|
case KEYDB_SEARCH_MODE_FPR:
|
|
|
|
if (memcmp (desc[descindex].u.fpr, fpr, 20))
|
|
|
|
skip_until_subkey=1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(skip_until_subkey)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
1998-11-03 20:38:58 +01:00
|
|
|
if( node->pkt->pkttype == PKT_SIGNATURE ) {
|
2002-06-29 15:46:34 +02:00
|
|
|
/* do not export packets which are marked as not exportable */
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
if( !(options&EXPORT_INCLUDE_LOCAL_SIGS) &&
|
|
|
|
!node->pkt->pkt.signature->flags.exportable )
|
2002-06-29 15:46:34 +02:00
|
|
|
continue; /* not exportable */
|
|
|
|
|
2002-09-28 19:49:38 +02:00
|
|
|
/* Do not export packets with a "sensitive" revocation
|
|
|
|
key unless the user wants us to. Note that we do
|
|
|
|
export these when issuing the actual revocation (see
|
|
|
|
revoke.c). */
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
if( !(options&EXPORT_INCLUDE_SENSITIVE_REVKEYS) &&
|
|
|
|
node->pkt->pkt.signature->revkey ) {
|
2002-06-29 15:46:34 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i=0;i<node->pkt->pkt.signature->numrevkeys;i++)
|
|
|
|
if(node->pkt->pkt.signature->revkey[i]->class & 0x40)
|
2002-08-20 14:45:57 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
if(i<node->pkt->pkt.signature->numrevkeys)
|
|
|
|
continue;
|
2002-06-29 15:46:34 +02:00
|
|
|
}
|
1998-11-03 20:38:58 +01:00
|
|
|
}
|
|
|
|
|
2002-07-17 21:48:19 +02:00
|
|
|
/* Don't export attribs? */
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
|
|
|
if( !(options&EXPORT_INCLUDE_ATTRIBUTES) &&
|
2002-07-17 21:48:19 +02:00
|
|
|
node->pkt->pkttype == PKT_USER_ID &&
|
|
|
|
node->pkt->pkt.user_id->attrib_data ) {
|
|
|
|
/* Skip until we get to something that is not an attrib
|
|
|
|
or a signature on an attrib */
|
|
|
|
while(kbctx->next && kbctx->next->pkt->pkttype==PKT_SIGNATURE) {
|
|
|
|
kbctx=kbctx->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2000-07-14 19:34:53 +02:00
|
|
|
if( secret == 2 && node->pkt->pkttype == PKT_SECRET_KEY ) {
|
|
|
|
/* we don't want to export the secret parts of the
|
|
|
|
* primary key, this is done by using GNU protection mode 1001
|
|
|
|
*/
|
|
|
|
int save_mode = node->pkt->pkt.secret_key->protect.s2k.mode;
|
|
|
|
node->pkt->pkt.secret_key->protect.s2k.mode = 1001;
|
|
|
|
rc = build_packet( out, node->pkt );
|
|
|
|
node->pkt->pkt.secret_key->protect.s2k.mode = save_mode;
|
|
|
|
}
|
|
|
|
else {
|
2002-06-29 15:46:34 +02:00
|
|
|
/* Warn the user if the secret key or any of the secret
|
|
|
|
subkeys are protected with SHA1 and we have
|
|
|
|
simple_sk_checksum set. */
|
|
|
|
if(!sha1_warned && opt.simple_sk_checksum &&
|
|
|
|
(node->pkt->pkttype==PKT_SECRET_KEY ||
|
|
|
|
node->pkt->pkttype==PKT_SECRET_SUBKEY) &&
|
|
|
|
node->pkt->pkt.secret_key->protect.sha1chk)
|
|
|
|
{
|
|
|
|
/* I hope this warning doesn't confuse people. */
|
* g10.c (main): Add --no-textmode.
* export.c (do_export_stream), keyedit.c (show_key_with_all_names,
menu_addrevoker), mainproc.c (check_sig_and_print), photoid.c
(show_photos), sign.c (mk_notation_and_policy), trustdb.c (get_validity,
reset_trust_records, validate_keys): Make some strings translatable.
* mainproc.c (check_sig_and_print): Show digest algorithm and sig class
when verifying a sig with --verbose on, and add version, pk and hash
algorithms and sig class to VALIDSIG.
* parse-packet.c (enum_sig_subpkt): Make a warning message a --verbose
warning message since we don't need to warn every time we see an unknown
critical (we only need to invalidate the signature).
* trustdb.c (init_trustdb): Check the trustdb options even with TM_AUTO
since the auto may become TM_CLASSIC or TM_OPENPGP.
2003-04-27 22:22:09 +02:00
|
|
|
log_info(_("WARNING: secret key %08lX does not have a "
|
|
|
|
"simple SK checksum\n"),(ulong)sk_keyid[1]);
|
2002-06-29 15:46:34 +02:00
|
|
|
|
|
|
|
sha1_warned=1;
|
|
|
|
}
|
|
|
|
|
2000-07-14 19:34:53 +02:00
|
|
|
rc = build_packet( out, node->pkt );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( rc ) {
|
1998-02-13 21:58:50 +01:00
|
|
|
log_error("build_packet(%d) failed: %s\n",
|
2002-06-29 15:46:34 +02:00
|
|
|
node->pkt->pkttype, g10_errstr(rc) );
|
|
|
|
rc = G10ERR_WRITE_FILE;
|
1998-02-13 21:58:50 +01:00
|
|
|
goto leave;
|
|
|
|
}
|
|
|
|
}
|
1999-01-19 19:37:41 +01:00
|
|
|
++*any;
|
2003-02-26 18:11:24 +01:00
|
|
|
if(keyblock_out)
|
|
|
|
{
|
|
|
|
*keyblock_out=keyblock;
|
|
|
|
break;
|
|
|
|
}
|
1998-02-13 21:58:50 +01:00
|
|
|
}
|
|
|
|
if( rc == -1 )
|
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
leave:
|
2002-06-29 15:46:34 +02:00
|
|
|
m_free(desc);
|
|
|
|
keydb_release (kdbhd);
|
2003-02-26 18:11:24 +01:00
|
|
|
if(rc || keyblock_out==NULL)
|
|
|
|
release_kbnode( keyblock );
|
1999-01-19 19:37:41 +01:00
|
|
|
if( !*any )
|
1998-11-10 13:59:59 +01:00
|
|
|
log_info(_("WARNING: nothing exported\n"));
|
1998-02-13 21:58:50 +01:00
|
|
|
return rc;
|
1998-01-26 23:09:01 +01:00
|
|
|
}
|