1998-01-16 22:15:24 +01:00
|
|
|
/* import.c
|
2000-07-14 19:34:53 +02:00
|
|
|
* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
1998-01-16 22:15:24 +01:00
|
|
|
*
|
1998-12-08 13:20:53 +01:00
|
|
|
* This file is part of GnuPG.
|
1998-01-16 22:15:24 +01:00
|
|
|
*
|
1998-12-08 13:20:53 +01:00
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
1998-01-16 22:15:24 +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-08 13:20:53 +01:00
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
1998-01-16 22:15:24 +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"
|
2000-01-24 12:55:49 +01:00
|
|
|
#include <gcrypt.h>
|
1998-01-16 22:15:24 +01:00
|
|
|
#include "util.h"
|
|
|
|
#include "trustdb.h"
|
1998-02-16 21:05:02 +01:00
|
|
|
#include "main.h"
|
1998-07-08 11:29:43 +02:00
|
|
|
#include "i18n.h"
|
1999-07-14 19:47:23 +02:00
|
|
|
#include "status.h"
|
1998-02-16 21:05:02 +01:00
|
|
|
|
|
|
|
|
1998-10-25 20:00:01 +01:00
|
|
|
static struct {
|
2000-07-14 19:34:53 +02:00
|
|
|
ulong count;
|
1998-10-25 20:00:01 +01:00
|
|
|
ulong no_user_id;
|
|
|
|
ulong imported;
|
|
|
|
ulong imported_rsa;
|
|
|
|
ulong n_uids;
|
|
|
|
ulong n_sigs;
|
|
|
|
ulong n_subk;
|
|
|
|
ulong unchanged;
|
|
|
|
ulong n_revoc;
|
|
|
|
ulong secret_read;
|
|
|
|
ulong secret_imported;
|
|
|
|
ulong secret_dups;
|
2000-09-18 16:35:34 +02:00
|
|
|
ulong skipped_new_keys;
|
1998-10-25 20:00:01 +01:00
|
|
|
} stats;
|
|
|
|
|
|
|
|
|
1999-01-16 09:29:29 +01:00
|
|
|
static int import( IOBUF inp, int fast, const char* fname );
|
2000-07-14 19:34:53 +02:00
|
|
|
static void print_stats(void);
|
1999-02-19 15:54:00 +01:00
|
|
|
static int read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root );
|
1998-10-25 20:00:01 +01:00
|
|
|
static int import_one( const char *fname, KBNODE keyblock, int fast );
|
1998-06-29 14:30:57 +02:00
|
|
|
static int import_secret_one( const char *fname, KBNODE keyblock );
|
1998-02-18 14:58:46 +01:00
|
|
|
static int import_revoke_cert( const char *fname, KBNODE node );
|
1998-02-16 21:05:02 +01:00
|
|
|
static int chk_self_sigs( const char *fname, KBNODE keyblock,
|
1998-06-29 14:30:57 +02:00
|
|
|
PKT_public_key *pk, u32 *keyid );
|
1999-07-22 20:11:55 +02:00
|
|
|
static void mark_non_selfsigned_uids_valid( KBNODE keyblock, u32 *kid );
|
1998-02-16 21:05:02 +01:00
|
|
|
static int delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid );
|
1998-02-17 21:48:52 +01:00
|
|
|
static int merge_blocks( const char *fname, KBNODE keyblock_orig,
|
1998-05-26 15:38:00 +02:00
|
|
|
KBNODE keyblock, u32 *keyid,
|
|
|
|
int *n_uids, int *n_sigs, int *n_subk );
|
1998-02-17 21:48:52 +01:00
|
|
|
static int append_uid( KBNODE keyblock, KBNODE node, int *n_sigs,
|
|
|
|
const char *fname, u32 *keyid );
|
1998-12-08 13:20:53 +01:00
|
|
|
static int append_key( KBNODE keyblock, KBNODE node, int *n_sigs,
|
|
|
|
const char *fname, u32 *keyid );
|
1998-02-17 21:48:52 +01:00
|
|
|
static int merge_sigs( KBNODE dst, KBNODE src, int *n_sigs,
|
|
|
|
const char *fname, u32 *keyid );
|
1998-12-08 13:20:53 +01:00
|
|
|
static int merge_keysigs( KBNODE dst, KBNODE src, int *n_sigs,
|
|
|
|
const char *fname, u32 *keyid );
|
1998-01-16 22:15:24 +01:00
|
|
|
|
|
|
|
|
|
|
|
/****************
|
1998-02-13 21:58:50 +01:00
|
|
|
* Import the public keys from the given filename. Input may be armored.
|
1998-04-14 19:51:16 +02:00
|
|
|
* This function rejects all keys which are not validly self signed on at
|
1998-02-13 21:58:50 +01:00
|
|
|
* least one userid. Only user ids which are self signed will be imported.
|
1998-04-14 19:51:16 +02:00
|
|
|
* Other signatures are not checked.
|
1998-02-13 21:58:50 +01:00
|
|
|
*
|
1998-10-25 20:00:01 +01:00
|
|
|
* Actually this function does a merge. It works like this:
|
1998-02-13 21:58:50 +01:00
|
|
|
*
|
|
|
|
* - get the keyblock
|
1998-02-16 21:05:02 +01:00
|
|
|
* - check self-signatures and remove all userids and their signatures
|
1998-02-13 21:58:50 +01:00
|
|
|
* without/invalid self-signatures.
|
|
|
|
* - reject the keyblock, if we have no valid userid.
|
1998-04-14 19:51:16 +02:00
|
|
|
* - See whether we have this key already in one of our pubrings.
|
1998-02-13 21:58:50 +01:00
|
|
|
* If not, simply add it to the default keyring.
|
|
|
|
* - Compare the key and the self-signatures of the new and the one in
|
1998-04-14 19:51:16 +02:00
|
|
|
* our keyring. If they are different something weird is going on;
|
1998-02-13 21:58:50 +01:00
|
|
|
* ask what to do.
|
1998-04-14 19:51:16 +02:00
|
|
|
* - See whether we have only non-self-signature on one user id; if not
|
1998-02-13 21:58:50 +01:00
|
|
|
* ask the user what to do.
|
|
|
|
* - compare the signatures: If we already have this signature, check
|
1998-02-16 21:05:02 +01:00
|
|
|
* that they compare okay; if not, issue a warning and ask the user.
|
1998-04-14 19:51:16 +02:00
|
|
|
* (consider looking at the timestamp and use the newest?)
|
1998-02-13 21:58:50 +01:00
|
|
|
* - Simply add the signature. Can't verify here because we may not have
|
1998-04-14 19:51:16 +02:00
|
|
|
* the signature's public key yet; verification is done when putting it
|
1998-02-13 21:58:50 +01:00
|
|
|
* into the trustdb, which is done automagically as soon as this pubkey
|
|
|
|
* is used.
|
|
|
|
* - Proceed with next signature.
|
1998-01-16 22:15:24 +01:00
|
|
|
*
|
1998-04-14 19:51:16 +02:00
|
|
|
* Key revocation certificates have special handling.
|
1998-02-18 14:58:46 +01:00
|
|
|
*
|
1998-01-16 22:15:24 +01:00
|
|
|
*/
|
2000-07-14 19:34:53 +02:00
|
|
|
void
|
|
|
|
import_keys( char **fnames, int nnames, int fast )
|
1999-01-16 09:29:29 +01:00
|
|
|
{
|
2000-07-14 19:34:53 +02:00
|
|
|
int i;
|
1999-01-16 09:29:29 +01:00
|
|
|
|
2000-07-14 19:34:53 +02:00
|
|
|
/* fixme: don't use static variables */
|
|
|
|
memset( &stats, 0, sizeof( stats ) );
|
1999-01-16 09:29:29 +01:00
|
|
|
|
2000-07-14 19:34:53 +02:00
|
|
|
if( !fnames && !nnames )
|
|
|
|
nnames = 1; /* Ohh what a ugly hack to jump into the loop */
|
1999-01-16 09:29:29 +01:00
|
|
|
|
2000-07-14 19:34:53 +02:00
|
|
|
for(i=0; i < nnames; i++ ) {
|
|
|
|
const char *fname = fnames? fnames[i] : NULL;
|
|
|
|
IOBUF inp = iobuf_open(fname);
|
|
|
|
if( !fname )
|
|
|
|
fname = "[stdin]";
|
|
|
|
if( !inp )
|
|
|
|
log_error(_("can't open `%s': %s\n"), fname, strerror(errno) );
|
|
|
|
else {
|
|
|
|
int rc = import( inp, fast, fname );
|
|
|
|
iobuf_close(inp);
|
|
|
|
if( rc )
|
|
|
|
log_error("import from `%s' failed: %s\n", fname,
|
|
|
|
gpg_errstr(rc) );
|
|
|
|
}
|
|
|
|
if( !fname )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
print_stats();
|
|
|
|
if( !fast )
|
|
|
|
sync_trustdb();
|
1999-01-16 09:29:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
import_keys_stream( IOBUF inp, int fast )
|
|
|
|
{
|
2000-07-14 19:34:53 +02:00
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
/* fixme: don't use static variables */
|
|
|
|
memset( &stats, 0, sizeof( stats ) );
|
|
|
|
rc = import( inp, fast, "[stream]" );
|
|
|
|
print_stats();
|
|
|
|
if( !fast )
|
|
|
|
sync_trustdb();
|
|
|
|
return rc;
|
1999-01-16 09:29:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
import( IOBUF inp, int fast, const char* fname )
|
1998-02-16 21:05:02 +01:00
|
|
|
{
|
|
|
|
PACKET *pending_pkt = NULL;
|
|
|
|
KBNODE keyblock;
|
|
|
|
int rc = 0;
|
1998-10-25 20:00:01 +01:00
|
|
|
|
1998-12-23 13:41:40 +01:00
|
|
|
getkey_disable_caches();
|
|
|
|
|
1999-02-19 15:54:00 +01:00
|
|
|
if( !opt.no_armor ) { /* armored reading is not disabled */
|
2000-01-24 12:55:49 +01:00
|
|
|
armor_filter_context_t *afx = gcry_xcalloc( 1, sizeof *afx );
|
1999-02-19 15:54:00 +01:00
|
|
|
afx->only_keyblocks = 1;
|
|
|
|
iobuf_push_filter2( inp, armor_filter, afx, 1 );
|
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
|
1999-02-19 15:54:00 +01:00
|
|
|
while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) {
|
1998-06-29 14:30:57 +02:00
|
|
|
if( keyblock->pkt->pkttype == PKT_PUBLIC_KEY )
|
1998-10-25 20:00:01 +01:00
|
|
|
rc = import_one( fname, keyblock, fast );
|
1998-06-29 14:30:57 +02:00
|
|
|
else if( keyblock->pkt->pkttype == PKT_SECRET_KEY )
|
|
|
|
rc = import_secret_one( fname, keyblock );
|
1998-02-18 14:58:46 +01:00
|
|
|
else if( keyblock->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& keyblock->pkt->pkt.signature->sig_class == 0x20 )
|
|
|
|
rc = import_revoke_cert( fname, keyblock );
|
1998-07-08 11:29:43 +02:00
|
|
|
else {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("skipping block of type %d\n"),
|
1998-07-08 11:29:43 +02:00
|
|
|
keyblock->pkt->pkttype );
|
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
release_kbnode(keyblock);
|
|
|
|
if( rc )
|
|
|
|
break;
|
2000-07-14 19:34:53 +02:00
|
|
|
if( !(++stats.count % 100) && !opt.quiet )
|
|
|
|
log_info(_("%lu keys so far processed\n"), stats.count );
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
|
|
|
if( rc == -1 )
|
|
|
|
rc = 0;
|
2000-01-27 17:50:45 +01:00
|
|
|
else if( rc && rc != GPGERR_INV_KEYRING )
|
|
|
|
log_error( _("error reading `%s': %s\n"), fname, gpg_errstr(rc));
|
1998-02-16 21:05:02 +01:00
|
|
|
|
2000-07-14 19:34:53 +02:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
print_stats()
|
|
|
|
{
|
1999-04-18 10:18:52 +02:00
|
|
|
if( !opt.quiet ) {
|
2000-07-14 19:34:53 +02:00
|
|
|
log_info(_("Total number processed: %lu\n"), stats.count );
|
2000-09-18 16:35:34 +02:00
|
|
|
if( stats.skipped_new_keys )
|
|
|
|
log_info(_(" skipped new keys: %lu\n"),
|
|
|
|
stats.skipped_new_keys );
|
1999-04-18 10:18:52 +02:00
|
|
|
if( stats.no_user_id )
|
|
|
|
log_info(_(" w/o user IDs: %lu\n"), stats.no_user_id );
|
|
|
|
if( stats.imported || stats.imported_rsa ) {
|
|
|
|
log_info(_(" imported: %lu"), stats.imported );
|
|
|
|
if( stats.imported_rsa )
|
|
|
|
fprintf(stderr, " (RSA: %lu)", stats.imported_rsa );
|
|
|
|
putc('\n', stderr);
|
|
|
|
}
|
|
|
|
if( stats.unchanged )
|
|
|
|
log_info(_(" unchanged: %lu\n"), stats.unchanged );
|
|
|
|
if( stats.n_uids )
|
|
|
|
log_info(_(" new user IDs: %lu\n"), stats.n_uids );
|
|
|
|
if( stats.n_subk )
|
|
|
|
log_info(_(" new subkeys: %lu\n"), stats.n_subk );
|
|
|
|
if( stats.n_sigs )
|
|
|
|
log_info(_(" new signatures: %lu\n"), stats.n_sigs );
|
|
|
|
if( stats.n_revoc )
|
|
|
|
log_info(_(" new key revocations: %lu\n"), stats.n_revoc );
|
|
|
|
if( stats.secret_read )
|
|
|
|
log_info(_(" secret keys read: %lu\n"), stats.secret_read );
|
|
|
|
if( stats.secret_imported )
|
|
|
|
log_info(_(" secret keys imported: %lu\n"), stats.secret_imported );
|
|
|
|
if( stats.secret_dups )
|
|
|
|
log_info(_(" secret keys unchanged: %lu\n"), stats.secret_dups );
|
1998-10-25 20:00:01 +01:00
|
|
|
}
|
|
|
|
|
1999-07-14 19:47:23 +02:00
|
|
|
if( is_status_enabled() ) {
|
2000-07-14 19:34:53 +02:00
|
|
|
char buf[12*20];
|
1999-07-14 19:47:23 +02:00
|
|
|
sprintf(buf, "%lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
|
2000-07-14 19:34:53 +02:00
|
|
|
stats.count,
|
1999-07-14 19:47:23 +02:00
|
|
|
stats.no_user_id,
|
|
|
|
stats.imported,
|
|
|
|
stats.imported_rsa,
|
|
|
|
stats.unchanged,
|
|
|
|
stats.n_uids,
|
|
|
|
stats.n_subk,
|
|
|
|
stats.n_sigs,
|
|
|
|
stats.n_revoc,
|
|
|
|
stats.secret_read,
|
|
|
|
stats.secret_imported,
|
|
|
|
stats.secret_dups);
|
|
|
|
write_status_text( STATUS_IMPORT_RES, buf );
|
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
1999-02-19 15:54:00 +01:00
|
|
|
* Read the next keyblock from stream A.
|
|
|
|
* PENDING_PKT should be initialzed to NULL
|
1998-02-16 21:05:02 +01:00
|
|
|
* and not chnaged form the caller.
|
|
|
|
* Retunr: 0 = okay, -1 no more blocks or another errorcode.
|
|
|
|
*/
|
|
|
|
static int
|
1999-02-19 15:54:00 +01:00
|
|
|
read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
|
1998-01-16 22:15:24 +01:00
|
|
|
{
|
1998-02-16 21:05:02 +01:00
|
|
|
int rc;
|
|
|
|
PACKET *pkt;
|
|
|
|
KBNODE root = NULL;
|
1998-02-17 21:48:52 +01:00
|
|
|
int in_cert;
|
1998-02-16 21:05:02 +01:00
|
|
|
|
|
|
|
if( *pending_pkt ) {
|
|
|
|
root = new_kbnode( *pending_pkt );
|
|
|
|
*pending_pkt = NULL;
|
1998-02-17 21:48:52 +01:00
|
|
|
in_cert = 1;
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
else
|
|
|
|
in_cert = 0;
|
2000-01-24 12:55:49 +01:00
|
|
|
pkt = gcry_xmalloc( sizeof *pkt );
|
1998-02-16 21:05:02 +01:00
|
|
|
init_packet(pkt);
|
2000-10-06 14:28:44 +02:00
|
|
|
while( (rc=parse_packet(a, pkt, NULL)) != -1 ) {
|
1998-02-16 21:05:02 +01:00
|
|
|
if( rc ) { /* ignore errors */
|
2000-01-27 17:50:45 +01:00
|
|
|
if( rc != GPGERR_UNKNOWN_PACKET ) {
|
|
|
|
log_error("read_block: read error: %s\n", gpg_errstr(rc) );
|
|
|
|
rc = GPGERR_INV_KEYRING;
|
1998-02-16 21:05:02 +01:00
|
|
|
goto ready;
|
|
|
|
}
|
|
|
|
free_packet( pkt );
|
|
|
|
init_packet(pkt);
|
|
|
|
continue;
|
|
|
|
}
|
1998-02-18 14:58:46 +01:00
|
|
|
|
|
|
|
if( !root && pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& pkt->pkt.signature->sig_class == 0x20 ) {
|
|
|
|
/* this is a revocation certificate which is handled
|
|
|
|
* in a special way */
|
|
|
|
root = new_kbnode( pkt );
|
|
|
|
pkt = NULL;
|
|
|
|
goto ready;
|
|
|
|
}
|
|
|
|
|
1998-02-16 21:05:02 +01:00
|
|
|
/* make a linked list of all packets */
|
|
|
|
switch( pkt->pkttype ) {
|
|
|
|
case PKT_COMPRESSED:
|
1998-05-15 20:49:19 +02:00
|
|
|
if( pkt->pkt.compressed->algorithm < 1
|
|
|
|
|| pkt->pkt.compressed->algorithm > 2 ) {
|
2000-01-27 17:50:45 +01:00
|
|
|
rc = GPGERR_COMPR_ALGO;
|
1998-02-16 21:05:02 +01:00
|
|
|
goto ready;
|
|
|
|
}
|
1999-02-19 15:54:00 +01:00
|
|
|
{
|
2000-01-24 12:55:49 +01:00
|
|
|
compress_filter_context_t *cfx = gcry_xcalloc( 1, sizeof *cfx );
|
1999-02-19 15:54:00 +01:00
|
|
|
cfx->algo = pkt->pkt.compressed->algorithm;
|
|
|
|
pkt->pkt.compressed->buf = NULL;
|
|
|
|
iobuf_push_filter2( a, compress_filter, cfx, 1 );
|
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
free_packet( pkt );
|
|
|
|
init_packet(pkt);
|
|
|
|
break;
|
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
case PKT_PUBLIC_KEY:
|
|
|
|
case PKT_SECRET_KEY:
|
1998-02-16 21:05:02 +01:00
|
|
|
if( in_cert ) { /* store this packet */
|
|
|
|
*pending_pkt = pkt;
|
|
|
|
pkt = NULL;
|
|
|
|
goto ready;
|
|
|
|
}
|
|
|
|
in_cert = 1;
|
|
|
|
default:
|
1998-02-17 21:48:52 +01:00
|
|
|
if( in_cert ) {
|
|
|
|
if( !root )
|
|
|
|
root = new_kbnode( pkt );
|
|
|
|
else
|
|
|
|
add_kbnode( root, new_kbnode( pkt ) );
|
2000-01-24 12:55:49 +01:00
|
|
|
pkt = gcry_xmalloc( sizeof *pkt );
|
1998-02-17 21:48:52 +01:00
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
init_packet(pkt);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ready:
|
|
|
|
if( rc == -1 && root )
|
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
if( rc )
|
|
|
|
release_kbnode( root );
|
|
|
|
else
|
|
|
|
*ret_root = root;
|
|
|
|
free_packet( pkt );
|
2000-01-24 12:55:49 +01:00
|
|
|
gcry_free( pkt );
|
1998-02-16 21:05:02 +01:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Try to import one keyblock. Return an error only in serious cases, but
|
|
|
|
* never for an invalid keyblock. It uses log_error to increase the
|
|
|
|
* internal errorcount, so that invalid input can be detected by programs
|
2000-01-27 17:50:45 +01:00
|
|
|
* which called gpg.
|
1998-02-16 21:05:02 +01:00
|
|
|
*/
|
|
|
|
static int
|
1998-10-25 20:00:01 +01:00
|
|
|
import_one( const char *fname, KBNODE keyblock, int fast )
|
1998-02-16 21:05:02 +01:00
|
|
|
{
|
1998-06-29 14:30:57 +02:00
|
|
|
PKT_public_key *pk;
|
|
|
|
PKT_public_key *pk_orig;
|
1998-02-16 21:05:02 +01:00
|
|
|
KBNODE node, uidnode;
|
1998-02-17 21:48:52 +01:00
|
|
|
KBNODE keyblock_orig = NULL;
|
1998-02-16 21:05:02 +01:00
|
|
|
u32 keyid[2];
|
|
|
|
int rc = 0;
|
1998-08-11 19:29:34 +02:00
|
|
|
int new_key = 0;
|
1998-09-29 18:15:15 +02:00
|
|
|
int mod_key = 0;
|
1998-02-16 21:05:02 +01:00
|
|
|
|
1998-04-14 19:51:16 +02:00
|
|
|
/* get the key and print some info about it */
|
1998-06-29 14:30:57 +02:00
|
|
|
node = find_kbnode( keyblock, PKT_PUBLIC_KEY );
|
|
|
|
if( !node )
|
|
|
|
BUG();
|
1998-02-16 21:05:02 +01:00
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
pk = node->pkt->pkt.public_key;
|
|
|
|
keyid_from_pk( pk, keyid );
|
1998-02-16 21:05:02 +01:00
|
|
|
uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
|
|
|
|
|
|
|
|
if( opt.verbose ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( "pub %4u%c/%08lX %s ",
|
1998-06-29 14:30:57 +02:00
|
|
|
nbits_from_pk( pk ),
|
|
|
|
pubkey_letter( pk->pubkey_algo ),
|
|
|
|
(ulong)keyid[1], datestr_from_pk(pk) );
|
1998-02-16 21:05:02 +01:00
|
|
|
if( uidnode )
|
2000-07-14 19:34:53 +02:00
|
|
|
print_utf8_string( stderr, uidnode->pkt->pkt.user_id->name,
|
|
|
|
uidnode->pkt->pkt.user_id->len );
|
1998-02-16 21:05:02 +01:00
|
|
|
putc('\n', stderr);
|
|
|
|
}
|
|
|
|
if( !uidnode ) {
|
1999-09-01 15:40:07 +02:00
|
|
|
log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]);
|
1998-02-16 21:05:02 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
clear_kbnode_flags( keyblock );
|
1998-06-29 14:30:57 +02:00
|
|
|
rc = chk_self_sigs( fname, keyblock , pk, keyid );
|
1998-02-16 21:05:02 +01:00
|
|
|
if( rc )
|
|
|
|
return rc== -1? 0:rc;
|
1998-02-17 21:48:52 +01:00
|
|
|
|
1999-07-22 20:11:55 +02:00
|
|
|
if( opt.allow_non_selfsigned_uid )
|
|
|
|
mark_non_selfsigned_uids_valid( keyblock, keyid );
|
|
|
|
|
1998-02-16 21:05:02 +01:00
|
|
|
if( !delete_inv_parts( fname, keyblock, keyid ) ) {
|
1998-10-25 20:00:01 +01:00
|
|
|
if( !opt.quiet ) {
|
1999-09-01 15:40:07 +02:00
|
|
|
log_info( _("key %08lX: no valid user IDs\n"),
|
1998-10-25 20:00:01 +01:00
|
|
|
(ulong)keyid[1]);
|
|
|
|
log_info(_("this may be caused by a missing self-signature\n"));
|
|
|
|
}
|
|
|
|
stats.no_user_id++;
|
1998-02-16 21:05:02 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1998-09-29 18:15:15 +02:00
|
|
|
|
1998-02-16 21:05:02 +01:00
|
|
|
/* do we have this key already in one of our pubrings ? */
|
2000-01-24 12:55:49 +01:00
|
|
|
pk_orig = gcry_xcalloc( 1, sizeof *pk_orig );
|
1998-06-29 14:30:57 +02:00
|
|
|
rc = get_pubkey( pk_orig, keyid );
|
2000-01-27 17:50:45 +01:00
|
|
|
if( rc && rc != GPGERR_NO_PUBKEY ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: public key not found: %s\n"),
|
2000-01-27 17:50:45 +01:00
|
|
|
(ulong)keyid[1], gpg_errstr(rc));
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
2000-09-18 16:35:34 +02:00
|
|
|
else if ( rc && opt.merge_only ) {
|
|
|
|
if( opt.verbose )
|
|
|
|
log_info( _("key %08lX: new key - skipped\n"), (ulong)keyid[1] );
|
|
|
|
rc = 0;
|
|
|
|
fast = 1; /* so that we don't get into the trustdb update */
|
|
|
|
stats.skipped_new_keys++;
|
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
else if( rc ) { /* insert this key */
|
2000-10-10 14:58:43 +02:00
|
|
|
#if 0 /* we don't know wehre we are going to write */
|
1998-02-16 21:05:02 +01:00
|
|
|
if( opt.verbose > 1 )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("writing to `%s'\n"),
|
2000-10-10 14:58:43 +02:00
|
|
|
keyblock_resource_name(kbpos) );
|
|
|
|
#endif
|
|
|
|
if( (rc=insert_keyblock( keyblock )) )
|
|
|
|
log_error( _("error writing key: %s\n"), gpg_errstr(rc) );
|
|
|
|
/* we are ready */
|
1998-10-25 20:00:01 +01:00
|
|
|
if( !opt.quiet )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: public key imported\n"), (ulong)keyid[1]);
|
1999-07-14 19:47:23 +02:00
|
|
|
if( is_status_enabled() ) {
|
|
|
|
char *us = get_long_user_id_string( keyid );
|
|
|
|
write_status_text( STATUS_IMPORTED, us );
|
2000-01-24 12:55:49 +01:00
|
|
|
gcry_free(us);
|
1999-07-14 19:47:23 +02:00
|
|
|
}
|
1998-10-25 20:00:01 +01:00
|
|
|
stats.imported++;
|
|
|
|
if( is_RSA( pk->pubkey_algo ) )
|
|
|
|
stats.imported_rsa++;
|
1998-08-11 19:29:34 +02:00
|
|
|
new_key = 1;
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
else { /* merge */
|
1998-05-26 15:38:00 +02:00
|
|
|
int n_uids, n_sigs, n_subk;
|
1998-02-17 21:48:52 +01:00
|
|
|
|
|
|
|
/* Compare the original against the new key; just to be sure nothing
|
|
|
|
* weird is going on */
|
1998-06-29 14:30:57 +02:00
|
|
|
if( cmp_public_keys( pk_orig, pk ) ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: doesn't match our copy\n"),
|
1998-07-08 11:29:43 +02:00
|
|
|
(ulong)keyid[1]);
|
2000-01-27 17:50:45 +01:00
|
|
|
rc = GPGERR_GENERAL;
|
1998-02-17 21:48:52 +01:00
|
|
|
goto leave;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now read the original keyblock */
|
2000-10-06 14:28:44 +02:00
|
|
|
rc = find_keyblock_bypk( &keyblock_orig, pk_orig );
|
1998-02-17 21:48:52 +01:00
|
|
|
if( rc ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: can't locate original keyblock: %s\n"),
|
2000-01-27 17:50:45 +01:00
|
|
|
(ulong)keyid[1], gpg_errstr(rc));
|
1998-02-17 21:48:52 +01:00
|
|
|
goto leave;
|
|
|
|
}
|
1999-05-22 22:54:54 +02:00
|
|
|
|
|
|
|
collapse_uids( &keyblock );
|
1998-02-17 21:48:52 +01:00
|
|
|
/* and try to merge the block */
|
|
|
|
clear_kbnode_flags( keyblock_orig );
|
1999-05-19 16:12:26 +02:00
|
|
|
clear_kbnode_flags( keyblock );
|
1999-05-22 22:54:54 +02:00
|
|
|
n_uids = n_sigs = n_subk = 0;
|
1998-02-17 21:48:52 +01:00
|
|
|
rc = merge_blocks( fname, keyblock_orig, keyblock,
|
1998-05-26 15:38:00 +02:00
|
|
|
keyid, &n_uids, &n_sigs, &n_subk );
|
1998-02-17 21:48:52 +01:00
|
|
|
if( rc )
|
|
|
|
goto leave;
|
1998-05-26 15:38:00 +02:00
|
|
|
if( n_uids || n_sigs || n_subk ) {
|
1998-09-29 18:15:15 +02:00
|
|
|
mod_key = 1;
|
1998-05-26 15:38:00 +02:00
|
|
|
/* keyblock_orig has been updated; write */
|
2000-10-10 14:58:43 +02:00
|
|
|
if( (rc=update_keyblock( keyblock_orig )) )
|
|
|
|
log_error( _("error writing key: %s\n"), gpg_errstr(rc) );
|
1998-02-17 21:48:52 +01:00
|
|
|
/* we are ready */
|
1998-10-25 20:00:01 +01:00
|
|
|
if( !opt.quiet ) {
|
|
|
|
if( n_uids == 1 )
|
1999-09-01 15:40:07 +02:00
|
|
|
log_info( _("key %08lX: 1 new user ID\n"),
|
1998-10-25 20:00:01 +01:00
|
|
|
(ulong)keyid[1]);
|
|
|
|
else if( n_uids )
|
1999-09-01 15:40:07 +02:00
|
|
|
log_info( _("key %08lX: %d new user IDs\n"),
|
1998-10-25 20:00:01 +01:00
|
|
|
(ulong)keyid[1], n_uids );
|
|
|
|
if( n_sigs == 1 )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: 1 new signature\n"),
|
1998-10-25 20:00:01 +01:00
|
|
|
(ulong)keyid[1]);
|
|
|
|
else if( n_sigs )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: %d new signatures\n"),
|
1998-10-25 20:00:01 +01:00
|
|
|
(ulong)keyid[1], n_sigs );
|
|
|
|
if( n_subk == 1 )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: 1 new subkey\n"),
|
1998-10-25 20:00:01 +01:00
|
|
|
(ulong)keyid[1]);
|
|
|
|
else if( n_subk )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: %d new subkeys\n"),
|
1998-10-25 20:00:01 +01:00
|
|
|
(ulong)keyid[1], n_subk );
|
|
|
|
}
|
|
|
|
|
|
|
|
stats.n_uids +=n_uids;
|
|
|
|
stats.n_sigs +=n_sigs;
|
|
|
|
stats.n_subk +=n_subk;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if( !opt.quiet )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: not changed\n"), (ulong)keyid[1] );
|
1998-10-25 20:00:01 +01:00
|
|
|
stats.unchanged++;
|
1998-02-17 21:48:52 +01:00
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
1998-10-25 20:00:01 +01:00
|
|
|
if( !rc && !fast ) {
|
1998-08-11 19:29:34 +02:00
|
|
|
rc = query_trust_record( new_key? pk : pk_orig );
|
1998-07-21 14:53:38 +02:00
|
|
|
if( rc && rc != -1 )
|
2000-01-27 17:50:45 +01:00
|
|
|
log_error("trustdb error: %s\n", gpg_errstr(rc) );
|
1998-08-11 19:29:34 +02:00
|
|
|
else if( rc == -1 ) { /* not found trustdb */
|
1999-07-01 12:53:35 +02:00
|
|
|
rc = insert_trust_record( new_key? keyblock : keyblock_orig );
|
1998-07-21 14:53:38 +02:00
|
|
|
if( rc )
|
|
|
|
log_error("key %08lX: trustdb insert failed: %s\n",
|
2000-01-27 17:50:45 +01:00
|
|
|
(ulong)keyid[1], gpg_errstr(rc) );
|
1998-07-21 14:53:38 +02:00
|
|
|
}
|
1998-09-29 18:15:15 +02:00
|
|
|
else if( mod_key )
|
1998-11-03 20:38:58 +01:00
|
|
|
rc = update_trust_record( keyblock_orig, 1, NULL );
|
1998-09-14 17:49:56 +02:00
|
|
|
else
|
|
|
|
rc = clear_trust_checked_flag( new_key? pk : pk_orig );
|
1998-07-21 14:53:38 +02:00
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
leave:
|
|
|
|
release_kbnode( keyblock_orig );
|
1998-06-29 14:30:57 +02:00
|
|
|
free_public_key( pk_orig );
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Ditto for secret keys. Handling is simpler than for public keys.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
import_secret_one( const char *fname, KBNODE keyblock )
|
|
|
|
{
|
|
|
|
PKT_secret_key *sk;
|
|
|
|
KBNODE node, uidnode;
|
|
|
|
u32 keyid[2];
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
/* get the key and print some info about it */
|
|
|
|
node = find_kbnode( keyblock, PKT_SECRET_KEY );
|
|
|
|
if( !node )
|
|
|
|
BUG();
|
|
|
|
|
|
|
|
sk = node->pkt->pkt.secret_key;
|
|
|
|
keyid_from_sk( sk, keyid );
|
|
|
|
uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
|
|
|
|
|
|
|
|
if( opt.verbose ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( "sec %4u%c/%08lX %s ",
|
1998-06-29 14:30:57 +02:00
|
|
|
nbits_from_sk( sk ),
|
|
|
|
pubkey_letter( sk->pubkey_algo ),
|
|
|
|
(ulong)keyid[1], datestr_from_sk(sk) );
|
|
|
|
if( uidnode )
|
2000-07-14 19:34:53 +02:00
|
|
|
print_utf8_string( stderr, uidnode->pkt->pkt.user_id->name,
|
|
|
|
uidnode->pkt->pkt.user_id->len );
|
1998-06-29 14:30:57 +02:00
|
|
|
putc('\n', stderr);
|
|
|
|
}
|
1998-10-25 20:00:01 +01:00
|
|
|
stats.secret_read++;
|
1998-06-29 14:30:57 +02:00
|
|
|
if( !uidnode ) {
|
1999-09-01 15:40:07 +02:00
|
|
|
log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]);
|
1998-06-29 14:30:57 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
clear_kbnode_flags( keyblock );
|
|
|
|
|
|
|
|
/* do we have this key already in one of our secrings ? */
|
|
|
|
rc = seckey_available( keyid );
|
2000-10-10 14:58:43 +02:00
|
|
|
if( rc == GPGERR_NO_SECKEY && !opt.merge_only ) { /*just insert this key*/
|
|
|
|
if( (rc=insert_keyblock( keyblock )) )
|
|
|
|
log_error( _("error writing key: %s\n"), gpg_errstr(rc) );
|
1998-06-29 14:30:57 +02:00
|
|
|
/* we are ready */
|
1999-04-18 10:18:52 +02:00
|
|
|
if( !opt.quiet )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: secret key imported\n"), (ulong)keyid[1]);
|
1998-10-25 20:00:01 +01:00
|
|
|
stats.secret_imported++;
|
1998-06-29 14:30:57 +02:00
|
|
|
}
|
|
|
|
else if( !rc ) { /* we can't merge secret keys */
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: already in secret keyring\n"),
|
|
|
|
(ulong)keyid[1]);
|
1998-10-25 20:00:01 +01:00
|
|
|
stats.secret_dups++;
|
1998-06-29 14:30:57 +02:00
|
|
|
}
|
|
|
|
else
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: secret key not found: %s\n"),
|
2000-01-27 17:50:45 +01:00
|
|
|
(ulong)keyid[1], gpg_errstr(rc));
|
1998-06-29 14:30:57 +02:00
|
|
|
|
1998-02-16 21:05:02 +01:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
|
1998-02-18 14:58:46 +01:00
|
|
|
/****************
|
1998-04-14 19:51:16 +02:00
|
|
|
* Import a revocation certificate; this is a single signature packet.
|
1998-02-18 14:58:46 +01:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
import_revoke_cert( const char *fname, KBNODE node )
|
|
|
|
{
|
1998-06-29 14:30:57 +02:00
|
|
|
PKT_public_key *pk=NULL;
|
1998-02-18 14:58:46 +01:00
|
|
|
KBNODE onode, keyblock = NULL;
|
|
|
|
u32 keyid[2];
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
assert( !node->next );
|
|
|
|
assert( node->pkt->pkttype == PKT_SIGNATURE );
|
|
|
|
assert( node->pkt->pkt.signature->sig_class == 0x20 );
|
|
|
|
|
|
|
|
keyid[0] = node->pkt->pkt.signature->keyid[0];
|
|
|
|
keyid[1] = node->pkt->pkt.signature->keyid[1];
|
|
|
|
|
2000-01-24 12:55:49 +01:00
|
|
|
pk = gcry_xcalloc( 1, sizeof *pk );
|
1998-06-29 14:30:57 +02:00
|
|
|
rc = get_pubkey( pk, keyid );
|
2000-01-27 17:50:45 +01:00
|
|
|
if( rc == GPGERR_NO_PUBKEY ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: no public key - "
|
1998-07-08 11:29:43 +02:00
|
|
|
"can't apply revocation certificate\n"), (ulong)keyid[1]);
|
1998-02-18 14:58:46 +01:00
|
|
|
rc = 0;
|
|
|
|
goto leave;
|
|
|
|
}
|
|
|
|
else if( rc ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: public key not found: %s\n"),
|
2000-01-27 17:50:45 +01:00
|
|
|
(ulong)keyid[1], gpg_errstr(rc));
|
1998-02-18 14:58:46 +01:00
|
|
|
goto leave;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* read the original keyblock */
|
2000-10-06 14:28:44 +02:00
|
|
|
rc = find_keyblock_bypk( &keyblock, pk );
|
1998-02-18 14:58:46 +01:00
|
|
|
if( rc ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: can't locate original keyblock: %s\n"),
|
2000-01-27 17:50:45 +01:00
|
|
|
(ulong)keyid[1], gpg_errstr(rc));
|
1998-02-18 14:58:46 +01:00
|
|
|
goto leave;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* it is okay, that node is not in keyblock because
|
|
|
|
* check_key_signature works fine for sig_class 0x20 in this
|
|
|
|
* special case. */
|
|
|
|
rc = check_key_signature( keyblock, node, NULL);
|
|
|
|
if( rc ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: invalid revocation certificate"
|
2000-01-27 17:50:45 +01:00
|
|
|
": %s - rejected\n"), (ulong)keyid[1], gpg_errstr(rc));
|
1998-02-18 14:58:46 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-04-14 19:51:16 +02:00
|
|
|
/* check whether we already have this */
|
1998-02-18 14:58:46 +01:00
|
|
|
for(onode=keyblock->next; onode; onode=onode->next ) {
|
|
|
|
if( onode->pkt->pkttype == PKT_USER_ID )
|
|
|
|
break;
|
|
|
|
else if( onode->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& onode->pkt->pkt.signature->sig_class == 0x20
|
|
|
|
&& keyid[0] == onode->pkt->pkt.signature->keyid[0]
|
|
|
|
&& keyid[1] == onode->pkt->pkt.signature->keyid[1] ) {
|
|
|
|
rc = 0;
|
|
|
|
goto leave; /* yes, we already know about it */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* insert it */
|
|
|
|
insert_kbnode( keyblock, clone_kbnode(node), 0 );
|
|
|
|
|
|
|
|
/* and write the keyblock back */
|
2000-10-10 14:58:43 +02:00
|
|
|
if( (rc=update_keyblock( keyblock )) )
|
|
|
|
log_error( _("error writing key: %s\n"), gpg_errstr(rc) );
|
1998-02-18 14:58:46 +01:00
|
|
|
/* we are ready */
|
1998-10-25 20:00:01 +01:00
|
|
|
if( !opt.quiet )
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: revocation certificate imported\n"),
|
1998-07-08 11:29:43 +02:00
|
|
|
(ulong)keyid[1]);
|
1998-10-25 20:00:01 +01:00
|
|
|
stats.n_revoc++;
|
2000-07-14 19:34:53 +02:00
|
|
|
if( clear_trust_checked_flag( pk ) ) {
|
|
|
|
/* seems that we have to insert the record first */
|
|
|
|
rc = insert_trust_record( keyblock );
|
|
|
|
if( rc )
|
|
|
|
log_error("key %08lX: trustdb insert failed: %s\n",
|
|
|
|
(ulong)keyid[1], gpg_errstr(rc) );
|
|
|
|
else
|
|
|
|
rc = clear_trust_checked_flag( pk );
|
|
|
|
}
|
1998-02-18 14:58:46 +01:00
|
|
|
|
|
|
|
leave:
|
|
|
|
release_kbnode( keyblock );
|
1998-06-29 14:30:57 +02:00
|
|
|
free_public_key( pk );
|
1998-02-18 14:58:46 +01:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-02-16 21:05:02 +01:00
|
|
|
/****************
|
1998-04-14 19:51:16 +02:00
|
|
|
* loop over the keyblock and check all self signatures.
|
1998-02-16 21:05:02 +01:00
|
|
|
* Mark all user-ids with a self-signature by setting flag bit 0.
|
|
|
|
* Mark all user-ids with an invalid self-signature by setting bit 1.
|
1999-07-22 20:11:55 +02:00
|
|
|
* This works also for subkeys, here the subkey is marked.
|
1998-02-16 21:05:02 +01:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
chk_self_sigs( const char *fname, KBNODE keyblock,
|
1998-06-29 14:30:57 +02:00
|
|
|
PKT_public_key *pk, u32 *keyid )
|
1998-02-16 21:05:02 +01:00
|
|
|
{
|
1999-01-12 11:20:24 +01:00
|
|
|
KBNODE n;
|
1998-02-16 21:05:02 +01:00
|
|
|
PKT_signature *sig;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
for( n=keyblock; (n = find_next_kbnode(n, 0)); ) {
|
|
|
|
if( n->pkt->pkttype != PKT_SIGNATURE )
|
|
|
|
continue;
|
|
|
|
sig = n->pkt->pkt.signature;
|
|
|
|
if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] ) {
|
1999-01-12 11:20:24 +01:00
|
|
|
if( (sig->sig_class&~3) == 0x10 ) {
|
|
|
|
KBNODE unode = find_prev_kbnode( keyblock, n, PKT_USER_ID );
|
|
|
|
if( !unode ) {
|
1999-09-01 15:40:07 +02:00
|
|
|
log_error( _("key %08lX: no user ID for signature\n"),
|
1999-01-12 11:20:24 +01:00
|
|
|
(ulong)keyid[1]);
|
|
|
|
return -1; /* the complete keyblock is invalid */
|
|
|
|
}
|
|
|
|
rc = check_key_signature( keyblock, n, NULL);
|
|
|
|
if( rc ) {
|
2000-01-27 17:50:45 +01:00
|
|
|
log_info( rc == GPGERR_PUBKEY_ALGO ?
|
1999-01-12 11:20:24 +01:00
|
|
|
_("key %08lX: unsupported public key algorithm\n"):
|
|
|
|
_("key %08lX: invalid self-signature\n"),
|
|
|
|
(ulong)keyid[1]);
|
|
|
|
|
|
|
|
unode->flag |= 2; /* mark as invalid */
|
|
|
|
}
|
|
|
|
unode->flag |= 1; /* mark that signature checked */
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
1999-01-12 11:20:24 +01:00
|
|
|
else if( sig->sig_class == 0x18 ) {
|
|
|
|
KBNODE knode = find_prev_kbnode( keyblock,
|
|
|
|
n, PKT_PUBLIC_SUBKEY );
|
|
|
|
if( !knode )
|
|
|
|
knode = find_prev_kbnode( keyblock,
|
|
|
|
n, PKT_SECRET_SUBKEY );
|
|
|
|
|
1999-07-22 20:11:55 +02:00
|
|
|
if( !knode ) {
|
1999-08-30 20:48:57 +02:00
|
|
|
log_info( _("key %08lX: no subkey for key binding\n"),
|
1999-01-12 11:20:24 +01:00
|
|
|
(ulong)keyid[1]);
|
1999-02-19 15:54:00 +01:00
|
|
|
n->flag |= 4; /* delete this */
|
1999-01-12 11:20:24 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rc = check_key_signature( keyblock, n, NULL);
|
|
|
|
if( rc ) {
|
2000-01-27 17:50:45 +01:00
|
|
|
log_info( rc == GPGERR_PUBKEY_ALGO ?
|
1999-01-12 11:20:24 +01:00
|
|
|
_("key %08lX: unsupported public key algorithm\n"):
|
|
|
|
_("key %08lX: invalid subkey binding\n"),
|
|
|
|
(ulong)keyid[1]);
|
|
|
|
|
|
|
|
knode->flag |= 2; /* mark as invalid */
|
|
|
|
}
|
1999-02-19 15:54:00 +01:00
|
|
|
knode->flag |= 1; /* mark that signature checked */
|
1999-01-12 11:20:24 +01:00
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-01-19 19:54:44 +01:00
|
|
|
return 0;
|
1998-01-16 22:15:24 +01:00
|
|
|
}
|
|
|
|
|
1999-07-22 20:11:55 +02:00
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* If a user ID has at least one signature, mark it as valid
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
mark_non_selfsigned_uids_valid( KBNODE keyblock, u32 *kid )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
for(node=keyblock->next; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID && !(node->flag & 1) ) {
|
2000-07-14 19:34:53 +02:00
|
|
|
if( (node->next && node->next->pkt->pkttype == PKT_SIGNATURE)
|
|
|
|
|| !node->next ) {
|
1999-07-22 20:11:55 +02:00
|
|
|
node->flag |= 1;
|
1999-09-01 15:40:07 +02:00
|
|
|
log_info( _("key %08lX: accepted non self-signed user ID '"),
|
1999-07-22 20:11:55 +02:00
|
|
|
(ulong)kid[1]);
|
|
|
|
print_string( log_stream(), node->pkt->pkt.user_id->name,
|
|
|
|
node->pkt->pkt.user_id->len, 0 );
|
|
|
|
fputs("'\n", log_stream() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-02-16 21:05:02 +01:00
|
|
|
/****************
|
1998-04-14 19:51:16 +02:00
|
|
|
* delete all parts which are invalid and those signatures whose
|
|
|
|
* public key algorithm is not available in this implemenation;
|
1998-02-17 21:48:52 +01:00
|
|
|
* but consider RSA as valid, because parse/build_packets knows
|
|
|
|
* about it.
|
1998-02-16 21:05:02 +01:00
|
|
|
* returns: true if at least one valid user-id is left over.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
1998-02-18 14:58:46 +01:00
|
|
|
int nvalid=0, uid_seen=0;
|
1999-03-11 16:42:06 +01:00
|
|
|
const char *p;
|
1998-01-16 22:15:24 +01:00
|
|
|
|
1998-02-16 21:05:02 +01:00
|
|
|
for(node=keyblock->next; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
1998-02-18 14:58:46 +01:00
|
|
|
uid_seen = 1;
|
1998-02-16 21:05:02 +01:00
|
|
|
if( (node->flag & 2) || !(node->flag & 1) ) {
|
1998-02-17 21:48:52 +01:00
|
|
|
if( opt.verbose ) {
|
1999-09-01 15:40:07 +02:00
|
|
|
log_info( _("key %08lX: skipped user ID '"),
|
1998-07-08 11:29:43 +02:00
|
|
|
(ulong)keyid[1]);
|
2000-07-14 19:34:53 +02:00
|
|
|
print_utf8_string( stderr, node->pkt->pkt.user_id->name,
|
|
|
|
node->pkt->pkt.user_id->len );
|
1998-02-17 21:48:52 +01:00
|
|
|
fputs("'\n", stderr );
|
|
|
|
}
|
1998-02-16 21:05:02 +01:00
|
|
|
delete_kbnode( node ); /* the user-id */
|
|
|
|
/* and all following packets up to the next user-id */
|
1999-04-07 20:58:34 +02:00
|
|
|
while( node->next
|
|
|
|
&& node->next->pkt->pkttype != PKT_USER_ID
|
|
|
|
&& node->next->pkt->pkttype != PKT_PUBLIC_SUBKEY
|
|
|
|
&& node->next->pkt->pkttype != PKT_SECRET_SUBKEY ){
|
1998-02-16 21:05:02 +01:00
|
|
|
delete_kbnode( node->next );
|
|
|
|
node = node->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
nvalid++;
|
|
|
|
}
|
1999-01-12 11:20:24 +01:00
|
|
|
else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
|
|
|
if( (node->flag & 2) || !(node->flag & 1) ) {
|
|
|
|
if( opt.verbose ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: skipped subkey\n"),
|
1999-01-12 11:20:24 +01:00
|
|
|
(ulong)keyid[1]);
|
|
|
|
}
|
|
|
|
delete_kbnode( node ); /* the subkey */
|
|
|
|
/* and all following signature packets */
|
|
|
|
while( node->next
|
|
|
|
&& node->next->pkt->pkttype == PKT_SIGNATURE ) {
|
|
|
|
delete_kbnode( node->next );
|
|
|
|
node = node->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
else if( node->pkt->pkttype == PKT_SIGNATURE
|
2000-07-14 19:34:53 +02:00
|
|
|
&& openpgp_pk_test_algo( node->pkt->pkt.signature->pubkey_algo, 0 )
|
1999-11-13 17:43:23 +01:00
|
|
|
&& node->pkt->pkt.signature->pubkey_algo != GCRY_PK_RSA )
|
1998-02-17 21:48:52 +01:00
|
|
|
delete_kbnode( node ); /* build_packet() can't handle this */
|
1999-03-11 16:42:06 +01:00
|
|
|
else if( node->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& (p = parse_sig_subpkt2( node->pkt->pkt.signature,
|
|
|
|
SIGSUBPKT_EXPORTABLE, NULL ))
|
1999-04-06 20:04:55 +02:00
|
|
|
&& !*p
|
|
|
|
&& seckey_available( node->pkt->pkt.signature->keyid ) ) {
|
|
|
|
/* here we violate the rfc a bit by still allowing
|
|
|
|
* to import non-exportable signature when we have the
|
|
|
|
* the secret key used to create this signature - it
|
|
|
|
* seems that this makes sense */
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: non exportable signature "
|
1999-03-11 16:42:06 +01:00
|
|
|
"(class %02x) - skipped\n"),
|
|
|
|
(ulong)keyid[1],
|
|
|
|
node->pkt->pkt.signature->sig_class );
|
|
|
|
delete_kbnode( node );
|
|
|
|
}
|
1998-02-18 14:58:46 +01:00
|
|
|
else if( node->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& node->pkt->pkt.signature->sig_class == 0x20 ) {
|
|
|
|
if( uid_seen ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: revocation certificate "
|
1998-09-28 21:25:31 +02:00
|
|
|
"at wrong place - skipped\n"),
|
|
|
|
(ulong)keyid[1]);
|
1998-02-18 14:58:46 +01:00
|
|
|
delete_kbnode( node );
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int rc = check_key_signature( keyblock, node, NULL);
|
|
|
|
if( rc ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: invalid revocation "
|
1998-09-28 21:25:31 +02:00
|
|
|
"certificate: %s - skipped\n"),
|
2000-01-27 17:50:45 +01:00
|
|
|
(ulong)keyid[1], gpg_errstr(rc));
|
1998-02-18 14:58:46 +01:00
|
|
|
delete_kbnode( node );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1999-02-19 15:54:00 +01:00
|
|
|
else if( (node->flag & 4) ) /* marked for deletion */
|
|
|
|
delete_kbnode( node );
|
1998-02-16 21:05:02 +01:00
|
|
|
}
|
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
/* note: because keyblock is the public key, it is never marked
|
|
|
|
* for deletion and so keyblock cannot change */
|
1998-02-16 21:05:02 +01:00
|
|
|
commit_kbnode( &keyblock );
|
|
|
|
return nvalid;
|
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
|
|
|
|
|
1999-05-19 16:12:26 +02:00
|
|
|
/****************
|
|
|
|
* It may happen that the imported keyblock has duplicated user IDs.
|
|
|
|
* We check this here and collapse those user IDs together with their
|
|
|
|
* sigs into one.
|
1999-05-22 22:54:54 +02:00
|
|
|
* Returns: True if the keyblock hash changed.
|
1999-05-19 16:12:26 +02:00
|
|
|
*/
|
1999-05-22 22:54:54 +02:00
|
|
|
int
|
|
|
|
collapse_uids( KBNODE *keyblock )
|
1999-05-19 16:12:26 +02:00
|
|
|
{
|
1999-05-22 22:54:54 +02:00
|
|
|
KBNODE n, n2;
|
|
|
|
int in_uid;
|
|
|
|
int any=0;
|
|
|
|
u32 kid1;
|
1999-05-19 16:12:26 +02:00
|
|
|
|
1999-05-22 22:54:54 +02:00
|
|
|
restart:
|
|
|
|
for( n = *keyblock; n; n = n->next ) {
|
|
|
|
if( n->pkt->pkttype != PKT_USER_ID )
|
|
|
|
continue;
|
|
|
|
for( n2 = n->next; n2; n2 = n2->next ) {
|
|
|
|
if( n2->pkt->pkttype == PKT_USER_ID
|
|
|
|
&& !cmp_user_ids( n->pkt->pkt.user_id,
|
|
|
|
n2->pkt->pkt.user_id ) ) {
|
|
|
|
/* found a duplicate */
|
|
|
|
any = 1;
|
|
|
|
if( !n2->next
|
|
|
|
|| n2->next->pkt->pkttype == PKT_USER_ID
|
|
|
|
|| n2->next->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| n2->next->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
|
|
|
/* no more signatures: delete the user ID
|
|
|
|
* and start over */
|
|
|
|
remove_kbnode( keyblock, n2 );
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* The simple approach: Move one signature and
|
|
|
|
* then start over to delete the next one :-( */
|
|
|
|
move_kbnode( keyblock, n2->next, n->next );
|
1999-05-19 16:12:26 +02:00
|
|
|
}
|
1999-05-22 22:54:54 +02:00
|
|
|
goto restart;
|
1999-05-19 16:12:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1999-05-22 22:54:54 +02:00
|
|
|
if( !any )
|
|
|
|
return 0;
|
1999-05-19 16:12:26 +02:00
|
|
|
|
1999-05-22 22:54:54 +02:00
|
|
|
restart_sig:
|
|
|
|
/* now we may have duplicate signatures on one user ID: fix this */
|
|
|
|
for( in_uid = 0, n = *keyblock; n; n = n->next ) {
|
|
|
|
if( n->pkt->pkttype == PKT_USER_ID )
|
|
|
|
in_uid = 1;
|
|
|
|
else if( n->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| n->pkt->pkttype == PKT_SECRET_SUBKEY )
|
|
|
|
in_uid = 0;
|
|
|
|
else if( in_uid ) {
|
|
|
|
n2 = n;
|
|
|
|
do {
|
|
|
|
KBNODE ncmp = NULL;
|
|
|
|
for( ; n2; n2 = n2->next ) {
|
|
|
|
if( n2->pkt->pkttype == PKT_USER_ID
|
|
|
|
|| n2->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| n2->pkt->pkttype == PKT_SECRET_SUBKEY )
|
|
|
|
break;
|
|
|
|
if( n2->pkt->pkttype != PKT_SIGNATURE )
|
|
|
|
;
|
|
|
|
else if( !ncmp )
|
|
|
|
ncmp = n2;
|
|
|
|
else if( !cmp_signatures( ncmp->pkt->pkt.signature,
|
|
|
|
n2->pkt->pkt.signature )) {
|
|
|
|
remove_kbnode( keyblock, n2 );
|
|
|
|
goto restart_sig;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
n2 = ncmp? ncmp->next : NULL;
|
|
|
|
} while( n2 );
|
|
|
|
}
|
|
|
|
}
|
1999-05-19 16:12:26 +02:00
|
|
|
|
1999-05-22 22:54:54 +02:00
|
|
|
if( (n = find_kbnode( *keyblock, PKT_PUBLIC_KEY )) )
|
|
|
|
kid1 = keyid_from_pk( n->pkt->pkt.public_key, NULL );
|
|
|
|
else if( (n = find_kbnode( *keyblock, PKT_SECRET_KEY )) )
|
|
|
|
kid1 = keyid_from_sk( n->pkt->pkt.secret_key, NULL );
|
|
|
|
else
|
|
|
|
kid1 = 0;
|
|
|
|
log_info(_("key %08lX: duplicated user ID detected - merged\n"),
|
|
|
|
(ulong)kid1);
|
1999-05-19 16:12:26 +02:00
|
|
|
|
1999-05-22 22:54:54 +02:00
|
|
|
return 1;
|
1999-05-19 16:12:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
/****************
|
|
|
|
* compare and merge the blocks
|
|
|
|
*
|
|
|
|
* o compare the signatures: If we already have this signature, check
|
|
|
|
* that they compare okay; if not, issue a warning and ask the user.
|
|
|
|
* o Simply add the signature. Can't verify here because we may not have
|
1998-04-14 19:51:16 +02:00
|
|
|
* the signature's public key yet; verification is done when putting it
|
1998-02-17 21:48:52 +01:00
|
|
|
* into the trustdb, which is done automagically as soon as this pubkey
|
|
|
|
* is used.
|
|
|
|
* Note: We indicate newly inserted packets with flag bit 0
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock,
|
1998-05-26 15:38:00 +02:00
|
|
|
u32 *keyid, int *n_uids, int *n_sigs, int *n_subk )
|
1998-02-17 21:48:52 +01:00
|
|
|
{
|
1998-02-18 14:58:46 +01:00
|
|
|
KBNODE onode, node;
|
|
|
|
int rc, found;
|
|
|
|
|
|
|
|
/* 1st: handle revocation certificates */
|
|
|
|
for(node=keyblock->next; node; node=node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID )
|
|
|
|
break;
|
|
|
|
else if( node->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& node->pkt->pkt.signature->sig_class == 0x20 ) {
|
1998-04-14 19:51:16 +02:00
|
|
|
/* check whether we already have this */
|
1998-02-18 14:58:46 +01:00
|
|
|
found = 0;
|
|
|
|
for(onode=keyblock_orig->next; onode; onode=onode->next ) {
|
|
|
|
if( onode->pkt->pkttype == PKT_USER_ID )
|
|
|
|
break;
|
|
|
|
else if( onode->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& onode->pkt->pkt.signature->sig_class == 0x20
|
|
|
|
&& node->pkt->pkt.signature->keyid[0]
|
|
|
|
== onode->pkt->pkt.signature->keyid[0]
|
|
|
|
&& node->pkt->pkt.signature->keyid[1]
|
|
|
|
== onode->pkt->pkt.signature->keyid[1] ) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !found ) {
|
|
|
|
KBNODE n2 = clone_kbnode(node);
|
|
|
|
insert_kbnode( keyblock_orig, n2, 0 );
|
|
|
|
n2->flag |= 1;
|
1999-05-22 22:54:54 +02:00
|
|
|
log_info( _("key %08lX: revocation certificate added\n"),
|
1998-07-08 11:29:43 +02:00
|
|
|
(ulong)keyid[1]);
|
1998-02-18 14:58:46 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
|
1998-12-08 13:20:53 +01:00
|
|
|
/* 2nd: try to merge new certificates in */
|
1998-02-18 14:58:46 +01:00
|
|
|
for(onode=keyblock_orig->next; onode; onode=onode->next ) {
|
|
|
|
if( !(onode->flag & 1) && onode->pkt->pkttype == PKT_USER_ID) {
|
1998-02-17 21:48:52 +01:00
|
|
|
/* find the user id in the imported keyblock */
|
|
|
|
for(node=keyblock->next; node; node=node->next )
|
1998-12-08 13:20:53 +01:00
|
|
|
if( node->pkt->pkttype == PKT_USER_ID
|
1998-02-18 14:58:46 +01:00
|
|
|
&& !cmp_user_ids( onode->pkt->pkt.user_id,
|
1998-02-17 21:48:52 +01:00
|
|
|
node->pkt->pkt.user_id ) )
|
|
|
|
break;
|
|
|
|
if( node ) { /* found: merge */
|
1998-02-18 14:58:46 +01:00
|
|
|
rc = merge_sigs( onode, node, n_sigs, fname, keyid );
|
1998-02-17 21:48:52 +01:00
|
|
|
if( rc )
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-02-18 14:58:46 +01:00
|
|
|
/* 3rd: add new user-ids */
|
1998-02-17 21:48:52 +01:00
|
|
|
for(node=keyblock->next; node; node=node->next ) {
|
1998-12-08 13:20:53 +01:00
|
|
|
if( node->pkt->pkttype == PKT_USER_ID) {
|
1998-02-17 21:48:52 +01:00
|
|
|
/* do we have this in the original keyblock */
|
1998-02-18 14:58:46 +01:00
|
|
|
for(onode=keyblock_orig->next; onode; onode=onode->next )
|
1998-12-08 13:20:53 +01:00
|
|
|
if( onode->pkt->pkttype == PKT_USER_ID
|
|
|
|
&& !cmp_user_ids( onode->pkt->pkt.user_id,
|
|
|
|
node->pkt->pkt.user_id ) )
|
1998-02-17 21:48:52 +01:00
|
|
|
break;
|
1998-12-08 13:20:53 +01:00
|
|
|
if( !onode ) { /* this is a new user id: append */
|
1998-02-17 21:48:52 +01:00
|
|
|
rc = append_uid( keyblock_orig, node, n_sigs, fname, keyid);
|
|
|
|
if( rc )
|
|
|
|
return rc;
|
|
|
|
++*n_uids;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-12-08 13:20:53 +01:00
|
|
|
/* add new subkeys */
|
|
|
|
for(node=keyblock->next; node; node=node->next ) {
|
|
|
|
onode = NULL;
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
|
|
|
|
/* do we have this in the original keyblock? */
|
|
|
|
for(onode=keyblock_orig->next; onode; onode=onode->next )
|
|
|
|
if( onode->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
&& !cmp_public_keys( onode->pkt->pkt.public_key,
|
|
|
|
node->pkt->pkt.public_key ) )
|
|
|
|
break;
|
|
|
|
if( !onode ) { /* this is a new subkey: append */
|
|
|
|
rc = append_key( keyblock_orig, node, n_sigs, fname, keyid);
|
|
|
|
if( rc )
|
|
|
|
return rc;
|
|
|
|
++*n_subk;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if( node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
|
|
|
/* do we have this in the original keyblock? */
|
|
|
|
for(onode=keyblock_orig->next; onode; onode=onode->next )
|
|
|
|
if( onode->pkt->pkttype == PKT_SECRET_SUBKEY
|
|
|
|
&& !cmp_secret_keys( onode->pkt->pkt.secret_key,
|
|
|
|
node->pkt->pkt.secret_key ) )
|
|
|
|
break;
|
|
|
|
if( !onode ) { /* this is a new subkey: append */
|
|
|
|
rc = append_key( keyblock_orig, node, n_sigs, fname, keyid);
|
|
|
|
if( rc )
|
|
|
|
return rc;
|
|
|
|
++*n_subk;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-05-26 15:38:00 +02:00
|
|
|
|
1999-09-02 16:50:38 +02:00
|
|
|
/* merge subkey certificates */
|
|
|
|
for(onode=keyblock_orig->next; onode; onode=onode->next ) {
|
|
|
|
if( !(onode->flag & 1)
|
|
|
|
&& ( onode->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| onode->pkt->pkttype == PKT_SECRET_SUBKEY) ) {
|
|
|
|
/* find the subkey in the imported keyblock */
|
|
|
|
for(node=keyblock->next; node; node=node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
&& !cmp_public_keys( onode->pkt->pkt.public_key,
|
|
|
|
node->pkt->pkt.public_key ) )
|
|
|
|
break;
|
|
|
|
else if( node->pkt->pkttype == PKT_SECRET_SUBKEY
|
|
|
|
&& !cmp_secret_keys( onode->pkt->pkt.secret_key,
|
|
|
|
node->pkt->pkt.secret_key ) )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( node ) { /* found: merge */
|
|
|
|
rc = merge_keysigs( onode, node, n_sigs, fname, keyid );
|
|
|
|
if( rc )
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* append the userid starting with NODE and all signatures to KEYBLOCK.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
append_uid( KBNODE keyblock, KBNODE node, int *n_sigs,
|
|
|
|
const char *fname, u32 *keyid )
|
|
|
|
{
|
1998-12-08 13:20:53 +01:00
|
|
|
KBNODE n, n_where=NULL;
|
1998-02-17 21:48:52 +01:00
|
|
|
|
|
|
|
assert(node->pkt->pkttype == PKT_USER_ID );
|
1999-09-17 12:58:20 +02:00
|
|
|
if( !node->next || node->next->pkt->pkttype == PKT_USER_ID ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: our copy has no self-signature\n"),
|
1998-09-28 21:25:31 +02:00
|
|
|
(ulong)keyid[1]);
|
2000-01-27 17:50:45 +01:00
|
|
|
return GPGERR_GENERAL;
|
1998-02-17 21:48:52 +01:00
|
|
|
}
|
|
|
|
|
1998-12-08 13:20:53 +01:00
|
|
|
/* find the position */
|
|
|
|
for( n = keyblock; n; n_where = n, n = n->next ) {
|
|
|
|
if( n->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| n->pkt->pkttype == PKT_SECRET_SUBKEY )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( !n )
|
|
|
|
n_where = NULL;
|
|
|
|
|
|
|
|
/* and append/insert */
|
|
|
|
while( node ) {
|
1998-02-17 21:48:52 +01:00
|
|
|
/* we add a clone to the original keyblock, because this
|
|
|
|
* one is released first */
|
|
|
|
n = clone_kbnode(node);
|
1998-12-08 13:20:53 +01:00
|
|
|
if( n_where ) {
|
|
|
|
insert_kbnode( n_where, n, 0 );
|
|
|
|
n_where = n;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
add_kbnode( keyblock, n );
|
1998-02-17 21:48:52 +01:00
|
|
|
n->flag |= 1;
|
1998-12-08 13:20:53 +01:00
|
|
|
node->flag |= 1;
|
1998-02-17 21:48:52 +01:00
|
|
|
if( n->pkt->pkttype == PKT_SIGNATURE )
|
|
|
|
++*n_sigs;
|
1998-12-08 13:20:53 +01:00
|
|
|
|
|
|
|
node = node->next;
|
|
|
|
if( node && node->pkt->pkttype != PKT_SIGNATURE )
|
|
|
|
break;
|
1998-02-17 21:48:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Merge the sigs from SRC onto DST. SRC and DST are both a PKT_USER_ID.
|
|
|
|
* (how should we handle comment packets here?)
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
merge_sigs( KBNODE dst, KBNODE src, int *n_sigs,
|
|
|
|
const char *fname, u32 *keyid )
|
|
|
|
{
|
|
|
|
KBNODE n, n2;
|
|
|
|
int found=0;
|
|
|
|
|
|
|
|
assert(dst->pkt->pkttype == PKT_USER_ID );
|
|
|
|
assert(src->pkt->pkttype == PKT_USER_ID );
|
1999-09-17 12:58:20 +02:00
|
|
|
if( !dst->next || dst->next->pkt->pkttype == PKT_USER_ID ) {
|
1999-05-22 22:54:54 +02:00
|
|
|
log_error( _("key %08lX: our copy has no self-signature\n"),
|
1998-07-08 11:29:43 +02:00
|
|
|
(ulong)keyid[1]);
|
1998-02-17 21:48:52 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for(n=src->next; n && n->pkt->pkttype != PKT_USER_ID; n = n->next ) {
|
|
|
|
if( n->pkt->pkttype != PKT_SIGNATURE )
|
|
|
|
continue;
|
1999-09-02 16:50:38 +02:00
|
|
|
if( n->pkt->pkt.signature->sig_class == 0x18
|
|
|
|
|| n->pkt->pkt.signature->sig_class == 0x28 )
|
|
|
|
continue; /* skip signatures which are only valid on subkeys */
|
1998-02-17 21:48:52 +01:00
|
|
|
found = 0;
|
1998-12-08 13:20:53 +01:00
|
|
|
for(n2=dst->next; n2 && n2->pkt->pkttype != PKT_USER_ID; n2 = n2->next){
|
1998-02-17 21:48:52 +01:00
|
|
|
if( n2->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& n->pkt->pkt.signature->keyid[0]
|
|
|
|
== n2->pkt->pkt.signature->keyid[0]
|
|
|
|
&& n->pkt->pkt.signature->keyid[1]
|
1998-12-08 13:20:53 +01:00
|
|
|
== n2->pkt->pkt.signature->keyid[1]
|
|
|
|
&& n->pkt->pkt.signature->timestamp
|
|
|
|
<= n2->pkt->pkt.signature->timestamp
|
|
|
|
&& n->pkt->pkt.signature->sig_class
|
|
|
|
== n2->pkt->pkt.signature->sig_class ) {
|
|
|
|
found++;
|
|
|
|
break;
|
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
}
|
1998-12-08 13:20:53 +01:00
|
|
|
if( !found ) {
|
|
|
|
/* This signature is new or newer, append N to DST.
|
|
|
|
* We add a clone to the original keyblock, because this
|
|
|
|
* one is released first */
|
|
|
|
n2 = clone_kbnode(n);
|
|
|
|
insert_kbnode( dst, n2, PKT_SIGNATURE );
|
|
|
|
n2->flag |= 1;
|
|
|
|
n->flag |= 1;
|
|
|
|
++*n_sigs;
|
|
|
|
}
|
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
|
1998-12-08 13:20:53 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Merge the sigs from SRC onto DST. SRC and DST are both a PKT_xxx_SUBKEY.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
merge_keysigs( KBNODE dst, KBNODE src, int *n_sigs,
|
|
|
|
const char *fname, u32 *keyid )
|
|
|
|
{
|
|
|
|
KBNODE n, n2;
|
|
|
|
int found=0;
|
|
|
|
|
|
|
|
assert( dst->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| dst->pkt->pkttype == PKT_SECRET_SUBKEY );
|
|
|
|
|
|
|
|
for(n=src->next; n ; n = n->next ) {
|
|
|
|
if( n->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| n->pkt->pkttype == PKT_PUBLIC_KEY )
|
|
|
|
break;
|
|
|
|
if( n->pkt->pkttype != PKT_SIGNATURE )
|
1998-02-17 21:48:52 +01:00
|
|
|
continue;
|
1998-12-08 13:20:53 +01:00
|
|
|
found = 0;
|
|
|
|
for(n2=dst->next; n2; n2 = n2->next){
|
|
|
|
if( n2->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| n2->pkt->pkttype == PKT_PUBLIC_KEY )
|
|
|
|
break;
|
|
|
|
if( n2->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& n->pkt->pkt.signature->keyid[0]
|
|
|
|
== n2->pkt->pkt.signature->keyid[0]
|
|
|
|
&& n->pkt->pkt.signature->keyid[1]
|
|
|
|
== n2->pkt->pkt.signature->keyid[1]
|
|
|
|
&& n->pkt->pkt.signature->timestamp
|
|
|
|
<= n2->pkt->pkt.signature->timestamp
|
|
|
|
&& n->pkt->pkt.signature->sig_class
|
|
|
|
== n2->pkt->pkt.signature->sig_class ) {
|
|
|
|
found++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !found ) {
|
|
|
|
/* This signature is new or newer, append N to DST.
|
|
|
|
* We add a clone to the original keyblock, because this
|
|
|
|
* one is released first */
|
|
|
|
n2 = clone_kbnode(n);
|
|
|
|
insert_kbnode( dst, n2, PKT_SIGNATURE );
|
|
|
|
n2->flag |= 1;
|
|
|
|
n->flag |= 1;
|
|
|
|
++*n_sigs;
|
1998-02-17 21:48:52 +01:00
|
|
|
}
|
1998-12-08 13:20:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
1998-02-17 21:48:52 +01:00
|
|
|
|
1998-12-08 13:20:53 +01:00
|
|
|
/****************
|
|
|
|
* append the subkey starting with NODE and all signatures to KEYBLOCK.
|
|
|
|
* Mark all new and copied packets by setting flag bit 0.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
append_key( KBNODE keyblock, KBNODE node, int *n_sigs,
|
|
|
|
const char *fname, u32 *keyid )
|
|
|
|
{
|
|
|
|
KBNODE n;
|
|
|
|
|
|
|
|
assert( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| node->pkt->pkttype == PKT_SECRET_SUBKEY );
|
|
|
|
|
|
|
|
while( node ) {
|
|
|
|
/* we add a clone to the original keyblock, because this
|
1998-02-17 21:48:52 +01:00
|
|
|
* one is released first */
|
1998-12-08 13:20:53 +01:00
|
|
|
n = clone_kbnode(node);
|
|
|
|
add_kbnode( keyblock, n );
|
1998-02-17 21:48:52 +01:00
|
|
|
n->flag |= 1;
|
1998-12-08 13:20:53 +01:00
|
|
|
node->flag |= 1;
|
|
|
|
if( n->pkt->pkttype == PKT_SIGNATURE )
|
|
|
|
++*n_sigs;
|
|
|
|
|
|
|
|
node = node->next;
|
|
|
|
if( node && node->pkt->pkttype != PKT_SIGNATURE )
|
|
|
|
break;
|
1998-02-17 21:48:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|