mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
f3ba66781a
* kbx/keybox-util.c (keybox_set_malloc_hooks): Remove. (_keybox_malloc, _keybox_calloc, keybox_realloc) (_keybox_free): Remove. (keybox_file_rename): Remove. Was not used. * sm/gpgsm.c (main): Remove call to keybox_set_malloc_hooks. * kbx/kbxutil.c (main): Ditto. * kbx/keybox-defs.h: Remove all separate includes. Include util.h. remove convenience macros. * common/logging.h (return_if_fail): New. Originally from keybox-defs.h but now using log_debug. (return_null_if_fail): Ditto. (return_val_if_fail): Ditto. (never_reached): Ditto. -- Originally the KBX code was written to allow standalone use. However this required lot of ugliness like separate memory allocators and such. It also precludes the use of some standard functions from common due to their use of the common gnupg malloc functions. Dropping all that makes things easier. Minor disadvantages: the kbx call done for gpg will now use gcry malloc fucntions and not the standard malloc functions. This might be a bit slower but removing them even fixes a possible bug in keybox_tmp_names which is used in gpg and uses gpg's xfree which is actually gcry_free. Signed-off-by: Werner Koch <wk@gnupg.org>
210 lines
5.9 KiB
C
210 lines
5.9 KiB
C
/* keybox-defs.h - internal Keybox definitions
|
|
* Copyright (C) 2001, 2004 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* 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, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef KEYBOX_DEFS_H
|
|
#define KEYBOX_DEFS_H 1
|
|
|
|
#ifdef GPG_ERR_SOURCE_DEFAULT
|
|
# if GPG_ERR_SOURCE_DEFAULT != GPG_ERR_SOURCE_KEYBOX
|
|
# error GPG_ERR_SOURCE_DEFAULT already defined
|
|
# endif
|
|
#else
|
|
# define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KEYBOX
|
|
#endif
|
|
#include <gpg-error.h>
|
|
#define map_assuan_err(a) \
|
|
map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a))
|
|
|
|
#include <sys/types.h> /* off_t */
|
|
|
|
#include "../common/util.h"
|
|
#include "keybox.h"
|
|
|
|
|
|
typedef struct keyboxblob *KEYBOXBLOB;
|
|
|
|
|
|
typedef struct keybox_name *KB_NAME;
|
|
struct keybox_name
|
|
{
|
|
/* Link to the next resources, so that we can walk all
|
|
resources. */
|
|
KB_NAME next;
|
|
|
|
/* True if this is a keybox with secret keys. */
|
|
int secret;
|
|
|
|
/* A table with all the handles accessing this resources.
|
|
HANDLE_TABLE_SIZE gives the allocated length of this table unused
|
|
entrues are set to NULL. HANDLE_TABLE may be NULL. */
|
|
KEYBOX_HANDLE *handle_table;
|
|
size_t handle_table_size;
|
|
|
|
/* The lock handle or NULL it not yet initialized. */
|
|
dotlock_t lockhd;
|
|
|
|
/* Not yet used. */
|
|
int is_locked;
|
|
|
|
/* Not yet used. */
|
|
int did_full_scan;
|
|
|
|
/* The name of the resource file. */
|
|
char fname[1];
|
|
};
|
|
|
|
|
|
struct keybox_found_s
|
|
{
|
|
KEYBOXBLOB blob;
|
|
size_t pk_no;
|
|
size_t uid_no;
|
|
};
|
|
|
|
struct keybox_handle {
|
|
KB_NAME kb;
|
|
int secret; /* this is for a secret keybox */
|
|
FILE *fp;
|
|
int eof;
|
|
int error;
|
|
int ephemeral;
|
|
int for_openpgp; /* Used by gpg. */
|
|
struct keybox_found_s found;
|
|
struct keybox_found_s saved_found;
|
|
struct {
|
|
char *name;
|
|
char *pattern;
|
|
} word_match;
|
|
};
|
|
|
|
|
|
/* Openpgp helper structures. */
|
|
struct _keybox_openpgp_key_info
|
|
{
|
|
struct _keybox_openpgp_key_info *next;
|
|
int algo;
|
|
unsigned char keyid[8];
|
|
int fprlen; /* Either 16 or 20 */
|
|
unsigned char fpr[20];
|
|
};
|
|
|
|
struct _keybox_openpgp_uid_info
|
|
{
|
|
struct _keybox_openpgp_uid_info *next;
|
|
size_t off;
|
|
size_t len;
|
|
};
|
|
|
|
struct _keybox_openpgp_info
|
|
{
|
|
int is_secret; /* True if this is a secret key. */
|
|
unsigned int nsubkeys;/* Total number of subkeys. */
|
|
unsigned int nuids; /* Total number of user IDs in the keyblock. */
|
|
unsigned int nsigs; /* Total number of signatures in the keyblock. */
|
|
|
|
/* Note, we use 2 structs here to better cope with the most common
|
|
use of having one primary and one subkey - this allows us to
|
|
statically allocate this structure and only malloc stuff for more
|
|
than one subkey. */
|
|
struct _keybox_openpgp_key_info primary;
|
|
struct _keybox_openpgp_key_info subkeys;
|
|
struct _keybox_openpgp_uid_info uids;
|
|
};
|
|
typedef struct _keybox_openpgp_info *keybox_openpgp_info_t;
|
|
|
|
|
|
/* Don't know whether this is needed: */
|
|
/* static struct { */
|
|
/* int dry_run; */
|
|
/* int quiet; */
|
|
/* int verbose; */
|
|
/* int preserve_permissions; */
|
|
/* } keybox_opt; */
|
|
|
|
/*-- keybox-init.c --*/
|
|
void _keybox_close_file (KEYBOX_HANDLE hd);
|
|
|
|
|
|
/*-- keybox-blob.c --*/
|
|
gpg_error_t _keybox_create_openpgp_blob (KEYBOXBLOB *r_blob,
|
|
keybox_openpgp_info_t info,
|
|
const unsigned char *image,
|
|
size_t imagelen,
|
|
int as_ephemeral);
|
|
#ifdef KEYBOX_WITH_X509
|
|
int _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert,
|
|
unsigned char *sha1_digest, int as_ephemeral);
|
|
#endif /*KEYBOX_WITH_X509*/
|
|
|
|
int _keybox_new_blob (KEYBOXBLOB *r_blob,
|
|
unsigned char *image, size_t imagelen,
|
|
off_t off);
|
|
void _keybox_release_blob (KEYBOXBLOB blob);
|
|
const unsigned char *_keybox_get_blob_image (KEYBOXBLOB blob, size_t *n);
|
|
off_t _keybox_get_blob_fileoffset (KEYBOXBLOB blob);
|
|
void _keybox_update_header_blob (KEYBOXBLOB blob, int for_openpgp);
|
|
|
|
/*-- keybox-openpgp.c --*/
|
|
gpg_error_t _keybox_parse_openpgp (const unsigned char *image, size_t imagelen,
|
|
size_t *nparsed,
|
|
keybox_openpgp_info_t info);
|
|
void _keybox_destroy_openpgp_info (keybox_openpgp_info_t info);
|
|
|
|
|
|
/*-- keybox-file.c --*/
|
|
int _keybox_read_blob (KEYBOXBLOB *r_blob, FILE *fp, int *skipped_deleted);
|
|
int _keybox_write_blob (KEYBOXBLOB blob, FILE *fp);
|
|
|
|
/*-- keybox-search.c --*/
|
|
gpg_err_code_t _keybox_get_flag_location (const unsigned char *buffer,
|
|
size_t length,
|
|
int what,
|
|
size_t *flag_off, size_t *flag_size);
|
|
|
|
static inline int
|
|
blob_get_type (KEYBOXBLOB blob)
|
|
{
|
|
const unsigned char *buffer;
|
|
size_t length;
|
|
|
|
buffer = _keybox_get_blob_image (blob, &length);
|
|
if (length < 32)
|
|
return -1; /* blob too short */
|
|
|
|
return buffer[4];
|
|
}
|
|
|
|
|
|
/*-- keybox-dump.c --*/
|
|
int _keybox_dump_blob (KEYBOXBLOB blob, FILE *fp);
|
|
int _keybox_dump_file (const char *filename, int stats_only, FILE *outfp);
|
|
int _keybox_dump_find_dups (const char *filename, int print_them, FILE *outfp);
|
|
int _keybox_dump_cut_records (const char *filename, unsigned long from,
|
|
unsigned long to, FILE *outfp);
|
|
|
|
|
|
/*-- keybox-util.c --*/
|
|
|
|
/*
|
|
* A couple of handy macros
|
|
*/
|
|
|
|
|
|
#endif /*KEYBOX_DEFS_H*/
|