mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
6a4443c842
* g10/import.c (read_key_from_file): Rename to ... (read_key_from_file_or_buffer): this and add new parameters. Adjust callers. (import_included_key_block): New. * g10/packet.h (PKT_signature): Add field flags.key_block. * g10/parse-packet.c (parse_signature): Set that flags. * g10/sig-check.c (check_signature2): Add parm forced_pk and change all callers. * g10/mainproc.c (do_check_sig): Ditto. (check_sig_and_print): Try the included key block if no key is available. -- This is is the second part to support the new Key Block subpacket. The idea is that after having received a signed mail, it is instantly possible to reply encrypted - without the need for any centralized infrastructure. There is one case where this does not work: A signed mail is received using a specified signer ID (e.g. using gpg --sender option) and the key block with only that user ID is thus imported. The next time a mail is received using the same key but with a different user ID; the signatures checks out using the key imported the last time. However, the new user id is not imported. Now when trying to reply to that last mail, no key will be found. We need to see whether we can update a key in such a case. GnuPG-bug-id: 4856 Signed-off-by: Werner Koch <wk@gnupg.org>
568 lines
9.8 KiB
C
568 lines
9.8 KiB
C
/* 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
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#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"
|
|
#include "../common/util.h"
|
|
#include "packet.h"
|
|
#include "../common/iobuf.h"
|
|
#include "main.h"
|
|
#include "options.h"
|
|
#include "keydb.h"
|
|
#include "trustdb.h"
|
|
#include "filter.h"
|
|
#include "../common/ttyio.h"
|
|
#include "../common/i18n.h"
|
|
#include "../common/sysutils.h"
|
|
#include "../common/status.h"
|
|
#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:
|
|
* We have to override the trustcheck from pkclist.c because
|
|
* this utility assumes that all keys in the keyring are trustworthy
|
|
*/
|
|
int
|
|
check_signatures_trust (ctrl_t ctrl, PKT_signature *sig)
|
|
{
|
|
(void)ctrl;
|
|
(void)sig;
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
read_trust_options (ctrl_t ctrl,
|
|
byte *trust_model, ulong *created, ulong *nextcheck,
|
|
byte *marginals, byte *completes, byte *cert_depth,
|
|
byte *min_cert_level)
|
|
{
|
|
(void)ctrl;
|
|
(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
|
|
cache_disabled_value (ctrl_t ctrl, PKT_public_key *pk)
|
|
{
|
|
(void)ctrl;
|
|
(void)pk;
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
check_trustdb_stale (ctrl_t ctrl)
|
|
{
|
|
(void)ctrl;
|
|
}
|
|
|
|
int
|
|
get_validity_info (ctrl_t ctrl, kbnode_t kb, PKT_public_key *pk,
|
|
PKT_user_id *uid)
|
|
{
|
|
(void)ctrl;
|
|
(void)kb;
|
|
(void)pk;
|
|
(void)uid;
|
|
return '?';
|
|
}
|
|
|
|
unsigned int
|
|
get_validity (ctrl_t ctrl, kbnode_t kb, PKT_public_key *pk, PKT_user_id *uid,
|
|
PKT_signature *sig, int may_ask)
|
|
{
|
|
(void)ctrl;
|
|
(void)kb;
|
|
(void)pk;
|
|
(void)uid;
|
|
(void)sig;
|
|
(void)may_ask;
|
|
return 0;
|
|
}
|
|
|
|
const char *
|
|
trust_value_to_string (unsigned int value)
|
|
{
|
|
(void)value;
|
|
return "err";
|
|
}
|
|
|
|
const char *
|
|
uid_trust_string_fixed (ctrl_t ctrl, PKT_public_key *key, PKT_user_id *uid)
|
|
{
|
|
(void)ctrl;
|
|
(void)key;
|
|
(void)uid;
|
|
return "err";
|
|
}
|
|
|
|
int
|
|
get_ownertrust_info (ctrl_t ctrl, PKT_public_key *pk, int no_create)
|
|
{
|
|
(void)ctrl;
|
|
(void)pk;
|
|
(void)no_create;
|
|
return '?';
|
|
}
|
|
|
|
unsigned int
|
|
get_ownertrust (ctrl_t ctrl, PKT_public_key *pk)
|
|
{
|
|
(void)ctrl;
|
|
(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;
|
|
}
|
|
|
|
int
|
|
keyserver_any_configured (ctrl_t ctrl)
|
|
{
|
|
(void)ctrl;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
keyserver_import_keyid (u32 *keyid, void *dummy, int quick)
|
|
{
|
|
(void)keyid;
|
|
(void)dummy;
|
|
(void)quick;
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
|
|
struct keyserver_spec *keyserver, int quick)
|
|
{
|
|
(void)ctrl;
|
|
(void)fprint;
|
|
(void)fprint_len;
|
|
(void)keyserver;
|
|
(void)quick;
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
keyserver_import_cert (const char *name)
|
|
{
|
|
(void)name;
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
keyserver_import_pka (const char *name,unsigned char *fpr)
|
|
{
|
|
(void)name;
|
|
(void)fpr;
|
|
return -1;
|
|
}
|
|
|
|
gpg_error_t
|
|
keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick,
|
|
unsigned char **fpr, size_t *fpr_len)
|
|
{
|
|
(void)ctrl;
|
|
(void)name;
|
|
(void)quick;
|
|
(void)fpr;
|
|
(void)fpr_len;
|
|
return GPG_ERR_BUG;
|
|
}
|
|
|
|
int
|
|
keyserver_import_name (const char *name,struct keyserver_spec *spec)
|
|
{
|
|
(void)name;
|
|
(void)spec;
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
keyserver_import_ldap (const char *name)
|
|
{
|
|
(void)name;
|
|
return -1;
|
|
}
|
|
|
|
gpg_error_t
|
|
read_key_from_file_or_buffer (ctrl_t ctrl, const char *fname,
|
|
const void *buffer, size_t buflen,
|
|
kbnode_t *r_keyblock)
|
|
{
|
|
(void)ctrl;
|
|
(void)fname;
|
|
(void)buffer;
|
|
(void)buflen;
|
|
(void)r_keyblock;
|
|
return -1;
|
|
}
|
|
|
|
gpg_error_t
|
|
import_included_key_block (ctrl_t ctrl, kbnode_t keyblock)
|
|
{
|
|
(void)ctrl;
|
|
(void)keyblock;
|
|
return -1;
|
|
}
|
|
|
|
|
|
/* Stub:
|
|
* No encryption here but mainproc links to these functions.
|
|
*/
|
|
gpg_error_t
|
|
get_session_key (ctrl_t ctrl, struct pubkey_enc_list *k, DEK *dek)
|
|
{
|
|
(void)ctrl;
|
|
(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 *
|
|
passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, int create, int nocache,
|
|
const char *tmp, int *canceled)
|
|
{
|
|
(void)cipher_algo;
|
|
(void)s2k;
|
|
(void)create;
|
|
(void)nocache;
|
|
(void)tmp;
|
|
|
|
if (canceled)
|
|
*canceled = 0;
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
passphrase_clear_cache (const char *cacheid)
|
|
{
|
|
(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)
|
|
{
|
|
}
|
|
|
|
int
|
|
agent_probe_secret_key (ctrl_t ctrl, PKT_public_key *pk)
|
|
{
|
|
(void)ctrl;
|
|
(void)pk;
|
|
return 0;
|
|
}
|
|
|
|
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
|
|
agent_get_keyinfo (ctrl_t ctrl, const char *hexkeygrip,
|
|
char **r_serialno, int *r_cleartext)
|
|
{
|
|
(void)ctrl;
|
|
(void)hexkeygrip;
|
|
(void)r_cleartext;
|
|
*r_serialno = NULL;
|
|
return gpg_error (GPG_ERR_NO_SECKEY);
|
|
}
|
|
|
|
gpg_error_t
|
|
gpg_dirmngr_get_pka (ctrl_t ctrl, const char *userid,
|
|
unsigned char **r_fpr, size_t *r_fprlen,
|
|
char **r_url)
|
|
{
|
|
(void)ctrl;
|
|
(void)userid;
|
|
if (r_fpr)
|
|
*r_fpr = NULL;
|
|
if (r_fprlen)
|
|
*r_fprlen = 0;
|
|
if (r_url)
|
|
*r_url = NULL;
|
|
return gpg_error (GPG_ERR_NOT_FOUND);
|
|
}
|
|
|
|
gpg_error_t
|
|
export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options,
|
|
const void *prefix, size_t prefixlen,
|
|
export_stats_t stats,
|
|
kbnode_t *r_keyblock, void **r_data, size_t *r_datalen)
|
|
{
|
|
(void)ctrl;
|
|
(void)keyspec;
|
|
(void)options;
|
|
(void)prefix;
|
|
(void)prefixlen;
|
|
(void)stats;
|
|
|
|
*r_keyblock = NULL;
|
|
*r_data = NULL;
|
|
*r_datalen = 0;
|
|
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
gpg_error_t
|
|
tofu_get_policy (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *user_id,
|
|
enum tofu_policy *policy)
|
|
{
|
|
(void)ctrl;
|
|
(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";
|
|
}
|
|
|
|
void
|
|
tofu_begin_batch_update (ctrl_t ctrl)
|
|
{
|
|
(void)ctrl;
|
|
}
|
|
|
|
void
|
|
tofu_end_batch_update (ctrl_t ctrl)
|
|
{
|
|
(void)ctrl;
|
|
}
|
|
|
|
gpg_error_t
|
|
tofu_notice_key_changed (ctrl_t ctrl, kbnode_t kb)
|
|
{
|
|
(void) ctrl;
|
|
(void) kb;
|
|
|
|
return 0;
|
|
}
|
|
|
|
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;
|
|
}
|