2015-09-02 15:07:06 +02:00
|
|
|
/* test-stubs.c - The GnuPG signature verify utility
|
|
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2006,
|
|
|
|
* 2008, 2009, 2012 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
|
2016-11-05 12:02:19 +01:00
|
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2015-09-02 15:07:06 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#define INCLUDED_BY_MAIN_MODULE 1
|
|
|
|
#include "gpg.h"
|
2017-03-07 12:21:23 +01:00
|
|
|
#include "../common/util.h"
|
2015-09-02 15:07:06 +02:00
|
|
|
#include "packet.h"
|
2017-03-07 12:21:23 +01:00
|
|
|
#include "../common/iobuf.h"
|
2015-09-02 15:07:06 +02:00
|
|
|
#include "main.h"
|
|
|
|
#include "options.h"
|
|
|
|
#include "keydb.h"
|
|
|
|
#include "trustdb.h"
|
|
|
|
#include "filter.h"
|
2017-03-07 12:21:23 +01:00
|
|
|
#include "../common/ttyio.h"
|
|
|
|
#include "../common/i18n.h"
|
|
|
|
#include "../common/sysutils.h"
|
|
|
|
#include "../common/status.h"
|
2015-09-02 15:07:06 +02:00
|
|
|
#include "call-agent.h"
|
|
|
|
|
|
|
|
int g10_errors_seen;
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
g10_exit( int rc )
|
|
|
|
{
|
|
|
|
rc = rc? rc : log_get_errorcount(0)? 2 : g10_errors_seen? 1 : 0;
|
|
|
|
exit(rc );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Stub:
|
2015-11-16 12:41:46 +01:00
|
|
|
* We have to override the trustcheck from pkclist.c because
|
2015-09-02 15:07:06 +02:00
|
|
|
* this utility assumes that all keys in the keyring are trustworthy
|
|
|
|
*/
|
2020-06-08 20:13:25 +02:00
|
|
|
gpg_error_t
|
|
|
|
check_signatures_trust (ctrl_t ctrl, kbnode_t kblock,
|
|
|
|
PKT_public_key *pk, PKT_signature *sig)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2016-05-21 11:41:49 +02:00
|
|
|
(void)ctrl;
|
2020-06-08 20:13:25 +02:00
|
|
|
(void)kblock;
|
|
|
|
(void)pk;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)sig;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2017-03-31 20:03:52 +02:00
|
|
|
read_trust_options (ctrl_t ctrl,
|
|
|
|
byte *trust_model, ulong *created, ulong *nextcheck,
|
|
|
|
byte *marginals, byte *completes, byte *cert_depth,
|
|
|
|
byte *min_cert_level)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2017-03-31 20:03:52 +02:00
|
|
|
(void)ctrl;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)trust_model;
|
|
|
|
(void)created;
|
|
|
|
(void)nextcheck;
|
|
|
|
(void)marginals;
|
|
|
|
(void)completes;
|
|
|
|
(void)cert_depth;
|
|
|
|
(void)min_cert_level;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Stub:
|
|
|
|
* We don't have the trustdb , so we have to provide some stub functions
|
|
|
|
* instead
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2017-03-31 20:03:52 +02:00
|
|
|
cache_disabled_value (ctrl_t ctrl, PKT_public_key *pk)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2017-03-31 20:03:52 +02:00
|
|
|
(void)ctrl;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)pk;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2016-05-21 11:41:49 +02:00
|
|
|
check_trustdb_stale (ctrl_t ctrl)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2016-05-21 11:41:49 +02:00
|
|
|
(void)ctrl;
|
2015-09-02 15:07:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2016-11-23 12:29:22 +01:00
|
|
|
get_validity_info (ctrl_t ctrl, kbnode_t kb, PKT_public_key *pk,
|
|
|
|
PKT_user_id *uid)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2016-05-21 11:41:49 +02:00
|
|
|
(void)ctrl;
|
2016-11-23 12:29:22 +01:00
|
|
|
(void)kb;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)pk;
|
|
|
|
(void)uid;
|
|
|
|
return '?';
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned int
|
2016-11-23 12:29:22 +01:00
|
|
|
get_validity (ctrl_t ctrl, kbnode_t kb, PKT_public_key *pk, PKT_user_id *uid,
|
2016-05-21 11:41:49 +02:00
|
|
|
PKT_signature *sig, int may_ask)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2016-05-21 11:41:49 +02:00
|
|
|
(void)ctrl;
|
2016-11-23 12:29:22 +01:00
|
|
|
(void)kb;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)pk;
|
|
|
|
(void)uid;
|
g10: Add TOFU support.
* configure.ac: Check for sqlite3.
(SQLITE3_CFLAGS): AC_SUBST it.
(SQLITE3_LIBS): Likewise.
* g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
(gpg2_SOURCES): Add tofu.h and tofu.c.
(gpg2_LDADD): Add $(SQLITE3_LIBS).
* g10/tofu.c: New file.
* g10/tofu.h: New file.
* g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
(tofu_db_format): Define.
* g10/packet.h (PKT_signature): Add fields digest and digest_len.
* g10/gpg.c: Include "tofu.h".
(cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
oTOFUDBFormat.
(opts): Add them.
(parse_trust_model): Recognize the tofu and tofu+pgp trust models.
(parse_tofu_policy): New function.
(parse_tofu_db_format): New function.
(main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
* g10/mainproc.c (do_check_sig): If the signature is good, copy the
hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
* g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
callers.
(tdb_get_validity_core): Add arguments sig and may_ask. Update
callers.
* g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
to tdb_get_validity_core.
* g10/trustdb.c: Include "tofu.h".
(trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
(tdb_get_validity_core): Add arguments sig and may_ask. If
OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
level. Combine it with the computed PGP trust level, if appropriate.
* g10/keyedit.c: Include "tofu.h".
(show_key_with_all_names_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/keylist.c: Include "tofu.h".
(public_key_list): Also show the PGP stats if the trust model is
TM_TOFU_PGP.
(list_keyblock_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/pkclist.c: Include "tofu.h".
* g10/gpgv.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* doc/DETAILS: Describe the TOFU Policy field.
* doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
--trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
* tests/openpgp/Makefile.am (TESTS): Add tofu.test.
(TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
(CLEANFILES): Add tofu.db.
(clean-local): Add tofu.d.
* tests/openpgp/tofu.test: New file.
* tests/openpgp/tofu-2183839A-1.txt: New file.
* tests/openpgp/tofu-BC15C85A-1.txt: New file.
* tests/openpgp/tofu-EE37CF96-1.txt: New file.
* tests/openpgp/tofu-keys.asc: New file.
* tests/openpgp/tofu-keys-secret.asc: New file.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
2015-10-18 18:44:05 +02:00
|
|
|
(void)sig;
|
|
|
|
(void)may_ask;
|
2015-09-02 15:07:06 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
|
|
|
trust_value_to_string (unsigned int value)
|
|
|
|
{
|
|
|
|
(void)value;
|
|
|
|
return "err";
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
2016-05-21 11:41:49 +02:00
|
|
|
uid_trust_string_fixed (ctrl_t ctrl, PKT_public_key *key, PKT_user_id *uid)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2016-05-21 11:41:49 +02:00
|
|
|
(void)ctrl;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)key;
|
|
|
|
(void)uid;
|
|
|
|
return "err";
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-03-31 20:03:52 +02:00
|
|
|
get_ownertrust_info (ctrl_t ctrl, PKT_public_key *pk, int no_create)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2017-03-31 20:03:52 +02:00
|
|
|
(void)ctrl;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)pk;
|
2017-02-28 20:28:56 +01:00
|
|
|
(void)no_create;
|
2015-09-02 15:07:06 +02:00
|
|
|
return '?';
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned int
|
2017-03-31 20:03:52 +02:00
|
|
|
get_ownertrust (ctrl_t ctrl, PKT_public_key *pk)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2017-03-31 20:03:52 +02:00
|
|
|
(void)ctrl;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)pk;
|
|
|
|
return TRUST_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Stubs:
|
|
|
|
* Because we only work with trusted keys, it does not make sense to
|
|
|
|
* get them from a keyserver
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct keyserver_spec *
|
|
|
|
keyserver_match (struct keyserver_spec *spec)
|
|
|
|
{
|
|
|
|
(void)spec;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-01-21 11:49:27 +01:00
|
|
|
int
|
|
|
|
keyserver_any_configured (ctrl_t ctrl)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-02 15:07:06 +02:00
|
|
|
int
|
2021-04-16 20:21:23 +02:00
|
|
|
keyserver_import_keyid (u32 *keyid, void *dummy, unsigned int flags)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
|
|
|
(void)keyid;
|
|
|
|
(void)dummy;
|
2021-04-16 20:21:23 +02:00
|
|
|
(void)flags;
|
2015-09-02 15:07:06 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2016-06-20 23:58:16 +02:00
|
|
|
int
|
|
|
|
keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
|
2021-04-16 20:21:23 +02:00
|
|
|
struct keyserver_spec *keyserver, unsigned int flags)
|
2016-06-20 23:58:16 +02:00
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)fprint;
|
|
|
|
(void)fprint_len;
|
|
|
|
(void)keyserver;
|
2021-04-16 20:21:23 +02:00
|
|
|
(void)flags;
|
2016-06-20 23:58:16 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2015-09-02 15:07:06 +02:00
|
|
|
int
|
|
|
|
keyserver_import_cert (const char *name)
|
|
|
|
{
|
|
|
|
(void)name;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2016-04-27 08:34:29 +02:00
|
|
|
gpg_error_t
|
2021-04-16 20:21:23 +02:00
|
|
|
keyserver_import_wkd (ctrl_t ctrl, const char *name, unsigned int flags,
|
2016-04-27 08:34:29 +02:00
|
|
|
unsigned char **fpr, size_t *fpr_len)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)name;
|
2021-04-16 20:21:23 +02:00
|
|
|
(void)flags;
|
2016-04-27 08:34:29 +02:00
|
|
|
(void)fpr;
|
|
|
|
(void)fpr_len;
|
|
|
|
return GPG_ERR_BUG;
|
|
|
|
}
|
|
|
|
|
2015-09-02 15:07:06 +02:00
|
|
|
int
|
|
|
|
keyserver_import_name (const char *name,struct keyserver_spec *spec)
|
|
|
|
{
|
|
|
|
(void)name;
|
|
|
|
(void)spec;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2020-12-17 18:18:52 +01:00
|
|
|
int
|
|
|
|
keyserver_import_ntds (ctrl_t ctrl, const char *mbox,
|
|
|
|
unsigned char **fpr, size_t *fprlen)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)mbox;
|
|
|
|
(void)fpr;
|
|
|
|
(void)fprlen;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2015-09-02 15:07:06 +02:00
|
|
|
int
|
|
|
|
keyserver_import_ldap (const char *name)
|
|
|
|
{
|
|
|
|
(void)name;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2016-07-06 14:03:50 +02:00
|
|
|
gpg_error_t
|
2020-03-13 17:14:34 +01:00
|
|
|
read_key_from_file_or_buffer (ctrl_t ctrl, const char *fname,
|
|
|
|
const void *buffer, size_t buflen,
|
|
|
|
kbnode_t *r_keyblock)
|
2016-07-06 14:03:50 +02:00
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)fname;
|
2020-03-13 17:14:34 +01:00
|
|
|
(void)buffer;
|
|
|
|
(void)buflen;
|
2016-07-06 14:03:50 +02:00
|
|
|
(void)r_keyblock;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2020-03-13 17:14:34 +01:00
|
|
|
gpg_error_t
|
|
|
|
import_included_key_block (ctrl_t ctrl, kbnode_t keyblock)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)keyblock;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-09-02 15:07:06 +02:00
|
|
|
/* Stub:
|
|
|
|
* No encryption here but mainproc links to these functions.
|
|
|
|
*/
|
|
|
|
gpg_error_t
|
2018-08-27 06:12:31 +02:00
|
|
|
get_session_key (ctrl_t ctrl, struct pubkey_enc_list *k, DEK *dek)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
2015-11-03 23:15:27 +01:00
|
|
|
(void)ctrl;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)k;
|
|
|
|
(void)dek;
|
|
|
|
return GPG_ERR_GENERAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Stub: */
|
|
|
|
gpg_error_t
|
|
|
|
get_override_session_key (DEK *dek, const char *string)
|
|
|
|
{
|
|
|
|
(void)dek;
|
|
|
|
(void)string;
|
|
|
|
return GPG_ERR_GENERAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Stub: */
|
|
|
|
int
|
|
|
|
decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)procctx;
|
|
|
|
(void)ed;
|
|
|
|
(void)dek;
|
|
|
|
return GPG_ERR_GENERAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Stub:
|
|
|
|
* No interactive commands, so we don't need the helptexts
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
display_online_help (const char *keyword)
|
|
|
|
{
|
|
|
|
(void)keyword;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Stub:
|
|
|
|
* We don't use secret keys, but getkey.c links to this
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
check_secret_key (PKT_public_key *pk, int n)
|
|
|
|
{
|
|
|
|
(void)pk;
|
|
|
|
(void)n;
|
|
|
|
return GPG_ERR_GENERAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Stub:
|
|
|
|
* No secret key, so no passphrase needed
|
|
|
|
*/
|
|
|
|
DEK *
|
2016-08-08 18:45:29 +02:00
|
|
|
passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, int create, int nocache,
|
2015-09-02 15:07:06 +02:00
|
|
|
const char *tmp, int *canceled)
|
|
|
|
{
|
|
|
|
(void)cipher_algo;
|
|
|
|
(void)s2k;
|
2016-08-08 18:45:29 +02:00
|
|
|
(void)create;
|
|
|
|
(void)nocache;
|
2015-09-02 15:07:06 +02:00
|
|
|
(void)tmp;
|
|
|
|
|
|
|
|
if (canceled)
|
|
|
|
*canceled = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2016-08-08 18:45:29 +02:00
|
|
|
passphrase_clear_cache (const char *cacheid)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
|
|
|
(void)cacheid;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct keyserver_spec *
|
|
|
|
parse_preferred_keyserver(PKT_signature *sig)
|
|
|
|
{
|
|
|
|
(void)sig;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct keyserver_spec *
|
|
|
|
parse_keyserver_uri (const char *uri, int require_scheme,
|
|
|
|
const char *configname, unsigned int configlineno)
|
|
|
|
{
|
|
|
|
(void)uri;
|
|
|
|
(void)require_scheme;
|
|
|
|
(void)configname;
|
|
|
|
(void)configlineno;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
free_keyserver_spec (struct keyserver_spec *keyserver)
|
|
|
|
{
|
|
|
|
(void)keyserver;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Stubs to avoid linking to photoid.c */
|
|
|
|
void
|
|
|
|
show_photos (const struct user_attribute *attrs, int count, PKT_public_key *pk)
|
|
|
|
{
|
|
|
|
(void)attrs;
|
|
|
|
(void)count;
|
|
|
|
(void)pk;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
parse_image_header (const struct user_attribute *attr, byte *type, u32 *len)
|
|
|
|
{
|
|
|
|
(void)attr;
|
|
|
|
(void)type;
|
|
|
|
(void)len;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
image_type_to_string (byte type, int string)
|
|
|
|
{
|
|
|
|
(void)type;
|
|
|
|
(void)string;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef ENABLE_CARD_SUPPORT
|
|
|
|
int
|
|
|
|
agent_scd_getattr (const char *name, struct agent_card_info_s *info)
|
|
|
|
{
|
|
|
|
(void)name;
|
|
|
|
(void)info;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* ENABLE_CARD_SUPPORT */
|
|
|
|
|
|
|
|
/* We do not do any locking, so use these stubs here */
|
|
|
|
void
|
|
|
|
dotlock_disable (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
dotlock_t
|
|
|
|
dotlock_create (const char *file_to_lock, unsigned int flags)
|
|
|
|
{
|
|
|
|
(void)file_to_lock;
|
|
|
|
(void)flags;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
dotlock_destroy (dotlock_t h)
|
|
|
|
{
|
|
|
|
(void)h;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
dotlock_take (dotlock_t h, long timeout)
|
|
|
|
{
|
|
|
|
(void)h;
|
|
|
|
(void)timeout;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
dotlock_release (dotlock_t h)
|
|
|
|
{
|
|
|
|
(void)h;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
dotlock_remove_lockfiles (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2020-01-17 07:11:02 +01:00
|
|
|
int
|
2015-09-02 15:07:06 +02:00
|
|
|
agent_probe_secret_key (ctrl_t ctrl, PKT_public_key *pk)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)pk;
|
2020-01-17 07:11:02 +01:00
|
|
|
return 0;
|
2015-09-02 15:07:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
agent_probe_any_secret_key (ctrl_t ctrl, kbnode_t keyblock)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)keyblock;
|
|
|
|
return gpg_error (GPG_ERR_NO_SECKEY);
|
|
|
|
}
|
|
|
|
|
|
|
|
gpg_error_t
|
2016-06-10 22:15:33 +02:00
|
|
|
agent_get_keyinfo (ctrl_t ctrl, const char *hexkeygrip,
|
|
|
|
char **r_serialno, int *r_cleartext)
|
2015-09-02 15:07:06 +02:00
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)hexkeygrip;
|
2016-06-10 22:15:33 +02:00
|
|
|
(void)r_cleartext;
|
2015-09-02 15:07:06 +02:00
|
|
|
*r_serialno = NULL;
|
|
|
|
return gpg_error (GPG_ERR_NO_SECKEY);
|
|
|
|
}
|
|
|
|
|
2015-10-08 15:04:45 +02:00
|
|
|
gpg_error_t
|
|
|
|
export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options,
|
2020-03-13 13:17:51 +01:00
|
|
|
const void *prefix, size_t prefixlen,
|
2015-11-12 16:02:35 +01:00
|
|
|
export_stats_t stats,
|
2015-10-08 15:04:45 +02:00
|
|
|
kbnode_t *r_keyblock, void **r_data, size_t *r_datalen)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)keyspec;
|
|
|
|
(void)options;
|
2020-03-13 13:17:51 +01:00
|
|
|
(void)prefix;
|
|
|
|
(void)prefixlen;
|
2015-11-12 16:02:35 +01:00
|
|
|
(void)stats;
|
2015-10-08 15:04:45 +02:00
|
|
|
|
|
|
|
*r_keyblock = NULL;
|
|
|
|
*r_data = NULL;
|
|
|
|
*r_datalen = 0;
|
|
|
|
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
|
|
|
}
|
g10: Add TOFU support.
* configure.ac: Check for sqlite3.
(SQLITE3_CFLAGS): AC_SUBST it.
(SQLITE3_LIBS): Likewise.
* g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
(gpg2_SOURCES): Add tofu.h and tofu.c.
(gpg2_LDADD): Add $(SQLITE3_LIBS).
* g10/tofu.c: New file.
* g10/tofu.h: New file.
* g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
(tofu_db_format): Define.
* g10/packet.h (PKT_signature): Add fields digest and digest_len.
* g10/gpg.c: Include "tofu.h".
(cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
oTOFUDBFormat.
(opts): Add them.
(parse_trust_model): Recognize the tofu and tofu+pgp trust models.
(parse_tofu_policy): New function.
(parse_tofu_db_format): New function.
(main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
* g10/mainproc.c (do_check_sig): If the signature is good, copy the
hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
* g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
callers.
(tdb_get_validity_core): Add arguments sig and may_ask. Update
callers.
* g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
to tdb_get_validity_core.
* g10/trustdb.c: Include "tofu.h".
(trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
(tdb_get_validity_core): Add arguments sig and may_ask. If
OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
level. Combine it with the computed PGP trust level, if appropriate.
* g10/keyedit.c: Include "tofu.h".
(show_key_with_all_names_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/keylist.c: Include "tofu.h".
(public_key_list): Also show the PGP stats if the trust model is
TM_TOFU_PGP.
(list_keyblock_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/pkclist.c: Include "tofu.h".
* g10/gpgv.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* doc/DETAILS: Describe the TOFU Policy field.
* doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
--trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
* tests/openpgp/Makefile.am (TESTS): Add tofu.test.
(TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
(CLEANFILES): Add tofu.db.
(clean-local): Add tofu.d.
* tests/openpgp/tofu.test: New file.
* tests/openpgp/tofu-2183839A-1.txt: New file.
* tests/openpgp/tofu-BC15C85A-1.txt: New file.
* tests/openpgp/tofu-EE37CF96-1.txt: New file.
* tests/openpgp/tofu-keys.asc: New file.
* tests/openpgp/tofu-keys-secret.asc: New file.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
2015-10-18 18:44:05 +02:00
|
|
|
|
2016-08-25 09:26:36 +02:00
|
|
|
gpg_error_t
|
|
|
|
tofu_write_tfs_record (ctrl_t ctrl, estream_t fp,
|
|
|
|
PKT_public_key *pk, const char *user_id)
|
|
|
|
{
|
|
|
|
(void)ctrl;
|
|
|
|
(void)fp;
|
|
|
|
(void)pk;
|
|
|
|
(void)user_id;
|
|
|
|
return gpg_error (GPG_ERR_GENERAL);
|
|
|
|
}
|
|
|
|
|
g10: Add TOFU support.
* configure.ac: Check for sqlite3.
(SQLITE3_CFLAGS): AC_SUBST it.
(SQLITE3_LIBS): Likewise.
* g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
(gpg2_SOURCES): Add tofu.h and tofu.c.
(gpg2_LDADD): Add $(SQLITE3_LIBS).
* g10/tofu.c: New file.
* g10/tofu.h: New file.
* g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
(tofu_db_format): Define.
* g10/packet.h (PKT_signature): Add fields digest and digest_len.
* g10/gpg.c: Include "tofu.h".
(cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
oTOFUDBFormat.
(opts): Add them.
(parse_trust_model): Recognize the tofu and tofu+pgp trust models.
(parse_tofu_policy): New function.
(parse_tofu_db_format): New function.
(main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
* g10/mainproc.c (do_check_sig): If the signature is good, copy the
hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
* g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
callers.
(tdb_get_validity_core): Add arguments sig and may_ask. Update
callers.
* g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
to tdb_get_validity_core.
* g10/trustdb.c: Include "tofu.h".
(trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
(tdb_get_validity_core): Add arguments sig and may_ask. If
OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
level. Combine it with the computed PGP trust level, if appropriate.
* g10/keyedit.c: Include "tofu.h".
(show_key_with_all_names_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/keylist.c: Include "tofu.h".
(public_key_list): Also show the PGP stats if the trust model is
TM_TOFU_PGP.
(list_keyblock_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/pkclist.c: Include "tofu.h".
* g10/gpgv.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* doc/DETAILS: Describe the TOFU Policy field.
* doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
--trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
* tests/openpgp/Makefile.am (TESTS): Add tofu.test.
(TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
(CLEANFILES): Add tofu.db.
(clean-local): Add tofu.d.
* tests/openpgp/tofu.test: New file.
* tests/openpgp/tofu-2183839A-1.txt: New file.
* tests/openpgp/tofu-BC15C85A-1.txt: New file.
* tests/openpgp/tofu-EE37CF96-1.txt: New file.
* tests/openpgp/tofu-keys.asc: New file.
* tests/openpgp/tofu-keys-secret.asc: New file.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
2015-10-18 18:44:05 +02:00
|
|
|
gpg_error_t
|
2016-05-21 12:26:44 +02:00
|
|
|
tofu_get_policy (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *user_id,
|
g10: Add TOFU support.
* configure.ac: Check for sqlite3.
(SQLITE3_CFLAGS): AC_SUBST it.
(SQLITE3_LIBS): Likewise.
* g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
(gpg2_SOURCES): Add tofu.h and tofu.c.
(gpg2_LDADD): Add $(SQLITE3_LIBS).
* g10/tofu.c: New file.
* g10/tofu.h: New file.
* g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
(tofu_db_format): Define.
* g10/packet.h (PKT_signature): Add fields digest and digest_len.
* g10/gpg.c: Include "tofu.h".
(cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
oTOFUDBFormat.
(opts): Add them.
(parse_trust_model): Recognize the tofu and tofu+pgp trust models.
(parse_tofu_policy): New function.
(parse_tofu_db_format): New function.
(main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
* g10/mainproc.c (do_check_sig): If the signature is good, copy the
hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
* g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
callers.
(tdb_get_validity_core): Add arguments sig and may_ask. Update
callers.
* g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
to tdb_get_validity_core.
* g10/trustdb.c: Include "tofu.h".
(trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
(tdb_get_validity_core): Add arguments sig and may_ask. If
OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
level. Combine it with the computed PGP trust level, if appropriate.
* g10/keyedit.c: Include "tofu.h".
(show_key_with_all_names_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/keylist.c: Include "tofu.h".
(public_key_list): Also show the PGP stats if the trust model is
TM_TOFU_PGP.
(list_keyblock_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/pkclist.c: Include "tofu.h".
* g10/gpgv.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* doc/DETAILS: Describe the TOFU Policy field.
* doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
--trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
* tests/openpgp/Makefile.am (TESTS): Add tofu.test.
(TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
(CLEANFILES): Add tofu.db.
(clean-local): Add tofu.d.
* tests/openpgp/tofu.test: New file.
* tests/openpgp/tofu-2183839A-1.txt: New file.
* tests/openpgp/tofu-BC15C85A-1.txt: New file.
* tests/openpgp/tofu-EE37CF96-1.txt: New file.
* tests/openpgp/tofu-keys.asc: New file.
* tests/openpgp/tofu-keys-secret.asc: New file.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
2015-10-18 18:44:05 +02:00
|
|
|
enum tofu_policy *policy)
|
|
|
|
{
|
2016-05-21 12:26:44 +02:00
|
|
|
(void)ctrl;
|
g10: Add TOFU support.
* configure.ac: Check for sqlite3.
(SQLITE3_CFLAGS): AC_SUBST it.
(SQLITE3_LIBS): Likewise.
* g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
(gpg2_SOURCES): Add tofu.h and tofu.c.
(gpg2_LDADD): Add $(SQLITE3_LIBS).
* g10/tofu.c: New file.
* g10/tofu.h: New file.
* g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
(tofu_db_format): Define.
* g10/packet.h (PKT_signature): Add fields digest and digest_len.
* g10/gpg.c: Include "tofu.h".
(cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
oTOFUDBFormat.
(opts): Add them.
(parse_trust_model): Recognize the tofu and tofu+pgp trust models.
(parse_tofu_policy): New function.
(parse_tofu_db_format): New function.
(main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
* g10/mainproc.c (do_check_sig): If the signature is good, copy the
hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
* g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
callers.
(tdb_get_validity_core): Add arguments sig and may_ask. Update
callers.
* g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
to tdb_get_validity_core.
* g10/trustdb.c: Include "tofu.h".
(trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
(tdb_get_validity_core): Add arguments sig and may_ask. If
OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
level. Combine it with the computed PGP trust level, if appropriate.
* g10/keyedit.c: Include "tofu.h".
(show_key_with_all_names_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/keylist.c: Include "tofu.h".
(public_key_list): Also show the PGP stats if the trust model is
TM_TOFU_PGP.
(list_keyblock_colon): If the trust mode is tofu or
tofu+pgp, then show the trust policy.
* g10/pkclist.c: Include "tofu.h".
* g10/gpgv.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
(enum tofu_policy): Define.
(tofu_get_policy): New stub.
(tofu_policy_str): Likewise.
* doc/DETAILS: Describe the TOFU Policy field.
* doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
--trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
* tests/openpgp/Makefile.am (TESTS): Add tofu.test.
(TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
(CLEANFILES): Add tofu.db.
(clean-local): Add tofu.d.
* tests/openpgp/tofu.test: New file.
* tests/openpgp/tofu-2183839A-1.txt: New file.
* tests/openpgp/tofu-BC15C85A-1.txt: New file.
* tests/openpgp/tofu-EE37CF96-1.txt: New file.
* tests/openpgp/tofu-keys.asc: New file.
* tests/openpgp/tofu-keys-secret.asc: New file.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
2015-10-18 18:44:05 +02:00
|
|
|
(void)pk;
|
|
|
|
(void)user_id;
|
|
|
|
(void)policy;
|
|
|
|
return gpg_error (GPG_ERR_GENERAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
|
|
|
tofu_policy_str (enum tofu_policy policy)
|
|
|
|
{
|
|
|
|
(void)policy;
|
|
|
|
|
|
|
|
return "unknown";
|
|
|
|
}
|
2015-10-23 17:23:17 +02:00
|
|
|
|
|
|
|
void
|
2016-08-05 14:40:36 +02:00
|
|
|
tofu_begin_batch_update (ctrl_t ctrl)
|
2015-10-23 17:23:17 +02:00
|
|
|
{
|
2016-08-05 14:40:36 +02:00
|
|
|
(void)ctrl;
|
2015-10-23 17:23:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2016-08-05 14:40:36 +02:00
|
|
|
tofu_end_batch_update (ctrl_t ctrl)
|
2015-10-23 17:23:17 +02:00
|
|
|
{
|
2016-08-05 14:40:36 +02:00
|
|
|
(void)ctrl;
|
2015-10-23 17:23:17 +02:00
|
|
|
}
|
g10: Cache the effective policy. Recompute it when required.
* g10/tofu.c (initdb): Add column effective_policy to the bindings
table.
(record_binding): New parameters effective_policy and set_conflict.
Save the effective policy. If SET_CONFLICT is set, then set conflict
according to CONFLICT. Otherwise, preserve the current value of
conflict. Update callers.
(get_trust): Don't compute the effective policy here...
(get_policy): ... do it here, if it was not cached. Take new
parameters, PK, the public key, and NOW, the time that the operation
started. Update callers.
(show_statistics): New parameter PK. Pass it to get_policy. Update
callers.
(tofu_notice_key_changed): New function.
* g10/gpgv.c (tofu_notice_key_changed): New stub.
* g10/import.c (import_revoke_cert): Take additional argument CTRL.
Pass it to keydb_update_keyblock.
* g10/keydb.c (keydb_update_keyblock): Take additional argument CTRL.
Update callers.
[USE_TOFU]: Call tofu_notice_key_changed.
* g10/test-stubs.c (tofu_notice_key_changed): New stub.
* tests/openpgp/tofu.scm: Assume that manually setting a binding's
policy to auto does not cause the tofu engine to forget about any
conflict.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
We now store the computed policy in the tofu DB (in the
effective_policy column of the bindings table) to avoid computing it
every time, which is expensive. Further, policy is never overridden
in case of a conflict. Instead, we detect a conflict if CONFLICT is
not empty.
This change is backwards compatible to existing DBs. The only minor
incompatibility is that unresolved conflicts won't be automatically
resolved in case we import a direct signature, or cross signatures.
2016-11-21 22:47:30 +01:00
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
tofu_notice_key_changed (ctrl_t ctrl, kbnode_t kb)
|
|
|
|
{
|
|
|
|
(void) ctrl;
|
|
|
|
(void) kb;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2018-06-21 20:28:40 +02:00
|
|
|
|
|
|
|
int
|
|
|
|
get_revocation_reason (PKT_signature *sig, char **r_reason,
|
|
|
|
char **r_comment, size_t *r_commentlen)
|
|
|
|
{
|
|
|
|
(void)sig;
|
|
|
|
(void)r_commentlen;
|
|
|
|
|
|
|
|
if (r_reason)
|
|
|
|
*r_reason = NULL;
|
|
|
|
if (r_comment)
|
|
|
|
*r_comment = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|