mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-07 23:27:48 +02:00
9dc355ad3a
* kbx/keybox-init.c (keybox_register_file): Change interface to return the token even if the file has already been registered. * g10/keydb.c (primary_keyring): Rename to primary_keydb. (maybe_create_keyring_or_box): Change return type to gpg_error_t. (keydb_add_resource): Ditto. s/rc/err/. (keydb_add_resource): Mark an already registered as primary. * sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t. (keydb_add_resource): Ditto. s/rc/err/. (keydb_add_resource): Adjust for changed keybox_register_file. -- This change aligns the registering of keyboxes with those of keyrings. This fixes a potential bug: gpg --keyring foo.kbx --keyring bar.gpg --keyring foo.kbx would have marked bar.gpg as primary resource and thus inserting new keys there. The correct and now fixed behavior is to insert to foo.kbx. Signed-off-by: Werner Koch <wk@gnupg.org>
77 lines
2.9 KiB
C
77 lines
2.9 KiB
C
/* keydb.h - Key database
|
|
* Copyright (C) 1998, 1999, 2000, 2001 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 <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GNUPG_KEYDB_H
|
|
#define GNUPG_KEYDB_H
|
|
|
|
#include <ksba.h>
|
|
|
|
#include "../common/userids.h"
|
|
|
|
typedef struct keydb_handle *KEYDB_HANDLE;
|
|
|
|
/* Flag value used with KEYBOX_FLAG_VALIDITY. */
|
|
#define VALIDITY_REVOKED (1<<5)
|
|
|
|
|
|
/*-- keydb.c --*/
|
|
gpg_error_t keydb_add_resource (const char *url, int force, int secret,
|
|
int *auto_created);
|
|
KEYDB_HANDLE keydb_new (int secret);
|
|
void keydb_release (KEYDB_HANDLE hd);
|
|
int keydb_set_ephemeral (KEYDB_HANDLE hd, int yes);
|
|
const char *keydb_get_resource_name (KEYDB_HANDLE hd);
|
|
gpg_error_t keydb_lock (KEYDB_HANDLE hd);
|
|
|
|
gpg_error_t keydb_get_flags (KEYDB_HANDLE hd, int which, int idx,
|
|
unsigned int *value);
|
|
gpg_error_t keydb_set_flags (KEYDB_HANDLE hd, int which, int idx,
|
|
unsigned int value);
|
|
void keydb_push_found_state (KEYDB_HANDLE hd);
|
|
void keydb_pop_found_state (KEYDB_HANDLE hd);
|
|
int keydb_get_cert (KEYDB_HANDLE hd, ksba_cert_t *r_cert);
|
|
int keydb_insert_cert (KEYDB_HANDLE hd, ksba_cert_t cert);
|
|
int keydb_update_cert (KEYDB_HANDLE hd, ksba_cert_t cert);
|
|
|
|
int keydb_delete (KEYDB_HANDLE hd, int unlock);
|
|
|
|
int keydb_locate_writable (KEYDB_HANDLE hd, const char *reserved);
|
|
void keydb_rebuild_caches (void);
|
|
|
|
int keydb_search_reset (KEYDB_HANDLE hd);
|
|
int keydb_search (KEYDB_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc);
|
|
int keydb_search_first (KEYDB_HANDLE hd);
|
|
int keydb_search_next (KEYDB_HANDLE hd);
|
|
int keydb_search_kid (KEYDB_HANDLE hd, u32 *kid);
|
|
int keydb_search_fpr (KEYDB_HANDLE hd, const byte *fpr);
|
|
int keydb_search_issuer (KEYDB_HANDLE hd, const char *issuer);
|
|
int keydb_search_issuer_sn (KEYDB_HANDLE hd,
|
|
const char *issuer, const unsigned char *serial);
|
|
int keydb_search_subject (KEYDB_HANDLE hd, const char *issuer);
|
|
|
|
int keydb_store_cert (ksba_cert_t cert, int ephemeral, int *existed);
|
|
gpg_error_t keydb_set_cert_flags (ksba_cert_t cert, int ephemeral,
|
|
int which, int idx,
|
|
unsigned int mask, unsigned int value);
|
|
|
|
void keydb_clear_some_cert_flags (ctrl_t ctrl, strlist_t names);
|
|
|
|
|
|
#endif /*GNUPG_KEYDB_H*/
|