1997-12-12 13:03:58 +01:00
|
|
|
|
/* ringedit.c - Function for key ring editing
|
1998-02-24 19:50:46 +01:00
|
|
|
|
* Copyright (C) 1998 Free Software Foundation, Inc.
|
1997-12-12 13:03:58 +01:00
|
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
|
* This file is part of GnuPG.
|
1997-12-12 13:03:58 +01:00
|
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
1997-12-12 13:03:58 +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,
|
1997-12-12 13:03:58 +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
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* This module supplies function for:
|
|
|
|
|
*
|
|
|
|
|
* - Search for a key block (pubkey and all other stuff) and return a
|
|
|
|
|
* handle for it.
|
|
|
|
|
*
|
|
|
|
|
* - Lock/Unlock a key block
|
|
|
|
|
*
|
|
|
|
|
* - Read a key block into a tree
|
|
|
|
|
*
|
|
|
|
|
* - Update a key block
|
|
|
|
|
*
|
|
|
|
|
* - Insert a new key block
|
|
|
|
|
*
|
|
|
|
|
* - Delete a key block
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
1998-02-11 04:25:44 +01:00
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/stat.h>
|
1998-10-16 18:00:17 +02:00
|
|
|
|
#include <unistd.h> /* for truncate */
|
1997-12-12 13:03:58 +01:00
|
|
|
|
#include <assert.h>
|
1998-10-17 16:47:14 +02:00
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
#include <gdbm.h>
|
|
|
|
|
#endif
|
1997-12-12 13:03:58 +01:00
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "packet.h"
|
|
|
|
|
#include "memory.h"
|
|
|
|
|
#include "mpi.h"
|
|
|
|
|
#include "iobuf.h"
|
|
|
|
|
#include "keydb.h"
|
1998-10-21 19:34:36 +02:00
|
|
|
|
#include "host2net.h"
|
1998-10-16 18:00:17 +02:00
|
|
|
|
#include "options.h"
|
1998-10-25 20:00:01 +01:00
|
|
|
|
#include "main.h"
|
1998-08-07 10:53:38 +02:00
|
|
|
|
#include "i18n.h"
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-10-18 17:21:22 +02:00
|
|
|
|
|
1999-09-06 20:10:27 +02:00
|
|
|
|
#ifdef MKDIR_TAKES_ONE_ARG
|
|
|
|
|
# undef mkdir
|
|
|
|
|
# define mkdir(a,b) mkdir(a)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
struct resource_table_struct {
|
|
|
|
|
int used;
|
1998-01-06 22:01:36 +01:00
|
|
|
|
int secret; /* this is a secret keyring */
|
1997-12-12 13:03:58 +01:00
|
|
|
|
char *fname;
|
|
|
|
|
IOBUF iobuf;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
GDBM_FILE dbf;
|
|
|
|
|
#endif
|
|
|
|
|
enum resource_type rt;
|
1999-02-10 17:22:40 +01:00
|
|
|
|
DOTLOCK lockhd;
|
|
|
|
|
int is_locked;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
};
|
1997-12-16 20:15:09 +01:00
|
|
|
|
typedef struct resource_table_struct RESTBL;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
#define MAX_RESOURCES 10
|
1997-12-16 20:15:09 +01:00
|
|
|
|
static RESTBL resource_table[MAX_RESOURCES];
|
1999-02-26 17:59:48 +01:00
|
|
|
|
static int default_public_resource;
|
|
|
|
|
static int default_secret_resource;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-01-16 22:15:24 +01:00
|
|
|
|
static int search( PACKET *pkt, KBPOS *kbpos, int secret );
|
|
|
|
|
|
|
|
|
|
|
1998-02-27 18:51:28 +01:00
|
|
|
|
static int keyring_search( PACKET *pkt, KBPOS *kbpos, IOBUF iobuf,
|
|
|
|
|
const char *fname );
|
1997-12-12 13:03:58 +01:00
|
|
|
|
static int keyring_read( KBPOS *kbpos, KBNODE *ret_root );
|
1998-03-19 16:27:29 +01:00
|
|
|
|
static int keyring_enum( KBPOS *kbpos, KBNODE *ret_root, int skipsigs );
|
1998-02-11 04:25:44 +01:00
|
|
|
|
static int keyring_copy( KBPOS *kbpos, int mode, KBNODE root );
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
static int do_gdbm_store( KBPOS *kbpos, KBNODE root, int update );
|
|
|
|
|
static int do_gdbm_locate( GDBM_FILE dbf, KBPOS *kbpos,
|
|
|
|
|
const byte *fpr, int fprlen );
|
|
|
|
|
static int do_gdbm_locate_by_keyid( GDBM_FILE dbf, KBPOS *kbpos, u32 *keyid );
|
|
|
|
|
static int do_gdbm_read( KBPOS *kbpos, KBNODE *ret_root );
|
|
|
|
|
static int do_gdbm_enum( KBPOS *kbpos, KBNODE *ret_root );
|
|
|
|
|
#endif
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
|
1997-12-16 20:15:09 +01:00
|
|
|
|
static RESTBL *
|
1997-12-12 13:03:58 +01:00
|
|
|
|
check_pos( KBPOS *kbpos )
|
|
|
|
|
{
|
|
|
|
|
if( kbpos->resno < 0 || kbpos->resno >= MAX_RESOURCES )
|
1997-12-16 20:15:09 +01:00
|
|
|
|
return NULL;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
if( !resource_table[kbpos->resno].used )
|
1997-12-16 20:15:09 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
return resource_table + kbpos->resno;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
static void
|
|
|
|
|
fatal_gdbm_error( const char *string )
|
|
|
|
|
{
|
|
|
|
|
log_fatal("gdbm failed: %s\n", string);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* HAVE_LIBGDBM */
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1999-02-10 17:22:40 +01:00
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Hmmm, how to avoid deadlock? They should not happen if everyone
|
|
|
|
|
* locks the key resources in the same order; but who knows.
|
|
|
|
|
* A solution is to use only one lock file in the gnupg homedir but
|
|
|
|
|
* what will happen with key resources which normally don't belong
|
|
|
|
|
* to the gpg homedir?
|
|
|
|
|
*/
|
1998-11-27 21:40:56 +01:00
|
|
|
|
static void
|
1999-02-10 17:22:40 +01:00
|
|
|
|
lock_rentry( RESTBL *rentry )
|
1998-11-27 21:40:56 +01:00
|
|
|
|
{
|
1999-02-10 17:22:40 +01:00
|
|
|
|
if( !rentry->lockhd ) {
|
|
|
|
|
rentry->lockhd = create_dotlock( rentry->fname );
|
|
|
|
|
if( !rentry->lockhd )
|
|
|
|
|
log_fatal("can't allocate lock for `%s'\n", rentry->fname );
|
|
|
|
|
rentry->is_locked = 0;
|
|
|
|
|
}
|
|
|
|
|
if( !rentry->is_locked ) {
|
|
|
|
|
if( make_dotlock( rentry->lockhd, -1 ) )
|
|
|
|
|
log_fatal("can't lock `%s'\n", rentry->fname );
|
|
|
|
|
rentry->is_locked = 1;
|
1998-11-27 21:40:56 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-02-10 17:22:40 +01:00
|
|
|
|
static void
|
|
|
|
|
unlock_rentry( RESTBL *rentry )
|
|
|
|
|
{
|
|
|
|
|
if( opt.lock_once )
|
|
|
|
|
return;
|
|
|
|
|
if( !release_dotlock( rentry->lockhd ) )
|
|
|
|
|
rentry->is_locked = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
/****************************************************************
|
|
|
|
|
****************** public functions ****************************
|
|
|
|
|
****************************************************************/
|
|
|
|
|
|
1998-10-16 18:00:17 +02:00
|
|
|
|
/****************
|
|
|
|
|
* Get the name of the keyrings, start with a sequence number pointing to a 0.
|
|
|
|
|
*/
|
|
|
|
|
const char *
|
|
|
|
|
enum_keyblock_resources( int *sequence, int secret )
|
|
|
|
|
{
|
|
|
|
|
int i = *sequence;
|
|
|
|
|
const char *name = NULL;
|
|
|
|
|
|
|
|
|
|
for(; i < MAX_RESOURCES; i++ )
|
|
|
|
|
if( resource_table[i].used && !resource_table[i].secret == !secret ) {
|
|
|
|
|
if( resource_table[i].fname ) {
|
|
|
|
|
name = resource_table[i].fname;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*sequence = ++i;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
return name;
|
1998-10-16 18:00:17 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
/****************
|
1998-04-14 19:51:16 +02:00
|
|
|
|
* Register a resource (which currently may only be a keyring file).
|
1998-10-16 18:00:17 +02:00
|
|
|
|
* The first keyring which is added by this function is
|
|
|
|
|
* created if it does not exist.
|
|
|
|
|
* Note: this function may be called before secure memory is
|
|
|
|
|
* available.
|
1997-12-12 13:03:58 +01:00
|
|
|
|
*/
|
|
|
|
|
int
|
1998-10-17 16:47:14 +02:00
|
|
|
|
add_keyblock_resource( const char *url, int force, int secret )
|
1997-12-12 13:03:58 +01:00
|
|
|
|
{
|
1998-10-16 18:00:17 +02:00
|
|
|
|
static int any_secret, any_public;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
const char *resname = url;
|
1998-10-25 20:00:01 +01:00
|
|
|
|
IOBUF iobuf = NULL;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
int i;
|
|
|
|
|
char *filename = NULL;
|
1998-10-16 18:00:17 +02:00
|
|
|
|
int rc = 0;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
enum resource_type rt = rt_UNKNOWN;
|
|
|
|
|
|
1998-11-27 21:40:56 +01:00
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
/* Do we have an URL?
|
|
|
|
|
* gnupg-gdbm:filename := this is a GDBM resource
|
|
|
|
|
* gnupg-ring:filename := this is a plain keyring
|
|
|
|
|
* filename := See what is is, but create as plain keyring.
|
|
|
|
|
*/
|
|
|
|
|
if( strlen( resname ) > 11 ) {
|
|
|
|
|
if( !strncmp( resname, "gnupg-ring:", 11 ) ) {
|
|
|
|
|
rt = rt_RING;
|
|
|
|
|
resname += 11;
|
|
|
|
|
}
|
|
|
|
|
else if( !strncmp( resname, "gnupg-gdbm:", 11 ) ) {
|
|
|
|
|
rt = rt_GDBM;
|
|
|
|
|
resname += 11;
|
|
|
|
|
}
|
1999-02-10 17:22:40 +01:00
|
|
|
|
#ifndef HAVE_DRIVE_LETTERS
|
1998-10-17 16:47:14 +02:00
|
|
|
|
else if( strchr( resname, ':' ) ) {
|
|
|
|
|
log_error("%s: invalid URL\n", url );
|
|
|
|
|
rc = G10ERR_GENERAL;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
1998-10-16 18:00:17 +02:00
|
|
|
|
|
|
|
|
|
if( *resname != '/' ) { /* do tilde expansion etc */
|
|
|
|
|
if( strchr(resname, '/') )
|
|
|
|
|
filename = make_filename(resname, NULL);
|
|
|
|
|
else
|
|
|
|
|
filename = make_filename(opt.homedir, resname, NULL);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
filename = m_strdup( resname );
|
|
|
|
|
|
|
|
|
|
if( !force )
|
|
|
|
|
force = secret? !any_secret : !any_public;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
for(i=0; i < MAX_RESOURCES; i++ )
|
|
|
|
|
if( !resource_table[i].used )
|
|
|
|
|
break;
|
1998-10-16 18:00:17 +02:00
|
|
|
|
if( i == MAX_RESOURCES ) {
|
|
|
|
|
rc = G10ERR_RESOURCE_LIMIT;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
/* see whether we can determine the filetype */
|
|
|
|
|
if( rt == rt_UNKNOWN ) {
|
|
|
|
|
FILE *fp = fopen( filename, "rb" );
|
|
|
|
|
|
|
|
|
|
if( fp ) {
|
|
|
|
|
u32 magic;
|
|
|
|
|
|
|
|
|
|
if( fread( &magic, 4, 1, fp) == 1 ) {
|
|
|
|
|
if( magic == 0x13579ace )
|
|
|
|
|
rt = rt_GDBM;
|
|
|
|
|
else if( magic == 0xce9a5713 )
|
|
|
|
|
log_error("%s: endianess does not match\n", url );
|
|
|
|
|
else
|
|
|
|
|
rt = rt_RING;
|
|
|
|
|
}
|
1998-10-25 20:00:01 +01:00
|
|
|
|
else /* maybe empty: assume ring */
|
|
|
|
|
rt = rt_RING;
|
1998-10-21 19:34:36 +02:00
|
|
|
|
fclose( fp );
|
|
|
|
|
}
|
|
|
|
|
else /* no file yet: create ring */
|
|
|
|
|
rt = rt_RING;
|
|
|
|
|
}
|
1998-07-06 12:23:57 +02:00
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
switch( rt ) {
|
|
|
|
|
case rt_UNKNOWN:
|
1998-10-21 19:34:36 +02:00
|
|
|
|
log_error("%s: unknown resource type\n", url );
|
|
|
|
|
rc = G10ERR_GENERAL;
|
|
|
|
|
goto leave;
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
case rt_RING:
|
1998-12-10 20:20:47 +01:00
|
|
|
|
iobuf = iobuf_open( filename );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
if( !iobuf && !force ) {
|
1998-10-16 18:00:17 +02:00
|
|
|
|
rc = G10ERR_OPEN_FILE;
|
|
|
|
|
goto leave;
|
1998-07-06 12:23:57 +02:00
|
|
|
|
}
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
if( !iobuf ) {
|
1998-10-21 19:34:36 +02:00
|
|
|
|
char *last_slash_in_filename;
|
|
|
|
|
|
|
|
|
|
last_slash_in_filename = strrchr(filename, '/');
|
|
|
|
|
*last_slash_in_filename = 0;
|
|
|
|
|
|
|
|
|
|
if( access(filename, F_OK) ) {
|
|
|
|
|
if( strlen(filename) >= 7
|
|
|
|
|
&& !strcmp(filename+strlen(filename)-7, "/.gnupg") ) {
|
|
|
|
|
if( mkdir(filename, S_IRUSR|S_IWUSR|S_IXUSR) )
|
|
|
|
|
{
|
|
|
|
|
log_error( _("%s: can't create directory: %s\n"),
|
|
|
|
|
filename, strerror(errno));
|
|
|
|
|
rc = G10ERR_OPEN_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1999-04-18 10:18:52 +02:00
|
|
|
|
else if( !opt.quiet )
|
1998-10-21 19:34:36 +02:00
|
|
|
|
log_info( _("%s: directory created\n"), filename );
|
1998-10-25 20:00:01 +01:00
|
|
|
|
copy_options_file( filename );
|
1998-10-21 19:34:36 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = G10ERR_OPEN_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*last_slash_in_filename = '/';
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
iobuf = iobuf_create( filename );
|
|
|
|
|
if( !iobuf ) {
|
1998-11-10 13:59:59 +01:00
|
|
|
|
log_error(_("%s: can't create keyring: %s\n"),
|
|
|
|
|
filename, strerror(errno));
|
1998-10-17 16:47:14 +02:00
|
|
|
|
rc = G10ERR_OPEN_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1999-04-07 20:58:34 +02:00
|
|
|
|
else {
|
|
|
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
|
|
|
|
if( secret ) {
|
|
|
|
|
if( chmod( filename, S_IRUSR | S_IWUSR ) ) {
|
|
|
|
|
log_error("%s: chmod failed: %s\n",
|
|
|
|
|
filename, strerror(errno) );
|
|
|
|
|
rc = G10ERR_WRITE_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1999-04-18 10:18:52 +02:00
|
|
|
|
if( !opt.quiet )
|
|
|
|
|
log_info(_("%s: keyring created\n"), filename );
|
1999-04-07 20:58:34 +02:00
|
|
|
|
}
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
1999-02-10 17:22:40 +01:00
|
|
|
|
#if HAVE_DOSISH_SYSTEM || 1
|
1998-10-17 16:47:14 +02:00
|
|
|
|
iobuf_close( iobuf );
|
|
|
|
|
iobuf = NULL;
|
1999-02-10 17:22:40 +01:00
|
|
|
|
/* must close it again */
|
1998-10-17 16:47:14 +02:00
|
|
|
|
#endif
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
case rt_GDBM:
|
1998-10-21 19:34:36 +02:00
|
|
|
|
resource_table[i].dbf = gdbm_open( filename, 0,
|
|
|
|
|
force? GDBM_WRCREAT : GDBM_WRITER,
|
|
|
|
|
S_IRUSR | S_IWUSR |
|
|
|
|
|
S_IRGRP | S_IWGRP | S_IROTH,
|
|
|
|
|
fatal_gdbm_error );
|
|
|
|
|
if( !resource_table[i].dbf ) {
|
|
|
|
|
log_error("%s: can't open gdbm file: %s\n",
|
|
|
|
|
filename, gdbm_strerror(gdbm_errno));
|
|
|
|
|
rc = G10ERR_OPEN_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1998-10-17 16:47:14 +02:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
log_error("%s: unsupported resource type\n", url );
|
|
|
|
|
rc = G10ERR_GENERAL;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1998-10-06 14:10:02 +02:00
|
|
|
|
|
1999-04-07 20:58:34 +02:00
|
|
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
|
|
|
|
#if 0 /* fixme: check directory permissions and print a warning */
|
|
|
|
|
if( secret ) {
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-02-26 17:59:48 +01:00
|
|
|
|
/* fixme: avoid duplicate resources */
|
1997-12-12 13:03:58 +01:00
|
|
|
|
resource_table[i].used = 1;
|
1998-01-06 22:01:36 +01:00
|
|
|
|
resource_table[i].secret = !!secret;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
resource_table[i].fname = m_strdup(filename);
|
|
|
|
|
resource_table[i].iobuf = iobuf;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
resource_table[i].rt = rt;
|
1999-02-26 17:59:48 +01:00
|
|
|
|
if( secret )
|
|
|
|
|
default_secret_resource = i;
|
|
|
|
|
else
|
|
|
|
|
default_public_resource = i;
|
|
|
|
|
|
1998-10-16 18:00:17 +02:00
|
|
|
|
leave:
|
|
|
|
|
if( rc )
|
1998-12-29 14:47:31 +01:00
|
|
|
|
log_error("keyblock resource `%s': %s\n", filename, g10_errstr(rc) );
|
1998-10-16 18:00:17 +02:00
|
|
|
|
else if( secret )
|
|
|
|
|
any_secret = 1;
|
|
|
|
|
else
|
|
|
|
|
any_public = 1;
|
|
|
|
|
m_free( filename );
|
|
|
|
|
return rc;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-02-16 21:05:02 +01:00
|
|
|
|
/****************
|
|
|
|
|
* Return the resource name of the keyblock associated with KBPOS.
|
|
|
|
|
*/
|
|
|
|
|
const char *
|
|
|
|
|
keyblock_resource_name( KBPOS *kbpos )
|
|
|
|
|
{
|
|
|
|
|
RESTBL *rentry;
|
|
|
|
|
|
|
|
|
|
if( !(rentry = check_pos( kbpos )) || !rentry->fname )
|
|
|
|
|
log_bug("no name for keyblock resource %d\n", kbpos->resno );
|
|
|
|
|
return rentry->fname;
|
|
|
|
|
}
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Get a keyblock handle KBPOS from a filename. This can be used
|
|
|
|
|
* to get a handle for insert_keyblock for a new keyblock.
|
1998-02-16 21:05:02 +01:00
|
|
|
|
* Using a filename of NULL returns the default resource
|
1997-12-12 13:03:58 +01:00
|
|
|
|
*/
|
|
|
|
|
int
|
1998-01-06 22:01:36 +01:00
|
|
|
|
get_keyblock_handle( const char *filename, int secret, KBPOS *kbpos )
|
1997-12-12 13:03:58 +01:00
|
|
|
|
{
|
1999-02-26 17:59:48 +01:00
|
|
|
|
int i = 0;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1999-02-26 17:59:48 +01:00
|
|
|
|
if( !filename )
|
|
|
|
|
i = secret? default_secret_resource : default_public_resource;
|
|
|
|
|
|
|
|
|
|
for(; i < MAX_RESOURCES; i++ ) {
|
1998-01-06 22:01:36 +01:00
|
|
|
|
if( resource_table[i].used && !resource_table[i].secret == !secret ) {
|
1997-12-12 13:03:58 +01:00
|
|
|
|
/* fixme: dos needs case insensitive file compare */
|
1998-02-16 21:05:02 +01:00
|
|
|
|
if( !filename || !strcmp( resource_table[i].fname, filename ) ) {
|
1997-12-12 13:03:58 +01:00
|
|
|
|
memset( kbpos, 0, sizeof *kbpos );
|
|
|
|
|
kbpos->resno = i;
|
1998-10-18 17:21:22 +02:00
|
|
|
|
kbpos->rt = resource_table[i].rt;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-02-26 17:59:48 +01:00
|
|
|
|
}
|
1997-12-12 13:03:58 +01:00
|
|
|
|
return -1; /* not found */
|
|
|
|
|
}
|
|
|
|
|
|
1998-01-16 22:15:24 +01:00
|
|
|
|
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
/****************
|
1998-04-14 19:51:16 +02:00
|
|
|
|
* Search a keyblock which starts with the given packet and puts all
|
|
|
|
|
* information into KBPOS, which can be used later to access this key block.
|
1997-12-12 13:03:58 +01:00
|
|
|
|
* This function looks into all registered keyblock sources.
|
1998-06-29 14:30:57 +02:00
|
|
|
|
* PACKET must be a packet with either a secret_key or a public_key
|
1997-12-12 13:03:58 +01:00
|
|
|
|
*
|
1998-04-14 19:51:16 +02:00
|
|
|
|
* This function is intended to check whether a given certificate
|
1997-12-12 13:03:58 +01:00
|
|
|
|
* is already in a keyring or to prepare it for editing.
|
|
|
|
|
*
|
|
|
|
|
* Returns: 0 if found, -1 if not found or an errorcode.
|
|
|
|
|
*/
|
1998-01-16 22:15:24 +01:00
|
|
|
|
static int
|
|
|
|
|
search( PACKET *pkt, KBPOS *kbpos, int secret )
|
1997-12-12 13:03:58 +01:00
|
|
|
|
{
|
|
|
|
|
int i, rc, last_rc=-1;
|
|
|
|
|
|
|
|
|
|
for(i=0; i < MAX_RESOURCES; i++ ) {
|
1998-01-06 22:01:36 +01:00
|
|
|
|
if( resource_table[i].used && !resource_table[i].secret == !secret ) {
|
1998-10-17 16:47:14 +02:00
|
|
|
|
switch( resource_table[i].rt ) {
|
|
|
|
|
case rt_RING:
|
|
|
|
|
rc = keyring_search( pkt, kbpos, resource_table[i].iobuf,
|
|
|
|
|
resource_table[i].fname );
|
|
|
|
|
break;
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
1998-10-21 19:34:36 +02:00
|
|
|
|
case rt_GDBM: {
|
|
|
|
|
PKT_public_key *req_pk = pkt->pkt.public_key;
|
|
|
|
|
byte fpr[20];
|
|
|
|
|
size_t fprlen;
|
|
|
|
|
|
|
|
|
|
fingerprint_from_pk( req_pk, fpr, &fprlen );
|
|
|
|
|
rc = do_gdbm_locate( resource_table[i].dbf,
|
|
|
|
|
kbpos, fpr, fprlen );
|
|
|
|
|
}
|
1998-10-17 16:47:14 +02:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
default: BUG();
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
kbpos->rt = resource_table[i].rt;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
if( !rc ) {
|
|
|
|
|
kbpos->resno = i;
|
1998-02-17 21:48:52 +01:00
|
|
|
|
kbpos->fp = NULL;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if( rc != -1 ) {
|
|
|
|
|
log_error("error searching resource %d: %s\n",
|
|
|
|
|
i, g10_errstr(rc));
|
|
|
|
|
last_rc = rc;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return last_rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1997-12-16 20:15:09 +01:00
|
|
|
|
/****************
|
|
|
|
|
* Combined function to search for a username and get the position
|
|
|
|
|
* of the keyblock.
|
|
|
|
|
*/
|
|
|
|
|
int
|
1998-01-16 22:15:24 +01:00
|
|
|
|
find_keyblock_byname( KBPOS *kbpos, const char *username )
|
1997-12-16 20:15:09 +01:00
|
|
|
|
{
|
|
|
|
|
PACKET pkt;
|
1998-06-29 14:30:57 +02:00
|
|
|
|
PKT_public_key *pk = m_alloc_clear( sizeof *pk );
|
1997-12-16 20:15:09 +01:00
|
|
|
|
int rc;
|
|
|
|
|
|
1998-11-08 18:23:14 +01:00
|
|
|
|
rc = get_pubkey_byname( NULL, pk, username, NULL );
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( rc ) {
|
1998-06-29 14:30:57 +02:00
|
|
|
|
free_public_key(pk);
|
1997-12-16 20:15:09 +01:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
init_packet( &pkt );
|
1998-06-29 14:30:57 +02:00
|
|
|
|
pkt.pkttype = PKT_PUBLIC_KEY;
|
|
|
|
|
pkt.pkt.public_key = pk;
|
1998-01-16 22:15:24 +01:00
|
|
|
|
rc = search( &pkt, kbpos, 0 );
|
1998-06-29 14:30:57 +02:00
|
|
|
|
free_public_key(pk);
|
1997-12-16 20:15:09 +01:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Combined function to search for a key and get the position
|
|
|
|
|
* of the keyblock.
|
|
|
|
|
*/
|
|
|
|
|
int
|
1998-06-29 14:30:57 +02:00
|
|
|
|
find_keyblock_bypk( KBPOS *kbpos, PKT_public_key *pk )
|
1998-02-17 21:48:52 +01:00
|
|
|
|
{
|
|
|
|
|
PACKET pkt;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
init_packet( &pkt );
|
1998-06-29 14:30:57 +02:00
|
|
|
|
pkt.pkttype = PKT_PUBLIC_KEY;
|
|
|
|
|
pkt.pkt.public_key = pk;
|
1998-02-17 21:48:52 +01:00
|
|
|
|
rc = search( &pkt, kbpos, 0 );
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
1999-01-12 11:20:24 +01:00
|
|
|
|
/****************
|
|
|
|
|
* Combined function to search for a key and get the position
|
|
|
|
|
* of the keyblock.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
find_keyblock_bysk( KBPOS *kbpos, PKT_secret_key *sk )
|
|
|
|
|
{
|
|
|
|
|
PACKET pkt;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
init_packet( &pkt );
|
|
|
|
|
pkt.pkttype = PKT_SECRET_KEY;
|
|
|
|
|
pkt.pkt.secret_key = sk;
|
|
|
|
|
rc = search( &pkt, kbpos, 0 );
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
|
|
1998-01-06 22:01:36 +01:00
|
|
|
|
/****************
|
|
|
|
|
* Combined function to search for a username and get the position
|
|
|
|
|
* of the keyblock. This function does not unprotect the secret key.
|
|
|
|
|
*/
|
|
|
|
|
int
|
1998-01-16 22:15:24 +01:00
|
|
|
|
find_secret_keyblock_byname( KBPOS *kbpos, const char *username )
|
1998-01-06 22:01:36 +01:00
|
|
|
|
{
|
|
|
|
|
PACKET pkt;
|
1998-06-29 14:30:57 +02:00
|
|
|
|
PKT_secret_key *sk = m_alloc_clear( sizeof *sk );
|
1998-01-06 22:01:36 +01:00
|
|
|
|
int rc;
|
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
rc = get_seckey_byname( sk, username, 0 );
|
1998-01-06 22:01:36 +01:00
|
|
|
|
if( rc ) {
|
1998-06-29 14:30:57 +02:00
|
|
|
|
free_secret_key(sk);
|
1998-01-06 22:01:36 +01:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
init_packet( &pkt );
|
1998-06-29 14:30:57 +02:00
|
|
|
|
pkt.pkttype = PKT_SECRET_KEY;
|
|
|
|
|
pkt.pkt.secret_key = sk;
|
1998-01-16 22:15:24 +01:00
|
|
|
|
rc = search( &pkt, kbpos, 1 );
|
1998-06-29 14:30:57 +02:00
|
|
|
|
free_secret_key(sk);
|
1998-01-06 22:01:36 +01:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
/****************
|
|
|
|
|
* Locate a keyblock in a database which is capable of direct access
|
|
|
|
|
* Put all information into KBPOS, which can be later be to access this
|
|
|
|
|
* key block.
|
|
|
|
|
* This function looks into all registered keyblock sources.
|
|
|
|
|
*
|
|
|
|
|
* Returns: 0 if found,
|
|
|
|
|
* -1 if not found
|
|
|
|
|
* G10ERR_UNSUPPORTED if no resource is able to handle this
|
|
|
|
|
* or another errorcode.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
locate_keyblock_by_fpr( KBPOS *kbpos, const byte *fpr, int fprlen, int secret )
|
|
|
|
|
{
|
|
|
|
|
RESTBL *rentry;
|
|
|
|
|
int i, rc, any=0, last_rc=-1;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for(i=0, rentry = resource_table; i < MAX_RESOURCES; i++, rentry++ ) {
|
|
|
|
|
if( rentry->used && !rentry->secret == !secret ) {
|
|
|
|
|
kbpos->rt = rentry->rt;
|
|
|
|
|
switch( rentry->rt ) {
|
1998-11-10 13:59:59 +01:00
|
|
|
|
#ifdef HAVE_LIBGDBM
|
1998-10-21 19:34:36 +02:00
|
|
|
|
case rt_GDBM:
|
|
|
|
|
any = 1;
|
|
|
|
|
rc = do_gdbm_locate( rentry->dbf, kbpos, fpr, fprlen );
|
|
|
|
|
break;
|
1998-11-10 13:59:59 +01:00
|
|
|
|
#endif
|
1998-10-21 19:34:36 +02:00
|
|
|
|
default:
|
1998-10-25 20:00:01 +01:00
|
|
|
|
rc = G10ERR_UNSUPPORTED;
|
1998-10-21 19:34:36 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( !rc ) {
|
|
|
|
|
kbpos->resno = i;
|
|
|
|
|
kbpos->fp = NULL;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1998-10-25 20:00:01 +01:00
|
|
|
|
else if( rc != -1 && rc != G10ERR_UNSUPPORTED ) {
|
1998-10-21 19:34:36 +02:00
|
|
|
|
log_error("error searching resource %d: %s\n",
|
|
|
|
|
i, g10_errstr(rc));
|
|
|
|
|
last_rc = rc;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (last_rc == -1 && !any)? G10ERR_UNSUPPORTED : last_rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
locate_keyblock_by_keyid( KBPOS *kbpos, u32 *keyid, int shortkid, int secret )
|
|
|
|
|
{
|
|
|
|
|
RESTBL *rentry;
|
|
|
|
|
int i, rc, any=0, last_rc=-1;
|
|
|
|
|
|
|
|
|
|
if( shortkid )
|
|
|
|
|
return G10ERR_UNSUPPORTED;
|
|
|
|
|
|
|
|
|
|
for(i=0, rentry = resource_table; i < MAX_RESOURCES; i++, rentry++ ) {
|
|
|
|
|
if( rentry->used && !rentry->secret == !secret ) {
|
|
|
|
|
kbpos->rt = rentry->rt;
|
|
|
|
|
switch( rentry->rt ) {
|
1998-11-10 13:59:59 +01:00
|
|
|
|
#ifdef HAVE_LIBGDBM
|
1998-10-21 19:34:36 +02:00
|
|
|
|
case rt_GDBM:
|
|
|
|
|
any = 1;
|
|
|
|
|
rc = do_gdbm_locate_by_keyid( rentry->dbf, kbpos, keyid );
|
|
|
|
|
break;
|
1998-11-10 13:59:59 +01:00
|
|
|
|
#endif
|
1998-10-21 19:34:36 +02:00
|
|
|
|
default:
|
1998-10-25 20:00:01 +01:00
|
|
|
|
rc = G10ERR_UNSUPPORTED;
|
1998-10-21 19:34:36 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if( !rc ) {
|
|
|
|
|
kbpos->resno = i;
|
|
|
|
|
kbpos->fp = NULL;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1998-10-25 20:00:01 +01:00
|
|
|
|
else if( rc != -1 && rc != G10ERR_UNSUPPORTED ) {
|
1998-10-21 19:34:36 +02:00
|
|
|
|
log_error("error searching resource %d: %s\n",
|
|
|
|
|
i, g10_errstr(rc));
|
|
|
|
|
last_rc = rc;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (last_rc == -1 && !any)? G10ERR_UNSUPPORTED : last_rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-02-17 21:48:52 +01:00
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
/****************
|
|
|
|
|
* Lock the keyblock; wait until it's available
|
|
|
|
|
* This function may change the internal data in kbpos, in cases
|
1998-04-14 19:51:16 +02:00
|
|
|
|
* when the keyblock to be locked has been modified.
|
1998-01-16 22:15:24 +01:00
|
|
|
|
* fixme: remove this function and add an option to search()?
|
1997-12-12 13:03:58 +01:00
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
lock_keyblock( KBPOS *kbpos )
|
|
|
|
|
{
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( !check_pos(kbpos) )
|
|
|
|
|
return G10ERR_GENERAL;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Release a lock on a keyblock
|
|
|
|
|
*/
|
1997-12-16 20:15:09 +01:00
|
|
|
|
void
|
1997-12-12 13:03:58 +01:00
|
|
|
|
unlock_keyblock( KBPOS *kbpos )
|
|
|
|
|
{
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( !check_pos(kbpos) )
|
1998-01-16 22:15:24 +01:00
|
|
|
|
BUG();
|
1997-12-12 13:03:58 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Read a complete keyblock and return the root in ret_root.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
read_keyblock( KBPOS *kbpos, KBNODE *ret_root )
|
|
|
|
|
{
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( !check_pos(kbpos) )
|
|
|
|
|
return G10ERR_GENERAL;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
|
|
|
|
switch( kbpos->rt ) {
|
|
|
|
|
case rt_RING:
|
|
|
|
|
return keyring_read( kbpos, ret_root );
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
case rt_GDBM:
|
|
|
|
|
return do_gdbm_read( kbpos, ret_root );
|
|
|
|
|
#endif
|
|
|
|
|
default: BUG();
|
|
|
|
|
}
|
1997-12-12 13:03:58 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-02-13 21:58:50 +01:00
|
|
|
|
|
|
|
|
|
/****************
|
1998-04-14 19:51:16 +02:00
|
|
|
|
* This functions can be used to read through a complete keyring.
|
1998-02-13 21:58:50 +01:00
|
|
|
|
* Mode is: 0 = open
|
|
|
|
|
* 1 = read
|
|
|
|
|
* 2 = close
|
1998-03-19 16:27:29 +01:00
|
|
|
|
* 5 = open secret keyrings
|
|
|
|
|
* 11 = read but skip signature and comment packets.
|
1998-02-13 21:58:50 +01:00
|
|
|
|
* all others are reserved!
|
1998-03-19 16:27:29 +01:00
|
|
|
|
* Note that you do not need a search prior to this function,
|
|
|
|
|
* only a handle is needed.
|
1998-10-06 14:10:02 +02:00
|
|
|
|
* NOTE: It is not allowed to do an insert/update/delete with this
|
1998-03-19 16:27:29 +01:00
|
|
|
|
* keyblock, if you want to do this, use search/read!
|
1998-02-13 21:58:50 +01:00
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
enum_keyblocks( int mode, KBPOS *kbpos, KBNODE *ret_root )
|
|
|
|
|
{
|
|
|
|
|
int rc = 0;
|
|
|
|
|
RESTBL *rentry;
|
|
|
|
|
|
1998-03-19 16:27:29 +01:00
|
|
|
|
if( !mode || mode == 5 || mode == 100 ) {
|
1998-02-13 21:58:50 +01:00
|
|
|
|
int i;
|
1999-10-08 20:40:58 +02:00
|
|
|
|
|
|
|
|
|
kbpos->fp = NULL;
|
|
|
|
|
kbpos->rt = rt_UNKNOWN;
|
1998-03-19 16:27:29 +01:00
|
|
|
|
if( !mode ) {
|
|
|
|
|
kbpos->secret = 0;
|
1998-02-13 21:58:50 +01:00
|
|
|
|
i = 0;
|
1998-03-19 16:27:29 +01:00
|
|
|
|
}
|
|
|
|
|
else if( mode == 5 ) {
|
|
|
|
|
kbpos->secret = 1;
|
|
|
|
|
mode = 0;
|
|
|
|
|
i = 0;
|
|
|
|
|
}
|
1998-02-13 21:58:50 +01:00
|
|
|
|
else
|
|
|
|
|
i = kbpos->resno+1;
|
|
|
|
|
for(; i < MAX_RESOURCES; i++ )
|
1998-03-19 16:27:29 +01:00
|
|
|
|
if( resource_table[i].used
|
|
|
|
|
&& !resource_table[i].secret == !kbpos->secret )
|
1998-02-13 21:58:50 +01:00
|
|
|
|
break;
|
|
|
|
|
if( i == MAX_RESOURCES )
|
|
|
|
|
return -1; /* no resources */
|
|
|
|
|
kbpos->resno = i;
|
|
|
|
|
rentry = check_pos( kbpos );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
kbpos->rt = resource_table[i].rt;
|
1998-12-23 13:41:40 +01:00
|
|
|
|
kbpos->valid = 0;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
switch( kbpos->rt ) {
|
|
|
|
|
case rt_RING:
|
1998-12-10 20:20:47 +01:00
|
|
|
|
kbpos->fp = iobuf_open( rentry->fname );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
if( !kbpos->fp ) {
|
1998-12-29 14:47:31 +01:00
|
|
|
|
log_error("can't open `%s'\n", rentry->fname );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
return G10ERR_OPEN_FILE;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
case rt_GDBM:
|
1998-10-21 19:34:36 +02:00
|
|
|
|
/* FIXME: make sure that there is only one enum at a time */
|
|
|
|
|
kbpos->offset = 0;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
default: BUG();
|
1998-02-13 21:58:50 +01:00
|
|
|
|
}
|
|
|
|
|
kbpos->pkt = NULL;
|
|
|
|
|
}
|
1998-03-19 16:27:29 +01:00
|
|
|
|
else if( mode == 1 || mode == 11 ) {
|
1998-02-13 21:58:50 +01:00
|
|
|
|
int cont;
|
|
|
|
|
do {
|
|
|
|
|
cont = 0;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
switch( kbpos->rt ) {
|
|
|
|
|
case rt_RING:
|
|
|
|
|
if( !kbpos->fp )
|
|
|
|
|
return G10ERR_GENERAL;
|
|
|
|
|
rc = keyring_enum( kbpos, ret_root, mode == 11 );
|
|
|
|
|
break;
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
case rt_GDBM:
|
1998-10-21 19:34:36 +02:00
|
|
|
|
rc = do_gdbm_enum( kbpos, ret_root );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
default: BUG();
|
|
|
|
|
}
|
|
|
|
|
|
1998-02-13 21:58:50 +01:00
|
|
|
|
if( rc == -1 ) {
|
|
|
|
|
assert( !kbpos->pkt );
|
|
|
|
|
rentry = check_pos( kbpos );
|
|
|
|
|
assert(rentry);
|
|
|
|
|
/* close */
|
|
|
|
|
enum_keyblocks(2, kbpos, ret_root );
|
|
|
|
|
/* and open the next one */
|
|
|
|
|
rc = enum_keyblocks(100, kbpos, ret_root );
|
|
|
|
|
if( !rc )
|
|
|
|
|
cont = 1;
|
|
|
|
|
}
|
|
|
|
|
} while(cont);
|
|
|
|
|
}
|
1998-10-17 16:47:14 +02:00
|
|
|
|
else {
|
|
|
|
|
switch( kbpos->rt ) {
|
|
|
|
|
case rt_RING:
|
|
|
|
|
if( kbpos->fp ) {
|
|
|
|
|
iobuf_close( kbpos->fp );
|
|
|
|
|
kbpos->fp = NULL;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case rt_GDBM:
|
|
|
|
|
break;
|
1999-07-22 20:11:55 +02:00
|
|
|
|
case rt_UNKNOWN:
|
|
|
|
|
/* this happens when we have no keyring at all */
|
1998-10-25 20:00:01 +01:00
|
|
|
|
return rc;
|
1999-07-22 20:11:55 +02:00
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
BUG();
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
1998-02-13 21:58:50 +01:00
|
|
|
|
/* release pending packet */
|
|
|
|
|
free_packet( kbpos->pkt );
|
|
|
|
|
m_free( kbpos->pkt );
|
|
|
|
|
}
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
/****************
|
|
|
|
|
* Insert the keyblock described by ROOT into the keyring described
|
|
|
|
|
* by KBPOS. This actually appends the data to the keyfile.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
insert_keyblock( KBPOS *kbpos, KBNODE root )
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( !check_pos(kbpos) )
|
|
|
|
|
return G10ERR_GENERAL;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
switch( kbpos->rt ) {
|
|
|
|
|
case rt_RING:
|
|
|
|
|
rc = keyring_copy( kbpos, 1, root );
|
|
|
|
|
break;
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
case rt_GDBM:
|
1998-10-21 19:34:36 +02:00
|
|
|
|
rc = do_gdbm_store( kbpos, root, 0 );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
default: BUG();
|
|
|
|
|
}
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Delete the keyblock described by KBPOS.
|
|
|
|
|
* The current code simply changes the keyblock in the keyring
|
1998-04-14 19:51:16 +02:00
|
|
|
|
* to packet of type 0 with the correct length. To help detect errors,
|
1997-12-12 13:03:58 +01:00
|
|
|
|
* zero bytes are written.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
delete_keyblock( KBPOS *kbpos )
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( !check_pos(kbpos) )
|
|
|
|
|
return G10ERR_GENERAL;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
switch( kbpos->rt ) {
|
|
|
|
|
case rt_RING:
|
|
|
|
|
rc = keyring_copy( kbpos, 2, NULL );
|
|
|
|
|
break;
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
case rt_GDBM:
|
1998-10-25 20:00:01 +01:00
|
|
|
|
log_debug("deleting gdbm keyblock is not yet implemented\n");
|
|
|
|
|
rc = 0;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
default: BUG();
|
|
|
|
|
}
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Update the keyblock at KBPOS with the one in ROOT.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
update_keyblock( KBPOS *kbpos, KBNODE root )
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
|
1998-02-11 04:25:44 +01:00
|
|
|
|
if( !check_pos(kbpos) )
|
|
|
|
|
return G10ERR_GENERAL;
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
switch( kbpos->rt ) {
|
|
|
|
|
case rt_RING:
|
|
|
|
|
rc = keyring_copy( kbpos, 3, root );
|
|
|
|
|
break;
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
|
|
|
|
case rt_GDBM:
|
1998-10-21 19:34:36 +02:00
|
|
|
|
rc = do_gdbm_store( kbpos, root, 1 );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
default: BUG();
|
|
|
|
|
}
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1998-11-13 20:41:41 +01:00
|
|
|
|
|
|
|
|
|
/****************************************************************
|
|
|
|
|
********** Implemenation of a user ID database **************
|
|
|
|
|
****************************************************************/
|
|
|
|
|
#if 0
|
|
|
|
|
/****************
|
|
|
|
|
* Layout of the user ID db
|
|
|
|
|
*
|
|
|
|
|
* This user ID DB provides fast lookup of user ID, but the user ids are
|
|
|
|
|
* not in any specific order.
|
|
|
|
|
*
|
|
|
|
|
* A string "GnuPG user db", a \n.
|
|
|
|
|
* user ids of one key, delimited by \t,
|
1998-11-27 21:40:56 +01:00
|
|
|
|
* a # or ^ followed by a 20 byte fingerprint, followed by an \n
|
1998-12-23 13:41:40 +01:00
|
|
|
|
* The literal characters %, \n, \t, #, ^ must be replaced by a percent sign
|
1998-11-13 20:41:41 +01:00
|
|
|
|
* and their hex value.
|
|
|
|
|
*
|
|
|
|
|
* (We use Boyer/Moore pattern matching)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* This compiles pattern to the distance table, the table will be allocate
|
|
|
|
|
* here and must be freed by using free().
|
|
|
|
|
* Returns: Ptr to new allocated Table
|
|
|
|
|
* Caller must free the table.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static size_t *
|
|
|
|
|
compile_bm_table( const byte *pattern, size_t len )
|
|
|
|
|
{
|
|
|
|
|
ushort *dist;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
dist = m_alloc_clear( 256 * sizeof *dist );
|
|
|
|
|
for(i=0; i < 256; i++ )
|
|
|
|
|
dist[i] = len;
|
|
|
|
|
for(i=0; i < len-1; i++ )
|
|
|
|
|
dTbl[p[i]] = len-i-1;
|
|
|
|
|
return dist;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* Search BUF of BUFLEN for pattern P of length PATLEN.
|
|
|
|
|
* dist is the Boyer/Moore distance table of 256 Elements,
|
|
|
|
|
* case insensitive search is done if IGNCASE is true (In this case
|
|
|
|
|
* the distance table has to compiled from uppercase chacaters and
|
|
|
|
|
* PAT must also be uppercase.
|
|
|
|
|
* Returns: Prt to maching string in BUF, or NULL if not found.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static const *
|
|
|
|
|
do_bm_search( const byte *buf, size_t buflen,
|
|
|
|
|
const byte *pat, size_t patlen, size_t *dist, int igncase )
|
|
|
|
|
{
|
|
|
|
|
int i, j, k;
|
|
|
|
|
|
|
|
|
|
if( igncase ) {
|
|
|
|
|
int c, c1;
|
|
|
|
|
|
|
|
|
|
for( i = --patlen; i < buflen; i += dist[c1] )
|
|
|
|
|
for( j=patlen, k=i, c1=c=toupper(buf[k]); c == pat[j];
|
|
|
|
|
j--, k--, c=toupper(buf[k]) ) {
|
|
|
|
|
if( !j )
|
|
|
|
|
return buf+k;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
for( i = --patlen; i < buflen; i += dist[buf[i]] )
|
|
|
|
|
for( j=patlen, k=i; buf[k] == pat[j]; j--, k-- ) {
|
|
|
|
|
if( !j )
|
|
|
|
|
return buf+k;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
size_t dist[256];
|
|
|
|
|
} *SCAN_USER_HANDLE;
|
|
|
|
|
|
|
|
|
|
static SCAN_USER_HANDLE
|
|
|
|
|
scan_user_file_open( const byte *name )
|
|
|
|
|
{
|
|
|
|
|
SCAN_USER_HANDLE hd;
|
|
|
|
|
size_t *dist;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
hd = m_alloc_clear( sizeof *hd );
|
|
|
|
|
dist = hd->dist;
|
|
|
|
|
/* compile the distance table */
|
|
|
|
|
for(i=0; i < 256; i++ )
|
|
|
|
|
dist[i] = len;
|
|
|
|
|
for(i=0; i < len-1; i++ )
|
|
|
|
|
dTbl[p[i]] = len-i-1;
|
|
|
|
|
/* setup other things */
|
|
|
|
|
|
|
|
|
|
return hd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
scan_user_file_close( SCAN_USER_HANDLE hd )
|
|
|
|
|
{
|
|
|
|
|
m_free( hd );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
scan_user_file_read( SCAN_USER_HANDLE hd, byte *fpr )
|
|
|
|
|
{
|
|
|
|
|
char record[1000];
|
|
|
|
|
|
|
|
|
|
/* read a record */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
/****************************************************************
|
|
|
|
|
********** Functions which operates on regular keyrings ********
|
|
|
|
|
****************************************************************/
|
|
|
|
|
|
1998-06-13 08:59:14 +02:00
|
|
|
|
static int
|
1998-06-29 14:30:57 +02:00
|
|
|
|
cmp_seckey( PKT_secret_key *req_sk, PKT_secret_key *sk )
|
1998-06-13 08:59:14 +02:00
|
|
|
|
{
|
|
|
|
|
int n,i;
|
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
assert( req_sk->pubkey_algo == sk->pubkey_algo );
|
1998-06-13 08:59:14 +02:00
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
n = pubkey_get_nskey( req_sk->pubkey_algo );
|
1998-06-13 08:59:14 +02:00
|
|
|
|
for(i=0; i < n; i++ ) {
|
1998-06-29 14:30:57 +02:00
|
|
|
|
if( mpi_cmp( req_sk->skey[i], sk->skey[i] ) )
|
1998-06-13 08:59:14 +02:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
1998-06-29 14:30:57 +02:00
|
|
|
|
cmp_pubkey( PKT_public_key *req_pk, PKT_public_key *pk )
|
1998-06-13 08:59:14 +02:00
|
|
|
|
{
|
|
|
|
|
int n, i;
|
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
assert( req_pk->pubkey_algo == pk->pubkey_algo );
|
1998-06-13 08:59:14 +02:00
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
n = pubkey_get_npkey( req_pk->pubkey_algo );
|
1998-06-13 08:59:14 +02:00
|
|
|
|
for(i=0; i < n; i++ ) {
|
1998-06-29 14:30:57 +02:00
|
|
|
|
if( mpi_cmp( req_pk->pkey[i], pk->pkey[i] ) )
|
1998-06-13 08:59:14 +02:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* search one keyring, return 0 if found, -1 if not found or an errorcode.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
1998-02-27 18:51:28 +01:00
|
|
|
|
keyring_search( PACKET *req, KBPOS *kbpos, IOBUF iobuf, const char *fname )
|
1997-12-12 13:03:58 +01:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
PACKET pkt;
|
|
|
|
|
int save_mode;
|
|
|
|
|
ulong offset;
|
|
|
|
|
int pkttype = req->pkttype;
|
1998-06-29 14:30:57 +02:00
|
|
|
|
PKT_public_key *req_pk = req->pkt.public_key;
|
|
|
|
|
PKT_secret_key *req_sk = req->pkt.secret_key;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
init_packet(&pkt);
|
|
|
|
|
save_mode = set_packet_list_mode(0);
|
1998-10-17 16:47:14 +02:00
|
|
|
|
kbpos->rt = rt_RING;
|
1998-12-23 13:41:40 +01:00
|
|
|
|
kbpos->valid = 0;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1999-02-10 17:22:40 +01:00
|
|
|
|
#if HAVE_DOSISH_SYSTEM || 1
|
1998-02-27 18:51:28 +01:00
|
|
|
|
assert(!iobuf);
|
|
|
|
|
iobuf = iobuf_open( fname );
|
|
|
|
|
if( !iobuf ) {
|
|
|
|
|
log_error("%s: can't open keyring file\n", fname);
|
|
|
|
|
rc = G10ERR_KEYRING_OPEN;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
#else
|
1997-12-12 13:03:58 +01:00
|
|
|
|
if( iobuf_seek( iobuf, 0 ) ) {
|
1998-02-17 21:48:52 +01:00
|
|
|
|
log_error("can't rewind keyring file\n");
|
1997-12-12 13:03:58 +01:00
|
|
|
|
rc = G10ERR_KEYRING_OPEN;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1998-02-27 18:51:28 +01:00
|
|
|
|
#endif
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
while( !(rc=search_packet(iobuf, &pkt, pkttype, &offset)) ) {
|
1998-06-29 14:30:57 +02:00
|
|
|
|
if( pkt.pkttype == PKT_SECRET_KEY ) {
|
|
|
|
|
PKT_secret_key *sk = pkt.pkt.secret_key;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
if( req_sk->timestamp == sk->timestamp
|
|
|
|
|
&& req_sk->pubkey_algo == sk->pubkey_algo
|
|
|
|
|
&& !cmp_seckey( req_sk, sk) )
|
1997-12-12 13:03:58 +01:00
|
|
|
|
break; /* found */
|
|
|
|
|
}
|
1998-06-29 14:30:57 +02:00
|
|
|
|
else if( pkt.pkttype == PKT_PUBLIC_KEY ) {
|
|
|
|
|
PKT_public_key *pk = pkt.pkt.public_key;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
if( req_pk->timestamp == pk->timestamp
|
|
|
|
|
&& req_pk->pubkey_algo == pk->pubkey_algo
|
|
|
|
|
&& !cmp_pubkey( req_pk, pk ) )
|
1997-12-12 13:03:58 +01:00
|
|
|
|
break; /* found */
|
|
|
|
|
}
|
|
|
|
|
else
|
1998-01-16 22:15:24 +01:00
|
|
|
|
BUG();
|
|
|
|
|
free_packet(&pkt);
|
|
|
|
|
}
|
1998-12-23 13:41:40 +01:00
|
|
|
|
if( !rc ) {
|
1998-01-16 22:15:24 +01:00
|
|
|
|
kbpos->offset = offset;
|
1998-12-23 13:41:40 +01:00
|
|
|
|
kbpos->valid = 1;
|
|
|
|
|
}
|
1998-01-16 22:15:24 +01:00
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
free_packet(&pkt);
|
|
|
|
|
set_packet_list_mode(save_mode);
|
1999-02-10 17:22:40 +01:00
|
|
|
|
#if HAVE_DOSISH_SYSTEM || 1
|
1998-02-27 18:51:28 +01:00
|
|
|
|
iobuf_close(iobuf);
|
|
|
|
|
#endif
|
1998-01-16 22:15:24 +01:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
keyring_read( KBPOS *kbpos, KBNODE *ret_root )
|
|
|
|
|
{
|
|
|
|
|
PACKET *pkt;
|
|
|
|
|
int rc;
|
1997-12-16 20:15:09 +01:00
|
|
|
|
RESTBL *rentry;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
KBNODE root = NULL;
|
|
|
|
|
IOBUF a;
|
1998-02-11 04:25:44 +01:00
|
|
|
|
int in_cert = 0;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( !(rentry=check_pos(kbpos)) )
|
|
|
|
|
return G10ERR_GENERAL;
|
|
|
|
|
|
1998-12-10 20:20:47 +01:00
|
|
|
|
a = iobuf_open( rentry->fname );
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( !a ) {
|
1998-12-29 14:47:31 +01:00
|
|
|
|
log_error("can't open `%s'\n", rentry->fname );
|
1997-12-16 20:15:09 +01:00
|
|
|
|
return G10ERR_OPEN_FILE;
|
|
|
|
|
}
|
|
|
|
|
|
1998-12-23 13:41:40 +01:00
|
|
|
|
if( !kbpos->valid )
|
|
|
|
|
log_debug("kbpos not valid in keyring_read, want %d\n", (int)kbpos->offset );
|
1997-12-16 20:15:09 +01:00
|
|
|
|
if( iobuf_seek( a, kbpos->offset ) ) {
|
1998-02-17 21:48:52 +01:00
|
|
|
|
log_error("can't seek to %lu\n", kbpos->offset);
|
1997-12-16 20:15:09 +01:00
|
|
|
|
iobuf_close(a);
|
|
|
|
|
return G10ERR_KEYRING_OPEN;
|
|
|
|
|
}
|
|
|
|
|
|
1997-12-12 13:03:58 +01:00
|
|
|
|
pkt = m_alloc( sizeof *pkt );
|
|
|
|
|
init_packet(pkt);
|
1998-02-11 04:25:44 +01:00
|
|
|
|
kbpos->count=0;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
while( (rc=parse_packet(a, pkt)) != -1 ) {
|
|
|
|
|
if( rc ) { /* ignore errors */
|
1998-07-02 21:31:46 +02:00
|
|
|
|
if( rc != G10ERR_UNKNOWN_PACKET ) {
|
1998-02-11 04:25:44 +01:00
|
|
|
|
log_error("read_keyblock: read error: %s\n", g10_errstr(rc) );
|
|
|
|
|
rc = G10ERR_INV_KEYRING;
|
|
|
|
|
goto ready;
|
|
|
|
|
}
|
|
|
|
|
kbpos->count++;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
free_packet( pkt );
|
1998-02-16 21:05:02 +01:00
|
|
|
|
init_packet( pkt );
|
1997-12-12 13:03:58 +01:00
|
|
|
|
continue;
|
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
/* make a linked list of all packets */
|
1997-12-12 13:03:58 +01:00
|
|
|
|
switch( pkt->pkttype ) {
|
1998-12-23 13:41:40 +01:00
|
|
|
|
case PKT_COMPRESSED:
|
|
|
|
|
log_error("skipped compressed packet in keyring\n" );
|
|
|
|
|
free_packet(pkt);
|
|
|
|
|
init_packet(pkt);
|
|
|
|
|
break;
|
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
case PKT_PUBLIC_KEY:
|
|
|
|
|
case PKT_SECRET_KEY:
|
1998-02-11 04:25:44 +01:00
|
|
|
|
if( in_cert )
|
1997-12-16 20:15:09 +01:00
|
|
|
|
goto ready;
|
1998-02-11 04:25:44 +01:00
|
|
|
|
in_cert = 1;
|
|
|
|
|
default:
|
|
|
|
|
kbpos->count++;
|
|
|
|
|
if( !root )
|
|
|
|
|
root = new_kbnode( pkt );
|
|
|
|
|
else
|
|
|
|
|
add_kbnode( root, new_kbnode( pkt ) );
|
1997-12-12 13:03:58 +01:00
|
|
|
|
pkt = m_alloc( sizeof *pkt );
|
|
|
|
|
init_packet(pkt);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1997-12-16 20:15:09 +01:00
|
|
|
|
ready:
|
1998-12-23 13:41:40 +01:00
|
|
|
|
kbpos->valid = 0;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
if( rc == -1 && root )
|
|
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
|
|
if( rc )
|
|
|
|
|
release_kbnode( root );
|
1998-02-13 21:58:50 +01:00
|
|
|
|
else
|
1997-12-12 13:03:58 +01:00
|
|
|
|
*ret_root = root;
|
|
|
|
|
free_packet( pkt );
|
|
|
|
|
m_free( pkt );
|
1997-12-16 20:15:09 +01:00
|
|
|
|
iobuf_close(a);
|
1997-12-12 13:03:58 +01:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1998-02-13 21:58:50 +01:00
|
|
|
|
static int
|
1998-03-19 16:27:29 +01:00
|
|
|
|
keyring_enum( KBPOS *kbpos, KBNODE *ret_root, int skipsigs )
|
1998-02-13 21:58:50 +01:00
|
|
|
|
{
|
|
|
|
|
PACKET *pkt;
|
|
|
|
|
int rc;
|
|
|
|
|
RESTBL *rentry;
|
|
|
|
|
KBNODE root = NULL;
|
|
|
|
|
|
|
|
|
|
if( !(rentry=check_pos(kbpos)) )
|
|
|
|
|
return G10ERR_GENERAL;
|
|
|
|
|
|
|
|
|
|
if( kbpos->pkt ) {
|
|
|
|
|
root = new_kbnode( kbpos->pkt );
|
|
|
|
|
kbpos->pkt = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pkt = m_alloc( sizeof *pkt );
|
|
|
|
|
init_packet(pkt);
|
|
|
|
|
while( (rc=parse_packet(kbpos->fp, pkt)) != -1 ) {
|
|
|
|
|
if( rc ) { /* ignore errors */
|
1998-07-02 21:31:46 +02:00
|
|
|
|
if( rc != G10ERR_UNKNOWN_PACKET ) {
|
1998-02-13 21:58:50 +01:00
|
|
|
|
log_error("read_keyblock: read error: %s\n", g10_errstr(rc) );
|
|
|
|
|
rc = G10ERR_INV_KEYRING;
|
|
|
|
|
goto ready;
|
|
|
|
|
}
|
|
|
|
|
free_packet( pkt );
|
1998-02-16 21:05:02 +01:00
|
|
|
|
init_packet( pkt );
|
1998-02-13 21:58:50 +01:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
/* make a linked list of all packets */
|
|
|
|
|
switch( pkt->pkttype ) {
|
1998-12-23 13:41:40 +01:00
|
|
|
|
case PKT_COMPRESSED:
|
|
|
|
|
log_error("skipped compressed packet in keyring\n" );
|
|
|
|
|
free_packet(pkt);
|
|
|
|
|
init_packet(pkt);
|
|
|
|
|
break;
|
|
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
|
case PKT_PUBLIC_KEY:
|
|
|
|
|
case PKT_SECRET_KEY:
|
1998-03-19 16:27:29 +01:00
|
|
|
|
if( root ) { /* store this packet */
|
1998-02-13 21:58:50 +01:00
|
|
|
|
kbpos->pkt = pkt;
|
|
|
|
|
pkt = NULL;
|
|
|
|
|
goto ready;
|
|
|
|
|
}
|
1998-03-19 16:27:29 +01:00
|
|
|
|
root = new_kbnode( pkt );
|
|
|
|
|
pkt = m_alloc( sizeof *pkt );
|
|
|
|
|
init_packet(pkt);
|
|
|
|
|
break;
|
|
|
|
|
|
1998-02-13 21:58:50 +01:00
|
|
|
|
default:
|
1998-04-14 19:51:16 +02:00
|
|
|
|
/* skip pakets at the beginning of a keyring, until we find
|
1998-03-19 16:27:29 +01:00
|
|
|
|
* a start packet; issue a warning if it is not a comment */
|
1998-05-03 21:35:33 +02:00
|
|
|
|
if( !root && pkt->pkttype != PKT_COMMENT
|
1998-10-12 22:16:38 +02:00
|
|
|
|
&& pkt->pkttype != PKT_OLD_COMMENT ) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
1998-03-19 16:27:29 +01:00
|
|
|
|
if( !root || (skipsigs && ( pkt->pkttype == PKT_SIGNATURE
|
1998-05-03 21:35:33 +02:00
|
|
|
|
||pkt->pkttype == PKT_COMMENT
|
|
|
|
|
||pkt->pkttype == PKT_OLD_COMMENT )) ) {
|
1998-03-19 16:27:29 +01:00
|
|
|
|
init_packet(pkt);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
add_kbnode( root, new_kbnode( pkt ) );
|
1998-02-13 21:58:50 +01:00
|
|
|
|
pkt = m_alloc( sizeof *pkt );
|
|
|
|
|
init_packet(pkt);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ready:
|
|
|
|
|
if( rc == -1 && root )
|
|
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
|
|
if( rc )
|
|
|
|
|
release_kbnode( root );
|
|
|
|
|
else
|
|
|
|
|
*ret_root = root;
|
|
|
|
|
free_packet( pkt );
|
|
|
|
|
m_free( pkt );
|
1998-10-12 22:16:38 +02:00
|
|
|
|
|
1998-02-13 21:58:50 +01:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1997-12-16 20:15:09 +01:00
|
|
|
|
/****************
|
1998-04-14 19:51:16 +02:00
|
|
|
|
* Perform insert/delete/update operation.
|
1998-02-11 04:25:44 +01:00
|
|
|
|
* mode 1 = insert
|
|
|
|
|
* 2 = delete
|
|
|
|
|
* 3 = update
|
1997-12-16 20:15:09 +01:00
|
|
|
|
*/
|
1997-12-12 13:03:58 +01:00
|
|
|
|
static int
|
1998-02-11 04:25:44 +01:00
|
|
|
|
keyring_copy( KBPOS *kbpos, int mode, KBNODE root )
|
1997-12-12 13:03:58 +01:00
|
|
|
|
{
|
1997-12-16 20:15:09 +01:00
|
|
|
|
RESTBL *rentry;
|
1998-02-11 04:25:44 +01:00
|
|
|
|
IOBUF fp, newfp;
|
1998-02-17 21:48:52 +01:00
|
|
|
|
int rc=0;
|
1998-02-11 04:25:44 +01:00
|
|
|
|
char *bakfname = NULL;
|
|
|
|
|
char *tmpfname = NULL;
|
1997-12-16 20:15:09 +01:00
|
|
|
|
|
|
|
|
|
if( !(rentry = check_pos( kbpos )) )
|
|
|
|
|
return G10ERR_GENERAL;
|
1998-02-13 21:58:50 +01:00
|
|
|
|
if( kbpos->fp )
|
|
|
|
|
BUG(); /* not allowed with such a handle */
|
1997-12-16 20:15:09 +01:00
|
|
|
|
|
1999-02-25 18:51:55 +01:00
|
|
|
|
if( opt.dry_run )
|
|
|
|
|
return 0;
|
|
|
|
|
|
1999-02-10 17:22:40 +01:00
|
|
|
|
lock_rentry( rentry );
|
1998-11-27 21:40:56 +01:00
|
|
|
|
|
1998-02-11 04:25:44 +01:00
|
|
|
|
/* open the source file */
|
1998-12-10 20:20:47 +01:00
|
|
|
|
fp = iobuf_open( rentry->fname );
|
1998-02-11 04:25:44 +01:00
|
|
|
|
if( mode == 1 && !fp && errno == ENOENT ) { /* no file yet */
|
|
|
|
|
KBNODE kbctx, node;
|
1997-12-16 20:15:09 +01:00
|
|
|
|
|
1998-02-11 04:25:44 +01:00
|
|
|
|
/* insert: create a new file */
|
|
|
|
|
newfp = iobuf_create( rentry->fname );
|
|
|
|
|
if( !newfp ) {
|
1998-11-10 13:59:59 +01:00
|
|
|
|
log_error(_("%s: can't create: %s\n"), rentry->fname, strerror(errno));
|
1999-02-10 17:22:40 +01:00
|
|
|
|
unlock_rentry( rentry );
|
1998-02-11 04:25:44 +01:00
|
|
|
|
return G10ERR_OPEN_FILE;
|
|
|
|
|
}
|
1999-04-18 10:18:52 +02:00
|
|
|
|
else if( !opt.quiet )
|
1998-11-10 13:59:59 +01:00
|
|
|
|
log_info(_("%s: keyring created\n"), rentry->fname );
|
1998-02-11 04:25:44 +01:00
|
|
|
|
|
|
|
|
|
kbctx=NULL;
|
|
|
|
|
while( (node = walk_kbnode( root, &kbctx, 0 )) ) {
|
|
|
|
|
if( (rc = build_packet( newfp, node->pkt )) ) {
|
|
|
|
|
log_error("build_packet(%d) failed: %s\n",
|
|
|
|
|
node->pkt->pkttype, g10_errstr(rc) );
|
|
|
|
|
iobuf_cancel(newfp);
|
1999-02-10 17:22:40 +01:00
|
|
|
|
unlock_rentry( rentry );
|
1998-02-11 04:25:44 +01:00
|
|
|
|
return G10ERR_WRITE_FILE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if( iobuf_close(newfp) ) {
|
|
|
|
|
log_error("%s: close failed: %s\n", rentry->fname, strerror(errno));
|
1999-02-10 17:22:40 +01:00
|
|
|
|
unlock_rentry( rentry );
|
1998-02-11 04:25:44 +01:00
|
|
|
|
return G10ERR_CLOSE_FILE;
|
|
|
|
|
}
|
|
|
|
|
if( chmod( rentry->fname, S_IRUSR | S_IWUSR ) ) {
|
|
|
|
|
log_error("%s: chmod failed: %s\n",
|
|
|
|
|
rentry->fname, strerror(errno) );
|
1999-02-10 17:22:40 +01:00
|
|
|
|
unlock_rentry( rentry );
|
1997-12-16 20:15:09 +01:00
|
|
|
|
return G10ERR_WRITE_FILE;
|
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
return 0;
|
1997-12-16 20:15:09 +01:00
|
|
|
|
}
|
1997-12-19 12:41:47 +01:00
|
|
|
|
if( !fp ) {
|
1998-02-11 04:25:44 +01:00
|
|
|
|
log_error("%s: can't open: %s\n", rentry->fname, strerror(errno) );
|
|
|
|
|
rc = G10ERR_OPEN_FILE;
|
|
|
|
|
goto leave;
|
1997-12-19 12:41:47 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-02-11 04:25:44 +01:00
|
|
|
|
/* create the new file */
|
1999-02-10 17:22:40 +01:00
|
|
|
|
#ifdef USE_ONLY_8DOT3
|
1998-10-06 14:10:02 +02:00
|
|
|
|
/* Here is another Windoze bug?:
|
|
|
|
|
* you cant rename("pubring.gpg.tmp", "pubring.gpg");
|
|
|
|
|
* but rename("pubring.gpg.tmp", "pubring.aaa");
|
|
|
|
|
* works. So we replace .gpg by .bak or .tmp
|
|
|
|
|
*/
|
|
|
|
|
if( strlen(rentry->fname) > 4
|
|
|
|
|
&& !strcmp(rentry->fname+strlen(rentry->fname)-4, ".gpg") ) {
|
|
|
|
|
bakfname = m_alloc( strlen( rentry->fname ) + 1 );
|
|
|
|
|
strcpy(bakfname,rentry->fname);
|
|
|
|
|
strcpy(bakfname+strlen(rentry->fname)-4, ".bak");
|
|
|
|
|
tmpfname = m_alloc( strlen( rentry->fname ) + 1 );
|
|
|
|
|
strcpy(tmpfname,rentry->fname);
|
|
|
|
|
strcpy(tmpfname+strlen(rentry->fname)-4, ".tmp");
|
|
|
|
|
}
|
|
|
|
|
else { /* file does not end with gpg; hmmm */
|
|
|
|
|
bakfname = m_alloc( strlen( rentry->fname ) + 5 );
|
|
|
|
|
strcpy(stpcpy(bakfname,rentry->fname),".bak");
|
|
|
|
|
tmpfname = m_alloc( strlen( rentry->fname ) + 5 );
|
|
|
|
|
strcpy(stpcpy(tmpfname,rentry->fname),".tmp");
|
|
|
|
|
}
|
|
|
|
|
#else
|
1998-02-11 04:25:44 +01:00
|
|
|
|
bakfname = m_alloc( strlen( rentry->fname ) + 2 );
|
|
|
|
|
strcpy(stpcpy(bakfname,rentry->fname),"~");
|
|
|
|
|
tmpfname = m_alloc( strlen( rentry->fname ) + 5 );
|
|
|
|
|
strcpy(stpcpy(tmpfname,rentry->fname),".tmp");
|
1998-10-06 14:10:02 +02:00
|
|
|
|
#endif
|
1998-02-11 04:25:44 +01:00
|
|
|
|
newfp = iobuf_create( tmpfname );
|
|
|
|
|
if( !newfp ) {
|
|
|
|
|
log_error("%s: can't create: %s\n", tmpfname, strerror(errno) );
|
1997-12-19 12:41:47 +01:00
|
|
|
|
iobuf_close(fp);
|
1998-02-11 04:25:44 +01:00
|
|
|
|
rc = G10ERR_OPEN_FILE;
|
|
|
|
|
goto leave;
|
1997-12-19 12:41:47 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-02-11 04:25:44 +01:00
|
|
|
|
if( mode == 1 ) { /* insert */
|
|
|
|
|
/* copy everything to the new file */
|
|
|
|
|
rc = copy_all_packets( fp, newfp );
|
|
|
|
|
if( rc != -1 ) {
|
|
|
|
|
log_error("%s: copy to %s failed: %s\n",
|
|
|
|
|
rentry->fname, tmpfname, g10_errstr(rc) );
|
|
|
|
|
iobuf_close(fp);
|
|
|
|
|
iobuf_cancel(newfp);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
rc = 0;
|
1997-12-19 12:41:47 +01:00
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
|
|
|
|
|
if( mode == 2 || mode == 3 ) { /* delete or update */
|
|
|
|
|
/* copy first part to the new file */
|
|
|
|
|
rc = copy_some_packets( fp, newfp, kbpos->offset );
|
|
|
|
|
if( rc ) { /* should never get EOF here */
|
|
|
|
|
log_error("%s: copy to %s failed: %s\n",
|
|
|
|
|
rentry->fname, tmpfname, g10_errstr(rc) );
|
|
|
|
|
iobuf_close(fp);
|
|
|
|
|
iobuf_cancel(newfp);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
/* skip this keyblock */
|
|
|
|
|
assert( kbpos->count );
|
|
|
|
|
rc = skip_some_packets( fp, kbpos->count );
|
|
|
|
|
if( rc ) {
|
|
|
|
|
log_error("%s: skipping %u packets failed: %s\n",
|
|
|
|
|
rentry->fname, kbpos->count, g10_errstr(rc));
|
|
|
|
|
iobuf_close(fp);
|
|
|
|
|
iobuf_cancel(newfp);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1997-12-19 12:41:47 +01:00
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
|
|
|
|
|
if( mode == 1 || mode == 3 ) { /* insert or update */
|
|
|
|
|
KBNODE kbctx, node;
|
|
|
|
|
|
|
|
|
|
/* append the new data */
|
|
|
|
|
kbctx=NULL;
|
|
|
|
|
while( (node = walk_kbnode( root, &kbctx, 0 )) ) {
|
|
|
|
|
if( (rc = build_packet( newfp, node->pkt )) ) {
|
|
|
|
|
log_error("build_packet(%d) failed: %s\n",
|
|
|
|
|
node->pkt->pkttype, g10_errstr(rc) );
|
|
|
|
|
iobuf_close(fp);
|
|
|
|
|
iobuf_cancel(newfp);
|
|
|
|
|
rc = G10ERR_WRITE_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
}
|
1998-12-23 13:41:40 +01:00
|
|
|
|
kbpos->valid = 0;
|
1997-12-19 12:41:47 +01:00
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
|
|
|
|
|
if( mode == 2 || mode == 3 ) { /* delete or update */
|
|
|
|
|
/* copy the rest */
|
|
|
|
|
rc = copy_all_packets( fp, newfp );
|
|
|
|
|
if( rc != -1 ) {
|
|
|
|
|
log_error("%s: copy to %s failed: %s\n",
|
|
|
|
|
rentry->fname, tmpfname, g10_errstr(rc) );
|
1997-12-19 12:41:47 +01:00
|
|
|
|
iobuf_close(fp);
|
1998-02-11 04:25:44 +01:00
|
|
|
|
iobuf_cancel(newfp);
|
|
|
|
|
goto leave;
|
1997-12-19 12:41:47 +01:00
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
rc = 0;
|
|
|
|
|
}
|
1997-12-19 12:41:47 +01:00
|
|
|
|
|
1998-02-11 04:25:44 +01:00
|
|
|
|
/* close both files */
|
1998-02-27 18:51:28 +01:00
|
|
|
|
if( iobuf_close(fp) ) {
|
|
|
|
|
log_error("%s: close failed: %s\n", rentry->fname, strerror(errno) );
|
|
|
|
|
rc = G10ERR_CLOSE_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
if( iobuf_close(newfp) ) {
|
|
|
|
|
log_error("%s: close failed: %s\n", tmpfname, strerror(errno) );
|
|
|
|
|
rc = G10ERR_CLOSE_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
/* if the new file is a secring, restrict the permissions */
|
1999-02-10 17:22:40 +01:00
|
|
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
1998-02-11 04:25:44 +01:00
|
|
|
|
if( rentry->secret ) {
|
|
|
|
|
if( chmod( tmpfname, S_IRUSR | S_IWUSR ) ) {
|
|
|
|
|
log_error("%s: chmod failed: %s\n",
|
|
|
|
|
tmpfname, strerror(errno) );
|
|
|
|
|
rc = G10ERR_WRITE_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
}
|
1998-10-06 14:10:02 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
1998-02-11 04:25:44 +01:00
|
|
|
|
/* rename and make backup file */
|
1998-08-07 10:53:38 +02:00
|
|
|
|
if( !rentry->secret ) { /* but not for secret keyrings */
|
1999-02-10 17:22:40 +01:00
|
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
1998-08-07 10:53:38 +02:00
|
|
|
|
remove( bakfname );
|
|
|
|
|
#endif
|
|
|
|
|
if( rename( rentry->fname, bakfname ) ) {
|
|
|
|
|
log_error("%s: rename to %s failed: %s\n",
|
|
|
|
|
rentry->fname, bakfname, strerror(errno) );
|
|
|
|
|
rc = G10ERR_RENAME_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
}
|
1999-02-10 17:22:40 +01:00
|
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
1998-02-24 19:50:46 +01:00
|
|
|
|
remove( rentry->fname );
|
|
|
|
|
#endif
|
1998-02-11 04:25:44 +01:00
|
|
|
|
if( rename( tmpfname, rentry->fname ) ) {
|
|
|
|
|
log_error("%s: rename to %s failed: %s\n",
|
|
|
|
|
tmpfname, rentry->fname,strerror(errno) );
|
|
|
|
|
rc = G10ERR_RENAME_FILE;
|
1998-08-07 10:53:38 +02:00
|
|
|
|
if( rentry->secret ) {
|
|
|
|
|
log_info(_(
|
1998-11-10 13:59:59 +01:00
|
|
|
|
"WARNING: 2 files with confidential information exists.\n"));
|
1998-08-07 10:53:38 +02:00
|
|
|
|
log_info(_("%s is the unchanged one\n"), rentry->fname );
|
|
|
|
|
log_info(_("%s is the new one\n"), tmpfname );
|
|
|
|
|
log_info(_("Please fix this possible security flaw\n"));
|
|
|
|
|
}
|
1998-02-11 04:25:44 +01:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
1997-12-19 12:41:47 +01:00
|
|
|
|
|
1998-02-11 04:25:44 +01:00
|
|
|
|
leave:
|
1999-02-10 17:22:40 +01:00
|
|
|
|
unlock_rentry( rentry );
|
1998-02-11 04:25:44 +01:00
|
|
|
|
m_free(bakfname);
|
|
|
|
|
m_free(tmpfname);
|
|
|
|
|
return rc;
|
1997-12-12 13:03:58 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
|
|
|
|
#ifdef HAVE_LIBGDBM
|
1997-12-12 13:03:58 +01:00
|
|
|
|
/****************************************************************
|
1998-10-17 16:47:14 +02:00
|
|
|
|
********** Functions which operates on GDM files ***************
|
1997-12-12 13:03:58 +01:00
|
|
|
|
****************************************************************/
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
#if MAX_FINGERPRINT_LEN > 20
|
|
|
|
|
#error A GDBM keyring assumes that fingerprints are less than 21
|
|
|
|
|
#endif
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
/****************
|
1998-10-21 19:34:36 +02:00
|
|
|
|
* Insert the keyblock into the GDBM database
|
1998-10-17 16:47:14 +02:00
|
|
|
|
*/
|
1998-10-21 19:34:36 +02:00
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
static int
|
1998-10-21 19:34:36 +02:00
|
|
|
|
do_gdbm_store( KBPOS *kbpos, KBNODE root, int update )
|
1998-10-17 16:47:14 +02:00
|
|
|
|
{
|
1998-10-21 19:34:36 +02:00
|
|
|
|
RESTBL *rentry;
|
|
|
|
|
PKT_public_key *pk;
|
|
|
|
|
KBNODE kbctx, node;
|
|
|
|
|
IOBUF fp = NULL;
|
|
|
|
|
byte fpr[20];
|
|
|
|
|
byte contbuf[21];
|
|
|
|
|
byte keybuf[21];
|
|
|
|
|
size_t fprlen;
|
|
|
|
|
datum key, content;
|
|
|
|
|
int i, rc;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
if( !(rentry = check_pos( kbpos )) )
|
|
|
|
|
return G10ERR_GENERAL;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
1999-02-25 18:51:55 +01:00
|
|
|
|
if( opt.dry_run )
|
|
|
|
|
return 0;
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
/* construct the fingerprint which is used as the primary key */
|
|
|
|
|
node = find_kbnode( root, PKT_PUBLIC_KEY );
|
|
|
|
|
if( !node )
|
|
|
|
|
log_bug("a gdbm database can't store secret keys\n");
|
|
|
|
|
pk = node->pkt->pkt.public_key;
|
|
|
|
|
|
|
|
|
|
fingerprint_from_pk( pk, fpr, &fprlen );
|
|
|
|
|
for(i=fprlen; i < DIM(fpr); i++ )
|
|
|
|
|
fpr[i] = 0;
|
|
|
|
|
|
|
|
|
|
/* build the keyblock */
|
|
|
|
|
kbctx=NULL;
|
|
|
|
|
fp = iobuf_temp();
|
|
|
|
|
iobuf_put( fp, 1 ); /* data is a keyblock */
|
|
|
|
|
while( (node = walk_kbnode( root, &kbctx, 0 )) ) {
|
|
|
|
|
if( (rc = build_packet( fp, node->pkt )) ) {
|
|
|
|
|
log_error("build_packet(%d) failed: %s\n",
|
|
|
|
|
node->pkt->pkttype, g10_errstr(rc) );
|
|
|
|
|
rc = G10ERR_WRITE_FILE;
|
|
|
|
|
goto leave;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
1998-10-21 19:34:36 +02:00
|
|
|
|
}
|
|
|
|
|
/* store data and key */
|
|
|
|
|
*keybuf = 1; /* key is a padded fingerprint */
|
|
|
|
|
memcpy(keybuf+1, fpr, 20 );
|
|
|
|
|
key.dptr = keybuf;
|
|
|
|
|
key.dsize = 21;
|
|
|
|
|
content.dptr = iobuf_get_temp_buffer( fp );
|
|
|
|
|
content.dsize = iobuf_get_temp_length( fp );
|
|
|
|
|
rc = gdbm_store( rentry->dbf, key, content,
|
|
|
|
|
update? GDBM_REPLACE : GDBM_INSERT );
|
1998-12-10 20:20:47 +01:00
|
|
|
|
if( rc == 1 && !update )
|
|
|
|
|
rc = gdbm_store( rentry->dbf, key, content, GDBM_REPLACE );
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
if( rc ) {
|
|
|
|
|
log_error("%s: gdbm_store failed: %s\n", rentry->fname,
|
|
|
|
|
rc == 1 ? "already stored"
|
|
|
|
|
: gdbm_strerror(gdbm_errno) );
|
|
|
|
|
rc = G10ERR_WRITE_FILE;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
/* now store all keyids */
|
|
|
|
|
*contbuf = 2; /* data is a list of fingerprints */
|
|
|
|
|
memcpy(contbuf+1, fpr, 20 );
|
|
|
|
|
content.dptr = contbuf;
|
|
|
|
|
content.dsize= 21;
|
|
|
|
|
kbctx=NULL;
|
|
|
|
|
while( (node = walk_kbnode( root, &kbctx, 0 )) ) {
|
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY
|
|
|
|
|
|| node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
|
|
|
|
|
u32 aki[2];
|
|
|
|
|
|
|
|
|
|
keyid_from_pk( node->pkt->pkt.public_key, aki );
|
|
|
|
|
*keybuf = 2; /* key is a 8 byte keyid */
|
|
|
|
|
u32tobuf( keybuf+1 , aki[0] );
|
|
|
|
|
u32tobuf( keybuf+5, aki[1] );
|
|
|
|
|
key.dptr = keybuf;
|
|
|
|
|
key.dsize= 9;
|
|
|
|
|
/* fixme: must be more clever when a insert failed:
|
|
|
|
|
* build a list of fingerprints in this case */
|
|
|
|
|
rc = gdbm_store( rentry->dbf, key, content,
|
|
|
|
|
update? GDBM_REPLACE : GDBM_INSERT );
|
|
|
|
|
if( rc ) {
|
|
|
|
|
log_info("%s: gdbm_store keyid failed: %s\n", rentry->fname,
|
|
|
|
|
rc == 1 ? "already stored"
|
|
|
|
|
: gdbm_strerror(gdbm_errno) );
|
|
|
|
|
rc = 0;
|
|
|
|
|
}
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
leave:
|
1998-10-21 19:34:36 +02:00
|
|
|
|
iobuf_close(fp); /* don't need a cancel because it is a temp iobuf */
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* search one keybox, return 0 if found, -1 if not found or an errorcode.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
do_gdbm_locate( GDBM_FILE dbf, KBPOS *kbpos, const byte *fpr, int fprlen )
|
|
|
|
|
{
|
|
|
|
|
byte *keybuf = kbpos->keybuf;
|
|
|
|
|
datum key;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
*keybuf = 1;
|
|
|
|
|
for(i=0; i < fprlen; i++ )
|
|
|
|
|
keybuf[i+1] = fpr[i];
|
|
|
|
|
for(; i < 20; i++ )
|
|
|
|
|
keybuf[i+1] = 0;
|
|
|
|
|
|
|
|
|
|
/* fetch the data */
|
|
|
|
|
key.dptr = keybuf;
|
|
|
|
|
key.dsize = 21;
|
|
|
|
|
if( !gdbm_exists( dbf, key ) )
|
|
|
|
|
return -1; /* not found */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
|
* locate by keyid.
|
|
|
|
|
* FIXME: we must have a way to enumerate thru the list opf fingerprints
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
do_gdbm_locate_by_keyid( GDBM_FILE dbf, KBPOS *kbpos, u32 *keyid )
|
|
|
|
|
{
|
|
|
|
|
byte keybuf[9];
|
|
|
|
|
datum key, content;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
/* construct the fingerprint which is used as the primary key */
|
|
|
|
|
*keybuf = 2;
|
|
|
|
|
u32tobuf( keybuf+1, keyid[0] );
|
|
|
|
|
u32tobuf( keybuf+5, keyid[1] );
|
|
|
|
|
|
|
|
|
|
/* fetch the data */
|
|
|
|
|
key.dptr = keybuf;
|
|
|
|
|
key.dsize = 9;
|
|
|
|
|
content = gdbm_fetch( dbf, key );
|
|
|
|
|
if( !content.dptr )
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if( content.dsize < 2 ) {
|
|
|
|
|
log_error("gdbm_fetch did not return enough data\n" );
|
|
|
|
|
free( content.dptr ); /* can't use m_free() here */
|
|
|
|
|
return G10ERR_INV_KEYRING;
|
|
|
|
|
}
|
|
|
|
|
if( *content.dptr != 2 ) {
|
|
|
|
|
log_error("gdbm_fetch returned unexpected type %d\n",
|
|
|
|
|
*(byte*)content.dptr );
|
|
|
|
|
free( content.dptr ); /* can't use m_free() here */
|
|
|
|
|
return G10ERR_INV_KEYRING;
|
|
|
|
|
}
|
|
|
|
|
if( content.dsize < 21 ) {
|
|
|
|
|
log_error("gdbm_fetch did not return a complete fingerprint\n" );
|
|
|
|
|
free( content.dptr ); /* can't use m_free() here */
|
|
|
|
|
return G10ERR_INV_KEYRING;
|
|
|
|
|
}
|
|
|
|
|
if( content.dsize > 21 )
|
1998-11-10 13:59:59 +01:00
|
|
|
|
log_info("gdbm_fetch: WARNING: more than one fingerprint\n" );
|
1998-10-21 19:34:36 +02:00
|
|
|
|
|
|
|
|
|
rc = do_gdbm_locate( dbf, kbpos, content.dptr+1, 20 );
|
|
|
|
|
free( content.dptr ); /* can't use m_free() here */
|
1998-10-17 16:47:14 +02:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
static int
|
|
|
|
|
do_gdbm_read( KBPOS *kbpos, KBNODE *ret_root )
|
|
|
|
|
{
|
|
|
|
|
PACKET *pkt;
|
|
|
|
|
int rc;
|
|
|
|
|
RESTBL *rentry;
|
|
|
|
|
KBNODE root = NULL;
|
|
|
|
|
IOBUF a;
|
1998-10-21 19:34:36 +02:00
|
|
|
|
datum key, content;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
|
|
|
|
if( !(rentry=check_pos(kbpos)) )
|
|
|
|
|
return G10ERR_GENERAL;
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
key.dptr = kbpos->keybuf;
|
|
|
|
|
key.dsize = 21;
|
|
|
|
|
content = gdbm_fetch( rentry->dbf, key );
|
|
|
|
|
if( !content.dptr ) {
|
|
|
|
|
log_error("gdbm_fetch failed: %s\n", gdbm_strerror(gdbm_errno) );
|
|
|
|
|
return G10ERR_INV_KEYRING;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
1998-10-21 19:34:36 +02:00
|
|
|
|
if( content.dsize < 2 ) {
|
|
|
|
|
log_error("gdbm_fetch did not return enough data\n" );
|
|
|
|
|
free( content.dptr ); /* can't use m_free() here */
|
|
|
|
|
return G10ERR_INV_KEYRING;
|
|
|
|
|
}
|
|
|
|
|
if( *content.dptr != 1 ) {
|
|
|
|
|
log_error("gdbm_fetch returned unexpected type %d\n",
|
|
|
|
|
*(byte*)content.dptr );
|
|
|
|
|
free( content.dptr ); /* can't use m_free() here */
|
|
|
|
|
return G10ERR_INV_KEYRING;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
a = iobuf_temp_with_content( content.dptr+1, content.dsize-1 );
|
|
|
|
|
free( content.dptr ); /* can't use m_free() here */
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
|
pkt = m_alloc( sizeof *pkt );
|
|
|
|
|
init_packet(pkt);
|
|
|
|
|
kbpos->count=0;
|
|
|
|
|
while( (rc=parse_packet(a, pkt)) != -1 ) {
|
|
|
|
|
if( rc ) { /* ignore errors */
|
|
|
|
|
if( rc != G10ERR_UNKNOWN_PACKET ) {
|
|
|
|
|
log_error("read_keyblock: read error: %s\n", g10_errstr(rc) );
|
|
|
|
|
rc = G10ERR_INV_KEYRING;
|
1998-10-21 19:34:36 +02:00
|
|
|
|
break;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
|
|
|
|
kbpos->count++;
|
|
|
|
|
free_packet( pkt );
|
|
|
|
|
init_packet( pkt );
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
/* make a linked list of all packets */
|
1998-10-21 19:34:36 +02:00
|
|
|
|
kbpos->count++;
|
|
|
|
|
if( !root )
|
|
|
|
|
root = new_kbnode( pkt );
|
|
|
|
|
else
|
|
|
|
|
add_kbnode( root, new_kbnode( pkt ) );
|
|
|
|
|
pkt = m_alloc( sizeof *pkt );
|
|
|
|
|
init_packet(pkt);
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
|
|
|
|
if( rc == -1 && root )
|
|
|
|
|
rc = 0;
|
|
|
|
|
if( rc )
|
|
|
|
|
release_kbnode( root );
|
|
|
|
|
else
|
|
|
|
|
*ret_root = root;
|
|
|
|
|
free_packet( pkt );
|
|
|
|
|
m_free( pkt );
|
|
|
|
|
iobuf_close(a);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
/****************
|
|
|
|
|
* Enum over keyblok data
|
|
|
|
|
*/
|
1998-10-17 16:47:14 +02:00
|
|
|
|
static int
|
1998-10-21 19:34:36 +02:00
|
|
|
|
do_gdbm_enum( KBPOS *kbpos, KBNODE *ret_root )
|
1998-10-17 16:47:14 +02:00
|
|
|
|
{
|
|
|
|
|
RESTBL *rentry;
|
1998-10-21 19:34:36 +02:00
|
|
|
|
datum key, helpkey;
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
|
|
|
|
if( !(rentry=check_pos(kbpos)) )
|
|
|
|
|
return G10ERR_GENERAL;
|
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
if( !kbpos->offset ) {
|
|
|
|
|
kbpos->offset = 1;
|
|
|
|
|
key = gdbm_firstkey( rentry->dbf );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
1998-10-21 19:34:36 +02:00
|
|
|
|
else {
|
|
|
|
|
helpkey.dptr = kbpos->keybuf;
|
|
|
|
|
helpkey.dsize= 21;
|
|
|
|
|
key = gdbm_nextkey( rentry->dbf, helpkey );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
1998-10-21 19:34:36 +02:00
|
|
|
|
while( key.dptr && (!key.dsize || *key.dptr != 1) ) {
|
|
|
|
|
helpkey = key;
|
|
|
|
|
key = gdbm_nextkey( rentry->dbf, helpkey );
|
|
|
|
|
free( helpkey.dptr ); /* free and not m_free() ! */
|
|
|
|
|
}
|
|
|
|
|
if( !key.dptr )
|
|
|
|
|
return -1; /* eof */
|
1998-10-17 16:47:14 +02:00
|
|
|
|
|
1998-10-21 19:34:36 +02:00
|
|
|
|
if( key.dsize < 21 ) {
|
|
|
|
|
free( key.dptr ); /* free and not m_free() ! */
|
|
|
|
|
log_error("do_gdm_enum: key is too short\n" );
|
|
|
|
|
return G10ERR_INV_KEYRING;
|
|
|
|
|
}
|
|
|
|
|
memcpy( kbpos->keybuf, key.dptr, 21 );
|
|
|
|
|
free( key.dptr ); /* free and not m_free() ! */
|
|
|
|
|
return do_gdbm_read( kbpos, ret_root );
|
1998-10-17 16:47:14 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /*HAVE_LIBGDBM*/
|