2020-02-20 10:03:11 +01:00
|
|
|
/* gpg.c - The GnuPG OpenPGP tool
|
|
|
|
* Copyright (C) 1998-2020 Free Software Foundation, Inc.
|
|
|
|
* Copyright (C) 1997-2019 Werner Koch
|
2021-04-07 19:04:46 +02:00
|
|
|
* Copyright (C) 2015-2021 g10 Code GmbH
|
2003-06-05 07:14:21 +00:00
|
|
|
*
|
|
|
|
* 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
|
2007-07-04 19:49:40 +00:00
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-06-05 07:14:21 +00:00
|
|
|
* (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/>.
|
2020-02-20 10:03:11 +01:00
|
|
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
2003-06-05 07:14:21 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#ifdef HAVE_STAT
|
|
|
|
#include <sys/stat.h> /* for stat() */
|
|
|
|
#endif
|
2006-04-19 11:26:11 +00:00
|
|
|
#include <fcntl.h>
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2014-03-07 09:46:44 +01:00
|
|
|
# ifdef HAVE_WINSOCK2_H
|
|
|
|
# include <winsock2.h>
|
|
|
|
# endif
|
|
|
|
# include <windows.h>
|
2006-04-19 11:26:11 +00:00
|
|
|
#endif
|
2019-09-10 16:05:54 +02:00
|
|
|
#include <npth.h>
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
#define INCLUDED_BY_MAIN_MODULE 1
|
2003-06-18 19:56:13 +00:00
|
|
|
#include "gpg.h"
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
#include <assuan.h>
|
2006-04-19 11:26:11 +00:00
|
|
|
#include "../common/iobuf.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
#include "../common/util.h"
|
2010-10-01 20:33:53 +00:00
|
|
|
#include "packet.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
#include "../common/membuf.h"
|
2003-06-05 07:14:21 +00:00
|
|
|
#include "main.h"
|
|
|
|
#include "options.h"
|
|
|
|
#include "keydb.h"
|
|
|
|
#include "trustdb.h"
|
|
|
|
#include "filter.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
#include "../common/ttyio.h"
|
|
|
|
#include "../common/i18n.h"
|
|
|
|
#include "../common/sysutils.h"
|
|
|
|
#include "../common/status.h"
|
2003-06-05 07:14:21 +00:00
|
|
|
#include "keyserver-internal.h"
|
|
|
|
#include "exec.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
#include "../common/gc-opt-flags.h"
|
|
|
|
#include "../common/asshelp.h"
|
2011-01-10 14:30:17 +01:00
|
|
|
#include "call-dirmngr.h"
|
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
|
|
|
#include "tofu.h"
|
2019-04-13 11:48:58 +02:00
|
|
|
#include "objcache.h"
|
2012-02-06 20:50:47 +01:00
|
|
|
#include "../common/init.h"
|
2016-08-18 10:08:34 +02:00
|
|
|
#include "../common/mbox-util.h"
|
2013-02-07 20:37:58 +01:00
|
|
|
#include "../common/shareddefs.h"
|
2017-06-06 16:01:40 +02:00
|
|
|
#include "../common/compliance.h"
|
2021-04-19 11:33:19 +02:00
|
|
|
#include "../common/comopt.h"
|
2006-04-19 11:26:11 +00:00
|
|
|
|
|
|
|
#if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__)
|
|
|
|
#define MY_O_BINARY O_BINARY
|
|
|
|
#ifndef S_IRGRP
|
|
|
|
# define S_IRGRP 0
|
|
|
|
# define S_IWGRP 0
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
#define MY_O_BINARY 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
enum cmd_and_opt_values
|
|
|
|
{
|
|
|
|
aNull = 0,
|
2003-06-05 07:14:21 +00:00
|
|
|
oArmor = 'a',
|
|
|
|
aDetachedSign = 'b',
|
|
|
|
aSym = 'c',
|
|
|
|
aDecrypt = 'd',
|
|
|
|
aEncr = 'e',
|
2016-07-06 14:03:50 +02:00
|
|
|
oRecipientFile = 'f',
|
|
|
|
oHiddenRecipientFile = 'F',
|
2003-06-05 07:14:21 +00:00
|
|
|
oInteractive = 'i',
|
2006-10-04 16:45:04 +00:00
|
|
|
aListKeys = 'k',
|
2003-06-05 07:14:21 +00:00
|
|
|
oDryRun = 'n',
|
|
|
|
oOutput = 'o',
|
|
|
|
oQuiet = 'q',
|
|
|
|
oRecipient = 'r',
|
|
|
|
oHiddenRecipient = 'R',
|
|
|
|
aSign = 's',
|
|
|
|
oTextmodeShort= 't',
|
2006-04-19 11:26:11 +00:00
|
|
|
oLocalUser = 'u',
|
2003-06-05 07:14:21 +00:00
|
|
|
oVerbose = 'v',
|
|
|
|
oCompress = 'z',
|
2003-09-23 17:48:33 +00:00
|
|
|
oSetNotation = 'N',
|
2006-04-19 11:26:11 +00:00
|
|
|
aListSecretKeys = 'K',
|
2003-06-05 07:14:21 +00:00
|
|
|
oBatch = 500,
|
2006-04-19 11:26:11 +00:00
|
|
|
oMaxOutput,
|
2016-08-11 21:31:12 +02:00
|
|
|
oInputSizeHint,
|
2018-01-23 19:08:16 +01:00
|
|
|
oChunkSize,
|
2003-06-05 07:14:21 +00:00
|
|
|
oSigNotation,
|
|
|
|
oCertNotation,
|
|
|
|
oShowNotation,
|
|
|
|
oNoShowNotation,
|
2018-08-29 09:36:09 +02:00
|
|
|
oKnownNotation,
|
2003-09-23 17:48:33 +00:00
|
|
|
aEncrFiles,
|
2006-04-19 11:26:11 +00:00
|
|
|
aEncrSym,
|
|
|
|
aDecryptFiles,
|
2003-06-05 07:14:21 +00:00
|
|
|
aClearsign,
|
|
|
|
aStore,
|
2014-07-23 15:12:43 +02:00
|
|
|
aQuickKeygen,
|
2014-09-27 15:14:13 +02:00
|
|
|
aFullKeygen,
|
2003-06-05 07:14:21 +00:00
|
|
|
aKeygen,
|
|
|
|
aSignEncr,
|
2006-04-19 11:26:11 +00:00
|
|
|
aSignEncrSym,
|
2003-06-05 07:14:21 +00:00
|
|
|
aSignSym,
|
|
|
|
aSignKey,
|
|
|
|
aLSignKey,
|
2014-03-27 16:33:40 +01:00
|
|
|
aQuickSignKey,
|
|
|
|
aQuickLSignKey,
|
2020-10-28 17:06:27 +01:00
|
|
|
aQuickRevSig,
|
2015-05-08 16:08:57 +02:00
|
|
|
aQuickAddUid,
|
2016-06-02 15:54:48 +02:00
|
|
|
aQuickAddKey,
|
2016-06-16 18:05:57 -04:00
|
|
|
aQuickRevUid,
|
2016-12-05 10:58:39 +01:00
|
|
|
aQuickSetExpire,
|
2017-03-21 14:47:21 +01:00
|
|
|
aQuickSetPrimaryUid,
|
2006-04-19 11:26:11 +00:00
|
|
|
aListConfig,
|
2015-03-10 15:26:02 +01:00
|
|
|
aListGcryptConfig,
|
2006-04-19 11:26:11 +00:00
|
|
|
aGPGConfList,
|
2006-10-23 14:02:13 +00:00
|
|
|
aGPGConfTest,
|
2003-06-05 07:14:21 +00:00
|
|
|
aListPackets,
|
|
|
|
aEditKey,
|
|
|
|
aDeleteKeys,
|
|
|
|
aDeleteSecretKeys,
|
|
|
|
aDeleteSecretAndPublicKeys,
|
|
|
|
aImport,
|
|
|
|
aFastImport,
|
|
|
|
aVerify,
|
|
|
|
aVerifyFiles,
|
|
|
|
aListSigs,
|
|
|
|
aSendKeys,
|
|
|
|
aRecvKeys,
|
2008-05-07 15:40:36 +00:00
|
|
|
aLocateKeys,
|
2019-07-04 15:13:26 +02:00
|
|
|
aLocateExtKeys,
|
2003-06-05 07:14:21 +00:00
|
|
|
aSearchKeys,
|
2006-04-19 11:26:11 +00:00
|
|
|
aRefreshKeys,
|
|
|
|
aFetchKeys,
|
2018-06-06 11:50:58 +02:00
|
|
|
aShowKeys,
|
2003-06-05 07:14:21 +00:00
|
|
|
aExport,
|
|
|
|
aExportSecret,
|
|
|
|
aExportSecretSub,
|
2016-01-08 17:22:32 +01:00
|
|
|
aExportSshKey,
|
2003-06-05 07:14:21 +00:00
|
|
|
aCheckKeys,
|
|
|
|
aGenRevoke,
|
|
|
|
aDesigRevoke,
|
|
|
|
aPrimegen,
|
|
|
|
aPrintMD,
|
|
|
|
aPrintMDs,
|
|
|
|
aCheckTrustDB,
|
|
|
|
aUpdateTrustDB,
|
|
|
|
aFixTrustDB,
|
|
|
|
aListTrustDB,
|
|
|
|
aListTrustPath,
|
|
|
|
aExportOwnerTrust,
|
|
|
|
aImportOwnerTrust,
|
|
|
|
aDeArmor,
|
|
|
|
aEnArmor,
|
|
|
|
aGenRandom,
|
|
|
|
aRebuildKeydbCaches,
|
2003-07-24 09:06:43 +00:00
|
|
|
aCardStatus,
|
2003-09-18 15:51:18 +00:00
|
|
|
aCardEdit,
|
2003-07-23 07:11:06 +00:00
|
|
|
aChangePIN,
|
2010-01-08 19:18:49 +00:00
|
|
|
aPasswd,
|
2006-12-21 19:40:00 +00:00
|
|
|
aServer,
|
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
|
|
|
aTOFUPolicy,
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2016-07-13 13:31:12 +02:00
|
|
|
oMimemode,
|
2003-06-05 07:14:21 +00:00
|
|
|
oTextmode,
|
|
|
|
oNoTextmode,
|
|
|
|
oExpert,
|
|
|
|
oNoExpert,
|
2006-04-19 11:26:11 +00:00
|
|
|
oDefSigExpire,
|
2003-06-05 07:14:21 +00:00
|
|
|
oAskSigExpire,
|
|
|
|
oNoAskSigExpire,
|
2006-04-19 11:26:11 +00:00
|
|
|
oDefCertExpire,
|
2003-06-05 07:14:21 +00:00
|
|
|
oAskCertExpire,
|
|
|
|
oNoAskCertExpire,
|
2006-04-19 11:26:11 +00:00
|
|
|
oDefCertLevel,
|
|
|
|
oMinCertLevel,
|
|
|
|
oAskCertLevel,
|
|
|
|
oNoAskCertLevel,
|
2003-06-05 07:14:21 +00:00
|
|
|
oFingerprint,
|
|
|
|
oWithFingerprint,
|
2016-06-06 16:55:03 +02:00
|
|
|
oWithSubkeyFingerprint,
|
2015-02-23 17:54:05 +01:00
|
|
|
oWithICAOSpelling,
|
2010-10-08 11:11:08 +00:00
|
|
|
oWithKeygrip,
|
2017-10-17 21:10:19 +02:00
|
|
|
oWithKeyScreening,
|
2014-06-03 21:35:59 +02:00
|
|
|
oWithSecret,
|
2016-04-27 08:34:29 +02:00
|
|
|
oWithWKDHash,
|
2016-08-25 09:26:36 +02:00
|
|
|
oWithColons,
|
|
|
|
oWithKeyData,
|
2017-07-20 17:27:48 +02:00
|
|
|
oWithKeyOrigin,
|
2016-08-25 09:26:36 +02:00
|
|
|
oWithTofuInfo,
|
|
|
|
oWithSigList,
|
|
|
|
oWithSigCheck,
|
2003-06-05 07:14:21 +00:00
|
|
|
oAnswerYes,
|
|
|
|
oAnswerNo,
|
|
|
|
oKeyring,
|
|
|
|
oPrimaryKeyring,
|
|
|
|
oSecretKeyring,
|
|
|
|
oShowKeyring,
|
|
|
|
oDefaultKey,
|
|
|
|
oDefRecipient,
|
|
|
|
oDefRecipientSelf,
|
|
|
|
oNoDefRecipient,
|
2010-10-13 15:57:08 +00:00
|
|
|
oTrySecretKey,
|
2003-06-05 07:14:21 +00:00
|
|
|
oOptions,
|
|
|
|
oDebug,
|
2004-03-23 13:03:09 +00:00
|
|
|
oDebugLevel,
|
2003-06-05 07:14:21 +00:00
|
|
|
oDebugAll,
|
2015-04-06 14:07:50 +02:00
|
|
|
oDebugIOLBF,
|
2018-01-24 18:29:08 +01:00
|
|
|
oDebugSetIobufSize,
|
2018-07-24 09:50:02 +02:00
|
|
|
oDebugAllowLargeChunks,
|
2003-06-05 07:14:21 +00:00
|
|
|
oStatusFD,
|
|
|
|
oStatusFile,
|
|
|
|
oAttributeFD,
|
|
|
|
oAttributeFile,
|
|
|
|
oEmitVersion,
|
|
|
|
oNoEmitVersion,
|
|
|
|
oCompletesNeeded,
|
|
|
|
oMarginalsNeeded,
|
|
|
|
oMaxCertDepth,
|
|
|
|
oLoadExtension,
|
2016-11-15 13:03:29 +01:00
|
|
|
oCompliance,
|
2003-06-05 07:14:21 +00:00
|
|
|
oGnuPG,
|
2003-09-23 17:48:33 +00:00
|
|
|
oRFC2440,
|
2007-10-25 09:06:21 +00:00
|
|
|
oRFC4880,
|
2016-06-20 22:19:23 +02:00
|
|
|
oRFC4880bis,
|
2003-06-05 07:14:21 +00:00
|
|
|
oOpenPGP,
|
|
|
|
oPGP7,
|
|
|
|
oPGP8,
|
2016-11-15 17:50:03 +01:00
|
|
|
oDE_VS,
|
2006-04-19 11:26:11 +00:00
|
|
|
oRFC2440Text,
|
|
|
|
oNoRFC2440Text,
|
2003-06-05 07:14:21 +00:00
|
|
|
oCipherAlgo,
|
2018-01-10 11:42:38 +01:00
|
|
|
oAEADAlgo,
|
2003-06-05 07:14:21 +00:00
|
|
|
oDigestAlgo,
|
|
|
|
oCertDigestAlgo,
|
|
|
|
oCompressAlgo,
|
2006-04-19 11:26:11 +00:00
|
|
|
oCompressLevel,
|
|
|
|
oBZ2CompressLevel,
|
|
|
|
oBZ2DecompressLowmem,
|
2010-01-08 19:18:49 +00:00
|
|
|
oPassphrase,
|
|
|
|
oPassphraseFD,
|
|
|
|
oPassphraseFile,
|
|
|
|
oPassphraseRepeat,
|
2013-02-07 20:37:58 +01:00
|
|
|
oPinentryMode,
|
2003-06-05 07:14:21 +00:00
|
|
|
oCommandFD,
|
|
|
|
oCommandFile,
|
|
|
|
oQuickRandom,
|
|
|
|
oNoVerbose,
|
|
|
|
oTrustDBName,
|
|
|
|
oNoSecmemWarn,
|
2006-04-19 11:26:11 +00:00
|
|
|
oRequireSecmem,
|
|
|
|
oNoRequireSecmem,
|
2003-06-05 07:14:21 +00:00
|
|
|
oNoPermissionWarn,
|
|
|
|
oNoArmor,
|
|
|
|
oNoDefKeyring,
|
2016-07-06 15:33:40 +02:00
|
|
|
oNoKeyring,
|
2003-06-05 07:14:21 +00:00
|
|
|
oNoGreeting,
|
|
|
|
oNoTTY,
|
|
|
|
oNoOptions,
|
|
|
|
oNoBatch,
|
|
|
|
oHomedir,
|
|
|
|
oSkipVerify,
|
2009-11-23 19:18:04 +00:00
|
|
|
oSkipHiddenRecipients,
|
|
|
|
oNoSkipHiddenRecipients,
|
2003-06-05 07:14:21 +00:00
|
|
|
oAlwaysTrust,
|
|
|
|
oTrustModel,
|
|
|
|
oForceOwnertrust,
|
2021-03-15 10:47:19 +01:00
|
|
|
oNoAutoTrustNewKey,
|
2003-06-05 07:14:21 +00:00
|
|
|
oSetFilename,
|
|
|
|
oForYourEyesOnly,
|
|
|
|
oNoForYourEyesOnly,
|
|
|
|
oSetPolicyURL,
|
|
|
|
oSigPolicyURL,
|
|
|
|
oCertPolicyURL,
|
|
|
|
oShowPolicyURL,
|
|
|
|
oNoShowPolicyURL,
|
2003-09-23 17:48:33 +00:00
|
|
|
oSigKeyserverURL,
|
2003-06-05 07:14:21 +00:00
|
|
|
oUseEmbeddedFilename,
|
2006-04-19 11:26:11 +00:00
|
|
|
oNoUseEmbeddedFilename,
|
2003-06-05 07:14:21 +00:00
|
|
|
oComment,
|
|
|
|
oDefaultComment,
|
2003-09-23 17:48:33 +00:00
|
|
|
oNoComments,
|
2006-04-19 11:26:11 +00:00
|
|
|
oThrowKeyids,
|
|
|
|
oNoThrowKeyids,
|
2003-06-05 07:14:21 +00:00
|
|
|
oShowPhotos,
|
|
|
|
oNoShowPhotos,
|
|
|
|
oPhotoViewer,
|
2018-01-10 17:07:11 +01:00
|
|
|
oForceAEAD,
|
2003-06-05 07:14:21 +00:00
|
|
|
oS2KMode,
|
|
|
|
oS2KDigest,
|
|
|
|
oS2KCipher,
|
2006-10-13 04:06:24 +00:00
|
|
|
oS2KCount,
|
2006-04-19 11:26:11 +00:00
|
|
|
oDisplayCharset,
|
2003-06-05 07:14:21 +00:00
|
|
|
oNotDashEscaped,
|
|
|
|
oEscapeFrom,
|
|
|
|
oNoEscapeFrom,
|
|
|
|
oLockOnce,
|
|
|
|
oLockMultiple,
|
|
|
|
oLockNever,
|
|
|
|
oKeyServer,
|
|
|
|
oKeyServerOptions,
|
|
|
|
oImportOptions,
|
2016-07-01 16:24:04 +02:00
|
|
|
oImportFilter,
|
2003-06-05 07:14:21 +00:00
|
|
|
oExportOptions,
|
2016-07-01 16:50:12 +02:00
|
|
|
oExportFilter,
|
2003-06-05 07:14:21 +00:00
|
|
|
oListOptions,
|
|
|
|
oVerifyOptions,
|
|
|
|
oTempDir,
|
|
|
|
oExecPath,
|
|
|
|
oEncryptTo,
|
|
|
|
oHiddenEncryptTo,
|
|
|
|
oNoEncryptTo,
|
2015-11-03 23:39:46 +01:00
|
|
|
oEncryptToDefaultKey,
|
2003-06-05 07:14:21 +00:00
|
|
|
oLoggerFD,
|
|
|
|
oLoggerFile,
|
|
|
|
oUtf8Strings,
|
|
|
|
oNoUtf8Strings,
|
|
|
|
oDisableCipherAlgo,
|
|
|
|
oDisablePubkeyAlgo,
|
|
|
|
oAllowNonSelfsignedUID,
|
|
|
|
oNoAllowNonSelfsignedUID,
|
|
|
|
oAllowFreeformUID,
|
|
|
|
oNoAllowFreeformUID,
|
2011-02-04 12:57:53 +01:00
|
|
|
oAllowSecretKeyImport,
|
2021-02-10 14:31:34 +01:00
|
|
|
oAllowOldCipherAlgos,
|
2003-06-05 07:14:21 +00:00
|
|
|
oEnableSpecialFilenames,
|
|
|
|
oNoLiteral,
|
|
|
|
oSetFilesize,
|
|
|
|
oHonorHttpProxy,
|
|
|
|
oFastListMode,
|
|
|
|
oListOnly,
|
|
|
|
oIgnoreTimeConflict,
|
|
|
|
oIgnoreValidFrom,
|
|
|
|
oIgnoreCrcError,
|
|
|
|
oIgnoreMDCError,
|
|
|
|
oShowSessionKey,
|
|
|
|
oOverrideSessionKey,
|
2016-11-16 09:02:53 +01:00
|
|
|
oOverrideSessionKeyFD,
|
2003-06-05 07:14:21 +00:00
|
|
|
oNoRandomSeedFile,
|
|
|
|
oAutoKeyRetrieve,
|
|
|
|
oNoAutoKeyRetrieve,
|
2020-03-14 18:04:47 +01:00
|
|
|
oAutoKeyImport,
|
|
|
|
oNoAutoKeyImport,
|
2003-06-05 07:14:21 +00:00
|
|
|
oUseAgent,
|
|
|
|
oNoUseAgent,
|
|
|
|
oGpgAgentInfo,
|
2019-09-09 14:34:09 +02:00
|
|
|
oUseKeyboxd,
|
2003-06-05 07:14:21 +00:00
|
|
|
oMergeOnly,
|
|
|
|
oTryAllSecrets,
|
|
|
|
oTrustedKey,
|
|
|
|
oNoExpensiveTrustChecks,
|
|
|
|
oFixedListMode,
|
2014-02-05 10:37:59 +01:00
|
|
|
oLegacyListMode,
|
2003-06-05 07:14:21 +00:00
|
|
|
oNoSigCache,
|
|
|
|
oAutoCheckTrustDB,
|
|
|
|
oNoAutoCheckTrustDB,
|
|
|
|
oPreservePermissions,
|
|
|
|
oDefaultPreferenceList,
|
2006-06-27 14:30:59 +00:00
|
|
|
oDefaultKeyserverURL,
|
2003-06-05 07:14:21 +00:00
|
|
|
oPersonalCipherPreferences,
|
2018-01-10 11:42:38 +01:00
|
|
|
oPersonalAEADPreferences,
|
2003-06-05 07:14:21 +00:00
|
|
|
oPersonalDigestPreferences,
|
|
|
|
oPersonalCompressPreferences,
|
2003-06-05 07:14:21 +00:00
|
|
|
oAgentProgram,
|
2019-09-09 14:34:09 +02:00
|
|
|
oKeyboxdProgram,
|
2014-03-12 18:24:52 +01:00
|
|
|
oDirmngrProgram,
|
2017-08-08 11:43:22 +02:00
|
|
|
oDisableDirmngr,
|
2003-06-05 07:14:21 +00:00
|
|
|
oDisplay,
|
|
|
|
oTTYname,
|
|
|
|
oTTYtype,
|
|
|
|
oLCctype,
|
|
|
|
oLCmessages,
|
2007-11-19 16:03:50 +00:00
|
|
|
oXauthority,
|
2003-06-05 07:14:21 +00:00
|
|
|
oGroup,
|
2006-04-19 11:26:11 +00:00
|
|
|
oUnGroup,
|
|
|
|
oNoGroups,
|
2003-06-05 07:14:21 +00:00
|
|
|
oStrict,
|
|
|
|
oNoStrict,
|
|
|
|
oMangleDosFilenames,
|
|
|
|
oNoMangleDosFilenames,
|
2006-04-19 11:26:11 +00:00
|
|
|
oEnableProgressFilter,
|
2003-09-23 17:48:33 +00:00
|
|
|
oMultifile,
|
2006-04-19 11:26:11 +00:00
|
|
|
oKeyidFormat,
|
|
|
|
oExitOnStatusWriteError,
|
|
|
|
oLimitCardInsertTries,
|
2014-09-25 14:45:37 -04:00
|
|
|
oReaderPort,
|
|
|
|
octapiDriver,
|
|
|
|
opcscDriver,
|
|
|
|
oDisableCCID,
|
2006-04-19 11:26:11 +00:00
|
|
|
oRequireCrossCert,
|
|
|
|
oNoRequireCrossCert,
|
|
|
|
oAutoKeyLocate,
|
|
|
|
oNoAutoKeyLocate,
|
2014-10-09 16:54:15 -04:00
|
|
|
oEnableLargeRSA,
|
|
|
|
oDisableLargeRSA,
|
2006-04-28 14:31:29 +00:00
|
|
|
oEnableDSA2,
|
|
|
|
oDisableDSA2,
|
2014-03-17 17:54:36 +01:00
|
|
|
oAllowWeakDigestAlgos,
|
2019-11-07 10:36:17 +01:00
|
|
|
oAllowWeakKeySignatures,
|
2009-12-17 17:25:26 +00:00
|
|
|
oFakedSystemTime,
|
2014-11-28 09:44:19 +01:00
|
|
|
oNoAutostart,
|
2015-10-08 15:04:45 +02:00
|
|
|
oPrintDANERecords,
|
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
|
|
|
oTOFUDefaultPolicy,
|
|
|
|
oTOFUDBFormat,
|
2016-12-02 19:43:36 +01:00
|
|
|
oDefaultNewKeyAlgo,
|
2015-10-18 17:35:32 -04:00
|
|
|
oWeakDigest,
|
2015-11-05 12:20:42 +01:00
|
|
|
oUnwrap,
|
2015-11-06 13:14:57 +01:00
|
|
|
oOnlySignTextIDs,
|
2016-06-13 11:24:09 +02:00
|
|
|
oDisableSignerUID,
|
2016-08-18 10:08:34 +02:00
|
|
|
oSender,
|
2017-07-13 17:28:32 +02:00
|
|
|
oKeyOrigin,
|
2018-03-23 09:06:20 +01:00
|
|
|
oRequestOrigin,
|
2018-04-11 20:35:40 +02:00
|
|
|
oNoSymkeyCache,
|
2019-08-21 10:19:16 +02:00
|
|
|
oUseOnlyOpenPGPCard,
|
2020-02-13 14:01:07 +01:00
|
|
|
oFullTimestrings,
|
2020-03-13 13:28:35 +01:00
|
|
|
oIncludeKeyBlock,
|
2020-03-14 18:04:47 +01:00
|
|
|
oNoIncludeKeyBlock,
|
2020-08-14 12:19:11 +02:00
|
|
|
oChUid,
|
2021-03-11 11:27:07 +01:00
|
|
|
oForceSignKey,
|
2006-04-19 11:26:11 +00:00
|
|
|
|
|
|
|
oNoop
|
|
|
|
};
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
|
2020-02-20 10:03:11 +01:00
|
|
|
static gpgrt_opt_t opts[] = {
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_group (300, N_("@Commands:\n ")),
|
|
|
|
|
2008-11-13 12:37:45 +00:00
|
|
|
ARGPARSE_c (aSign, "sign", N_("make a signature")),
|
2016-09-23 14:10:07 +02:00
|
|
|
ARGPARSE_c (aClearsign, "clear-sign", N_("make a clear text signature")),
|
|
|
|
ARGPARSE_c (aClearsign, "clearsign", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aDetachedSign, "detach-sign", N_("make a detached signature")),
|
|
|
|
ARGPARSE_c (aEncr, "encrypt", N_("encrypt data")),
|
|
|
|
ARGPARSE_c (aEncrFiles, "encrypt-files", "@"),
|
|
|
|
ARGPARSE_c (aSym, "symmetric", N_("encryption only with symmetric cipher")),
|
|
|
|
ARGPARSE_c (aStore, "store", "@"),
|
|
|
|
ARGPARSE_c (aDecrypt, "decrypt", N_("decrypt data (default)")),
|
|
|
|
ARGPARSE_c (aDecryptFiles, "decrypt-files", "@"),
|
|
|
|
ARGPARSE_c (aVerify, "verify" , N_("verify a signature")),
|
|
|
|
ARGPARSE_c (aVerifyFiles, "verify-files" , "@" ),
|
|
|
|
ARGPARSE_c (aListKeys, "list-keys", N_("list keys")),
|
|
|
|
ARGPARSE_c (aListKeys, "list-public-keys", "@" ),
|
2016-10-10 14:55:27 +02:00
|
|
|
ARGPARSE_c (aListSigs, "list-signatures", N_("list keys and signatures")),
|
|
|
|
ARGPARSE_c (aListSigs, "list-sigs", "@"),
|
2016-10-10 15:20:14 +02:00
|
|
|
ARGPARSE_c (aCheckKeys, "check-signatures",
|
|
|
|
N_("list and check key signatures")),
|
|
|
|
ARGPARSE_c (aCheckKeys, "check-sigs", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (oFingerprint, "fingerprint", N_("list keys and fingerprints")),
|
|
|
|
ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")),
|
2016-11-14 16:59:23 +01:00
|
|
|
ARGPARSE_c (aKeygen, "generate-key",
|
2014-09-27 15:14:13 +02:00
|
|
|
N_("generate a new key pair")),
|
2016-11-14 16:59:23 +01:00
|
|
|
ARGPARSE_c (aKeygen, "gen-key", "@"),
|
2016-12-15 15:32:51 +01:00
|
|
|
ARGPARSE_c (aQuickKeygen, "quick-generate-key" ,
|
2014-07-23 15:12:43 +02:00
|
|
|
N_("quickly generate a new key pair")),
|
2016-12-15 15:32:51 +01:00
|
|
|
ARGPARSE_c (aQuickKeygen, "quick-gen-key", "@"),
|
|
|
|
ARGPARSE_c (aQuickAddUid, "quick-add-uid",
|
2015-05-08 16:08:57 +02:00
|
|
|
N_("quickly add a new user-id")),
|
2016-12-15 15:32:51 +01:00
|
|
|
ARGPARSE_c (aQuickAddUid, "quick-adduid", "@"),
|
|
|
|
ARGPARSE_c (aQuickAddKey, "quick-add-key", "@"),
|
2016-06-02 15:54:48 +02:00
|
|
|
ARGPARSE_c (aQuickAddKey, "quick-addkey", "@"),
|
2016-12-15 15:32:51 +01:00
|
|
|
ARGPARSE_c (aQuickRevUid, "quick-revoke-uid",
|
2016-06-16 18:05:57 -04:00
|
|
|
N_("quickly revoke a user-id")),
|
2016-12-15 15:32:51 +01:00
|
|
|
ARGPARSE_c (aQuickRevUid, "quick-revuid", "@"),
|
2016-12-05 10:58:39 +01:00
|
|
|
ARGPARSE_c (aQuickSetExpire, "quick-set-expire",
|
|
|
|
N_("quickly set a new expiration date")),
|
2017-03-21 14:47:21 +01:00
|
|
|
ARGPARSE_c (aQuickSetPrimaryUid, "quick-set-primary-uid", "@"),
|
2016-12-09 15:10:39 +01:00
|
|
|
ARGPARSE_c (aFullKeygen, "full-generate-key" ,
|
2014-09-27 15:14:13 +02:00
|
|
|
N_("full featured key pair generation")),
|
2016-12-09 15:10:39 +01:00
|
|
|
ARGPARSE_c (aFullKeygen, "full-gen-key", "@"),
|
2016-12-15 13:01:03 +01:00
|
|
|
ARGPARSE_c (aGenRevoke, "generate-revocation",
|
2016-12-13 17:43:22 +01:00
|
|
|
N_("generate a revocation certificate")),
|
|
|
|
ARGPARSE_c (aGenRevoke, "gen-revoke", "@"),
|
2011-02-04 12:57:53 +01:00
|
|
|
ARGPARSE_c (aDeleteKeys,"delete-keys",
|
2008-11-12 17:41:49 +00:00
|
|
|
N_("remove keys from the public keyring")),
|
|
|
|
ARGPARSE_c (aDeleteSecretKeys, "delete-secret-keys",
|
|
|
|
N_("remove keys from the secret keyring")),
|
2014-03-27 16:33:40 +01:00
|
|
|
ARGPARSE_c (aQuickSignKey, "quick-sign-key" ,
|
|
|
|
N_("quickly sign a key")),
|
|
|
|
ARGPARSE_c (aQuickLSignKey, "quick-lsign-key",
|
|
|
|
N_("quickly sign a key locally")),
|
2020-10-28 17:06:27 +01:00
|
|
|
ARGPARSE_c (aQuickRevSig, "quick-revoke-sig" ,
|
|
|
|
N_("quickly revoke a key signature")),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aSignKey, "sign-key" ,N_("sign a key")),
|
|
|
|
ARGPARSE_c (aLSignKey, "lsign-key" ,N_("sign a key locally")),
|
|
|
|
ARGPARSE_c (aEditKey, "edit-key" ,N_("sign or edit a key")),
|
2009-08-05 11:24:43 +00:00
|
|
|
ARGPARSE_c (aEditKey, "key-edit" ,"@"),
|
2016-12-13 17:49:47 +01:00
|
|
|
ARGPARSE_c (aPasswd, "change-passphrase", N_("change a passphrase")),
|
|
|
|
ARGPARSE_c (aPasswd, "passwd", "@"),
|
2016-12-15 13:59:48 +01:00
|
|
|
ARGPARSE_c (aDesigRevoke, "generate-designated-revocation", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ),
|
|
|
|
ARGPARSE_c (aExport, "export" , N_("export keys") ),
|
2016-06-14 09:06:44 +02:00
|
|
|
ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a keyserver") ),
|
2016-09-23 13:40:55 +02:00
|
|
|
ARGPARSE_c (aRecvKeys, "receive-keys" , N_("import keys from a keyserver") ),
|
|
|
|
ARGPARSE_c (aRecvKeys, "recv-keys" , "@"),
|
2011-02-04 12:57:53 +01:00
|
|
|
ARGPARSE_c (aSearchKeys, "search-keys" ,
|
2016-06-14 09:06:44 +02:00
|
|
|
N_("search for keys on a keyserver") ),
|
2011-02-04 12:57:53 +01:00
|
|
|
ARGPARSE_c (aRefreshKeys, "refresh-keys",
|
2008-11-12 17:41:49 +00:00
|
|
|
N_("update all keys from a keyserver")),
|
|
|
|
ARGPARSE_c (aLocateKeys, "locate-keys", "@"),
|
2019-07-04 15:13:26 +02:00
|
|
|
ARGPARSE_c (aLocateExtKeys, "locate-external-keys", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aFetchKeys, "fetch-keys" , "@" ),
|
2018-06-06 11:50:58 +02:00
|
|
|
ARGPARSE_c (aShowKeys, "show-keys" , "@" ),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aExportSecret, "export-secret-keys" , "@" ),
|
|
|
|
ARGPARSE_c (aExportSecretSub, "export-secret-subkeys" , "@" ),
|
2016-01-08 17:22:32 +01:00
|
|
|
ARGPARSE_c (aExportSshKey, "export-ssh-key", "@" ),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aImport, "import", N_("import/merge keys")),
|
|
|
|
ARGPARSE_c (aFastImport, "fast-import", "@"),
|
2006-04-19 11:26:11 +00:00
|
|
|
#ifdef ENABLE_CARD_SUPPORT
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aCardStatus, "card-status", N_("print the card status")),
|
2016-12-15 14:50:10 +01:00
|
|
|
ARGPARSE_c (aCardEdit, "edit-card", N_("change data on a card")),
|
|
|
|
ARGPARSE_c (aCardEdit, "card-edit", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aChangePIN, "change-pin", N_("change a card's PIN")),
|
2006-04-19 11:26:11 +00:00
|
|
|
#endif
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aListConfig, "list-config", "@"),
|
2015-03-10 15:26:02 +01:00
|
|
|
ARGPARSE_c (aListGcryptConfig, "list-gcrypt-config", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aGPGConfList, "gpgconf-list", "@" ),
|
|
|
|
ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@" ),
|
|
|
|
ARGPARSE_c (aListPackets, "list-packets","@"),
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
|
|
|
|
#ifndef NO_TRUST_MODELS
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aExportOwnerTrust, "export-ownertrust", "@"),
|
|
|
|
ARGPARSE_c (aImportOwnerTrust, "import-ownertrust", "@"),
|
|
|
|
ARGPARSE_c (aUpdateTrustDB,"update-trustdb",
|
|
|
|
N_("update the trust database")),
|
|
|
|
ARGPARSE_c (aCheckTrustDB, "check-trustdb", "@"),
|
|
|
|
ARGPARSE_c (aFixTrustDB, "fix-trustdb", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_c (aListTrustDB, "list-trustdb", "@"),
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#endif
|
|
|
|
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aDeArmor, "dearmor", "@"),
|
|
|
|
ARGPARSE_c (aDeArmor, "dearmour", "@"),
|
|
|
|
ARGPARSE_c (aEnArmor, "enarmor", "@"),
|
|
|
|
ARGPARSE_c (aEnArmor, "enarmour", "@"),
|
2008-11-13 12:37:45 +00:00
|
|
|
ARGPARSE_c (aPrintMD, "print-md", N_("print message digests")),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_c (aPrintMDs, "print-mds", "@"), /* old */
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_c (aPrimegen, "gen-prime", "@" ),
|
|
|
|
ARGPARSE_c (aGenRandom,"gen-random", "@" ),
|
|
|
|
ARGPARSE_c (aServer, "server", N_("run in server mode")),
|
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
|
|
|
ARGPARSE_c (aTOFUPolicy, "tofu-policy",
|
2016-01-27 13:58:20 +01:00
|
|
|
N_("|VALUE|set the TOFU policy for a key")),
|
2020-03-06 15:17:53 +01:00
|
|
|
/* Not yet used:
|
|
|
|
ARGPARSE_c (aListTrustPath, "list-trust-path", "@"), */
|
|
|
|
ARGPARSE_c (aDeleteSecretAndPublicKeys,
|
|
|
|
"delete-secret-and-public-keys", "@"),
|
|
|
|
ARGPARSE_c (aRebuildKeydbCaches, "rebuild-keydb-caches", "@"),
|
|
|
|
ARGPARSE_c (aListKeys, "list-key", "@"), /* alias */
|
|
|
|
ARGPARSE_c (aListSigs, "list-sig", "@"), /* alias */
|
|
|
|
ARGPARSE_c (aCheckKeys, "check-sig", "@"), /* alias */
|
|
|
|
ARGPARSE_c (aShowKeys, "show-key", "@"), /* alias */
|
2008-11-12 17:41:49 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_header ("Monitor", N_("Options controlling the diagnostic output")),
|
2008-11-12 17:41:49 +00:00
|
|
|
|
|
|
|
ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
|
2020-03-06 10:09:26 +01:00
|
|
|
ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oNoTTY, "no-tty", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
|
2015-06-22 21:01:10 +02:00
|
|
|
ARGPARSE_s_s (oDebug, "debug", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_s (oDebugLevel, "debug-level", "@"),
|
|
|
|
ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
|
2015-04-06 14:07:50 +02:00
|
|
|
ARGPARSE_s_n (oDebugIOLBF, "debug-iolbf", "@"),
|
2018-01-24 18:29:08 +01:00
|
|
|
ARGPARSE_s_u (oDebugSetIobufSize, "debug-set-iobuf-size", "@"),
|
2018-07-24 09:50:02 +02:00
|
|
|
ARGPARSE_s_u (oDebugAllowLargeChunks, "debug-allow-large-chunks", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_s (oDisplayCharset, "display-charset", "@"),
|
|
|
|
ARGPARSE_s_s (oDisplayCharset, "charset", "@"),
|
|
|
|
ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
|
|
|
|
ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
|
|
|
|
ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
|
|
|
|
ARGPARSE_s_s (oLoggerFile, "log-file",
|
|
|
|
N_("|FILE|write server mode logs to FILE")),
|
|
|
|
ARGPARSE_s_s (oLoggerFile, "logger-file", "@"), /* 1.4 compatibility. */
|
|
|
|
ARGPARSE_s_n (oQuickRandom, "debug-quick-random", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
|
|
|
|
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_header ("Configuration",
|
|
|
|
N_("Options controlling the configuration")),
|
2008-11-12 17:41:49 +00:00
|
|
|
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_s (oHomedir, "homedir", "@"),
|
|
|
|
ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
|
|
|
|
ARGPARSE_s_s (oDefaultKey, "default-key",
|
|
|
|
N_("|NAME|use NAME as default secret key")),
|
|
|
|
ARGPARSE_s_s (oEncryptTo, "encrypt-to",
|
|
|
|
N_("|NAME|encrypt to user ID NAME as well")),
|
|
|
|
ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
|
|
|
|
ARGPARSE_s_s (oHiddenEncryptTo, "hidden-encrypt-to", "@"),
|
|
|
|
ARGPARSE_s_n (oEncryptToDefaultKey, "encrypt-to-default-key", "@"),
|
|
|
|
ARGPARSE_s_s (oDefRecipient, "default-recipient", "@"),
|
|
|
|
ARGPARSE_s_n (oDefRecipientSelf, "default-recipient-self", "@"),
|
|
|
|
ARGPARSE_s_n (oNoDefRecipient, "no-default-recipient", "@"),
|
|
|
|
ARGPARSE_s_s (oGroup, "group",
|
|
|
|
N_("|SPEC|set up email aliases")),
|
|
|
|
ARGPARSE_s_s (oUnGroup, "ungroup", "@"),
|
|
|
|
ARGPARSE_s_n (oNoGroups, "no-groups", "@"),
|
2016-11-15 13:03:29 +01:00
|
|
|
ARGPARSE_s_s (oCompliance, "compliance", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oGnuPG, "gnupg", "@"),
|
|
|
|
ARGPARSE_s_n (oGnuPG, "no-pgp2", "@"),
|
|
|
|
ARGPARSE_s_n (oGnuPG, "no-pgp6", "@"),
|
|
|
|
ARGPARSE_s_n (oGnuPG, "no-pgp7", "@"),
|
|
|
|
ARGPARSE_s_n (oGnuPG, "no-pgp8", "@"),
|
|
|
|
ARGPARSE_s_n (oRFC2440, "rfc2440", "@"),
|
|
|
|
ARGPARSE_s_n (oRFC4880, "rfc4880", "@"),
|
2016-06-20 22:19:23 +02:00
|
|
|
ARGPARSE_s_n (oRFC4880bis, "rfc4880bis", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oOpenPGP, "openpgp", N_("use strict OpenPGP behavior")),
|
2018-05-29 13:01:12 +02:00
|
|
|
ARGPARSE_s_n (oPGP7, "pgp6", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oPGP7, "pgp7", "@"),
|
|
|
|
ARGPARSE_s_n (oPGP8, "pgp8", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_s (oDefaultNewKeyAlgo, "default-new-key-algo", "@"),
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#ifndef NO_TRUST_MODELS
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oAlwaysTrust, "always-trust", "@"),
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#endif
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_s (oTrustModel, "trust-model", "@"),
|
|
|
|
ARGPARSE_s_s (oPhotoViewer, "photo-viewer", "@"),
|
|
|
|
ARGPARSE_s_s (oKnownNotation, "known-notation", "@"),
|
|
|
|
ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
|
|
|
|
ARGPARSE_s_s (oKeyboxdProgram, "keyboxd-program", "@"),
|
|
|
|
ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
|
|
|
|
ARGPARSE_s_n (oExitOnStatusWriteError, "exit-on-status-write-error", "@"),
|
|
|
|
ARGPARSE_s_i (oLimitCardInsertTries, "limit-card-insert-tries", "@"),
|
|
|
|
ARGPARSE_s_n (oEnableProgressFilter, "enable-progress-filter", "@"),
|
|
|
|
ARGPARSE_s_s (oTempDir, "temp-directory", "@"),
|
|
|
|
ARGPARSE_s_s (oExecPath, "exec-path", "@"),
|
|
|
|
ARGPARSE_s_n (oExpert, "expert", "@"),
|
|
|
|
ARGPARSE_s_n (oNoExpert, "no-expert", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
|
|
|
|
ARGPARSE_s_n (oRequireSecmem, "require-secmem", "@"),
|
|
|
|
ARGPARSE_s_n (oNoRequireSecmem, "no-require-secmem", "@"),
|
|
|
|
ARGPARSE_s_n (oNoPermissionWarn, "no-permission-warning", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
|
|
|
|
ARGPARSE_s_n (oInteractive, "interactive", N_("prompt before overwriting")),
|
|
|
|
ARGPARSE_s_s (oDefSigExpire, "default-sig-expire", "@"),
|
|
|
|
ARGPARSE_s_n (oAskSigExpire, "ask-sig-expire", "@"),
|
|
|
|
ARGPARSE_s_n (oNoAskSigExpire, "no-ask-sig-expire", "@"),
|
|
|
|
ARGPARSE_s_s (oDefCertExpire, "default-cert-expire", "@"),
|
|
|
|
ARGPARSE_s_n (oAskCertExpire, "ask-cert-expire", "@"),
|
|
|
|
ARGPARSE_s_n (oNoAskCertExpire, "no-ask-cert-expire", "@"),
|
|
|
|
ARGPARSE_s_i (oDefCertLevel, "default-cert-level", "@"),
|
|
|
|
ARGPARSE_s_i (oMinCertLevel, "min-cert-level", "@"),
|
|
|
|
ARGPARSE_s_n (oAskCertLevel, "ask-cert-level", "@"),
|
|
|
|
ARGPARSE_s_n (oNoAskCertLevel, "no-ask-cert-level", "@"),
|
|
|
|
ARGPARSE_s_n (oOnlySignTextIDs, "only-sign-text-ids", "@"),
|
|
|
|
ARGPARSE_s_n (oEnableLargeRSA, "enable-large-rsa", "@"),
|
|
|
|
ARGPARSE_s_n (oDisableLargeRSA, "disable-large-rsa", "@"),
|
|
|
|
ARGPARSE_s_n (oEnableDSA2, "enable-dsa2", "@"),
|
|
|
|
ARGPARSE_s_n (oDisableDSA2, "disable-dsa2", "@"),
|
|
|
|
ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-preferences","@"),
|
|
|
|
ARGPARSE_s_s (oPersonalAEADPreferences, "personal-aead-preferences","@"),
|
|
|
|
ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-preferences","@"),
|
|
|
|
ARGPARSE_s_s (oPersonalCompressPreferences,
|
|
|
|
"personal-compress-preferences", "@"),
|
|
|
|
ARGPARSE_s_s (oDefaultPreferenceList, "default-preference-list", "@"),
|
|
|
|
ARGPARSE_s_s (oDefaultKeyserverURL, "default-keyserver-url", "@"),
|
|
|
|
ARGPARSE_s_n (oNoExpensiveTrustChecks, "no-expensive-trust-checks", "@"),
|
|
|
|
ARGPARSE_s_n (oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", "@"),
|
|
|
|
ARGPARSE_s_n (oNoAllowNonSelfsignedUID, "no-allow-non-selfsigned-uid", "@"),
|
|
|
|
ARGPARSE_s_n (oAllowFreeformUID, "allow-freeform-uid", "@"),
|
|
|
|
ARGPARSE_s_n (oNoAllowFreeformUID, "no-allow-freeform-uid", "@"),
|
|
|
|
ARGPARSE_s_n (oPreservePermissions, "preserve-permissions", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_i (oDefCertLevel, "default-cert-check-level", "@"), /* old */
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_s (oTOFUDefaultPolicy, "tofu-default-policy", "@"),
|
|
|
|
ARGPARSE_s_n (oLockOnce, "lock-once", "@"),
|
|
|
|
ARGPARSE_s_n (oLockMultiple, "lock-multiple", "@"),
|
|
|
|
ARGPARSE_s_n (oLockNever, "lock-never", "@"),
|
|
|
|
ARGPARSE_s_s (oCompressAlgo,"compress-algo", "@"),
|
|
|
|
ARGPARSE_s_s (oCompressAlgo, "compression-algo", "@"), /* Alias */
|
|
|
|
ARGPARSE_s_n (oBZ2DecompressLowmem, "bzip2-decompress-lowmem", "@"),
|
|
|
|
ARGPARSE_s_i (oCompletesNeeded, "completes-needed", "@"),
|
|
|
|
ARGPARSE_s_i (oMarginalsNeeded, "marginals-needed", "@"),
|
|
|
|
ARGPARSE_s_i (oMaxCertDepth, "max-cert-depth", "@" ),
|
2016-04-01 14:51:56 +02:00
|
|
|
#ifndef NO_TRUST_MODELS
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_s (oTrustDBName, "trustdb-name", "@"),
|
|
|
|
ARGPARSE_s_n (oAutoCheckTrustDB, "auto-check-trustdb", "@"),
|
|
|
|
ARGPARSE_s_n (oNoAutoCheckTrustDB, "no-auto-check-trustdb", "@"),
|
|
|
|
ARGPARSE_s_s (oForceOwnertrust, "force-ownertrust", "@"),
|
2021-03-15 10:47:19 +01:00
|
|
|
ARGPARSE_s_n (oNoAutoTrustNewKey, "no-auto-trust-new-key", "@"),
|
2016-04-01 14:51:56 +02:00
|
|
|
#endif
|
2020-03-06 15:17:53 +01:00
|
|
|
|
|
|
|
|
|
|
|
ARGPARSE_header ("Input", N_("Options controlling the input")),
|
|
|
|
|
|
|
|
ARGPARSE_s_n (oMultifile, "multifile", "@"),
|
|
|
|
ARGPARSE_s_s (oInputSizeHint, "input-size-hint", "@"),
|
|
|
|
ARGPARSE_s_n (oUtf8Strings, "utf8-strings", "@"),
|
|
|
|
ARGPARSE_s_n (oNoUtf8Strings, "no-utf8-strings", "@"),
|
|
|
|
ARGPARSE_p_u (oSetFilesize, "set-filesize", "@"),
|
|
|
|
ARGPARSE_s_n (oNoLiteral, "no-literal", "@"),
|
|
|
|
ARGPARSE_s_s (oSetNotation, "set-notation", "@"),
|
|
|
|
ARGPARSE_s_s (oSigNotation, "sig-notation", "@"),
|
|
|
|
ARGPARSE_s_s (oCertNotation, "cert-notation", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_s (oSetPolicyURL, "set-policy-url", "@"),
|
|
|
|
ARGPARSE_s_s (oSigPolicyURL, "sig-policy-url", "@"),
|
|
|
|
ARGPARSE_s_s (oCertPolicyURL, "cert-policy-url", "@"),
|
|
|
|
ARGPARSE_s_s (oSigKeyserverURL, "sig-keyserver-url", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ARGPARSE_header ("Output", N_("Options controlling the output")),
|
|
|
|
|
|
|
|
ARGPARSE_s_n (oArmor, "armor", N_("create ascii armored output")),
|
|
|
|
ARGPARSE_s_n (oArmor, "armour", "@"),
|
|
|
|
ARGPARSE_s_n (oNoArmor, "no-armor", "@"),
|
|
|
|
ARGPARSE_s_n (oNoArmor, "no-armour", "@"),
|
|
|
|
ARGPARSE_s_s (oOutput, "output", N_("|FILE|write output to FILE")),
|
|
|
|
ARGPARSE_p_u (oMaxOutput, "max-output", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_s (oComment, "comment", "@"),
|
|
|
|
ARGPARSE_s_n (oDefaultComment, "default-comment", "@"),
|
|
|
|
ARGPARSE_s_n (oNoComments, "no-comments", "@"),
|
|
|
|
ARGPARSE_s_n (oEmitVersion, "emit-version", "@"),
|
|
|
|
ARGPARSE_s_n (oNoEmitVersion, "no-emit-version", "@"),
|
|
|
|
ARGPARSE_s_n (oNoEmitVersion, "no-version", "@"), /* alias */
|
|
|
|
ARGPARSE_s_n (oNotDashEscaped, "not-dash-escaped", "@"),
|
|
|
|
ARGPARSE_s_n (oEscapeFrom, "escape-from-lines", "@"),
|
|
|
|
ARGPARSE_s_n (oNoEscapeFrom, "no-escape-from-lines", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oMimemode, "mimemode", "@"),
|
|
|
|
ARGPARSE_s_n (oTextmodeShort, NULL, "@"),
|
|
|
|
ARGPARSE_s_n (oTextmode, "textmode", N_("use canonical text mode")),
|
|
|
|
ARGPARSE_s_n (oNoTextmode, "no-textmode", "@"),
|
|
|
|
ARGPARSE_s_s (oSetFilename, "set-filename", "@"),
|
|
|
|
ARGPARSE_s_n (oForYourEyesOnly, "for-your-eyes-only", "@"),
|
|
|
|
ARGPARSE_s_n (oNoForYourEyesOnly, "no-for-your-eyes-only", "@"),
|
|
|
|
ARGPARSE_s_n (oShowNotation, "show-notation", "@"),
|
|
|
|
ARGPARSE_s_n (oNoShowNotation, "no-show-notation", "@"),
|
|
|
|
ARGPARSE_s_n (oShowSessionKey, "show-session-key", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oUseEmbeddedFilename, "use-embedded-filename", "@"),
|
|
|
|
ARGPARSE_s_n (oNoUseEmbeddedFilename, "no-use-embedded-filename", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oUnwrap, "unwrap", "@"),
|
|
|
|
ARGPARSE_s_n (oMangleDosFilenames, "mangle-dos-filenames", "@"),
|
|
|
|
ARGPARSE_s_n (oNoMangleDosFilenames, "no-mangle-dos-filenames", "@"),
|
|
|
|
ARGPARSE_s_i (oChunkSize, "chunk-size", "@"),
|
|
|
|
ARGPARSE_s_n (oNoSymkeyCache, "no-symkey-cache", "@"),
|
|
|
|
ARGPARSE_s_n (oSkipVerify, "skip-verify", "@"),
|
|
|
|
ARGPARSE_s_n (oListOnly, "list-only", "@"),
|
|
|
|
ARGPARSE_s_i (oCompress, NULL,
|
|
|
|
N_("|N|set compress level to N (0 disables)")),
|
|
|
|
ARGPARSE_s_i (oCompressLevel, "compress-level", "@"),
|
|
|
|
ARGPARSE_s_i (oBZ2CompressLevel, "bzip2-compress-level", "@"),
|
2020-03-13 13:28:35 +01:00
|
|
|
ARGPARSE_s_n (oDisableSignerUID, "disable-signer-uid", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
|
|
|
|
ARGPARSE_header ("ImportExport",
|
|
|
|
N_("Options controlling key import and export")),
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oAutoKeyLocate, "auto-key-locate",
|
|
|
|
N_("|MECHANISMS|use MECHANISMS to locate keys by mail address")),
|
|
|
|
ARGPARSE_s_n (oNoAutoKeyLocate, "no-auto-key-locate", "@"),
|
2020-03-14 18:04:47 +01:00
|
|
|
ARGPARSE_s_n (oAutoKeyImport, "auto-key-import",
|
|
|
|
N_("import missing key from a signature")),
|
|
|
|
ARGPARSE_s_n (oNoAutoKeyImport, "no-auto-key-import", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oAutoKeyRetrieve, "auto-key-retrieve", "@"),
|
|
|
|
ARGPARSE_s_n (oNoAutoKeyRetrieve, "no-auto-key-retrieve", "@"),
|
2020-03-14 18:04:47 +01:00
|
|
|
ARGPARSE_s_n (oIncludeKeyBlock, "include-key-block",
|
|
|
|
N_("include the public key in signatures")),
|
|
|
|
ARGPARSE_s_n (oNoIncludeKeyBlock, "no-include-key-block", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr",
|
|
|
|
N_("disable all access to the dirmngr")),
|
|
|
|
ARGPARSE_s_s (oKeyServer, "keyserver", "@"), /* Deprecated. */
|
|
|
|
ARGPARSE_s_s (oKeyServerOptions, "keyserver-options", "@"),
|
|
|
|
ARGPARSE_s_s (oKeyOrigin, "key-origin", "@"),
|
|
|
|
ARGPARSE_s_s (oImportOptions, "import-options", "@"),
|
|
|
|
ARGPARSE_s_s (oImportFilter, "import-filter", "@"),
|
|
|
|
ARGPARSE_s_s (oExportOptions, "export-options", "@"),
|
|
|
|
ARGPARSE_s_s (oExportFilter, "export-filter", "@"),
|
|
|
|
ARGPARSE_s_n (oMergeOnly, "merge-only", "@" ),
|
|
|
|
ARGPARSE_s_n (oAllowSecretKeyImport, "allow-secret-key-import", "@"),
|
|
|
|
|
|
|
|
|
|
|
|
ARGPARSE_header ("Keylist", N_("Options controlling key listings")),
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oListOptions, "list-options", "@"),
|
|
|
|
ARGPARSE_s_n (oFullTimestrings, "full-timestrings", "@"),
|
|
|
|
ARGPARSE_s_n (oShowPhotos, "show-photos", "@"),
|
|
|
|
ARGPARSE_s_n (oNoShowPhotos, "no-show-photos", "@"),
|
|
|
|
ARGPARSE_s_n (oShowPolicyURL, "show-policy-url", "@"),
|
|
|
|
ARGPARSE_s_n (oNoShowPolicyURL, "no-show-policy-url", "@"),
|
|
|
|
ARGPARSE_s_n (oWithColons, "with-colons", "@"),
|
|
|
|
ARGPARSE_s_n (oWithTofuInfo,"with-tofu-info", "@"),
|
|
|
|
ARGPARSE_s_n (oWithKeyData,"with-key-data", "@"),
|
|
|
|
ARGPARSE_s_n (oWithSigList,"with-sig-list", "@"),
|
|
|
|
ARGPARSE_s_n (oWithSigCheck,"with-sig-check", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oWithFingerprint, "with-fingerprint", "@"),
|
2016-06-06 16:55:03 +02:00
|
|
|
ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprint", "@"),
|
|
|
|
ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprints", "@"),
|
2015-02-23 17:54:05 +01:00
|
|
|
ARGPARSE_s_n (oWithICAOSpelling, "with-icao-spelling", "@"),
|
2010-10-08 11:11:08 +00:00
|
|
|
ARGPARSE_s_n (oWithKeygrip, "with-keygrip", "@"),
|
2017-10-17 21:10:19 +02:00
|
|
|
ARGPARSE_s_n (oWithKeyScreening,"with-key-screening", "@"),
|
2014-06-03 21:35:59 +02:00
|
|
|
ARGPARSE_s_n (oWithSecret, "with-secret", "@"),
|
2016-04-27 08:34:29 +02:00
|
|
|
ARGPARSE_s_n (oWithWKDHash, "with-wkd-hash", "@"),
|
2017-07-20 17:27:48 +02:00
|
|
|
ARGPARSE_s_n (oWithKeyOrigin, "with-key-origin", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oFastListMode, "fast-list-mode", "@"),
|
|
|
|
ARGPARSE_s_n (oFixedListMode, "fixed-list-mode", "@"),
|
2014-02-05 10:37:59 +01:00
|
|
|
ARGPARSE_s_n (oLegacyListMode, "legacy-list-mode", "@"),
|
2015-10-08 15:04:45 +02:00
|
|
|
ARGPARSE_s_n (oPrintDANERecords, "print-dane-records", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_s (oKeyidFormat, "keyid-format", "@"),
|
|
|
|
ARGPARSE_s_n (oShowKeyring, "show-keyring", "@"),
|
|
|
|
|
|
|
|
|
|
|
|
ARGPARSE_header (NULL, N_("Options to specify keys")),
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oRecipient, "recipient", N_("|USER-ID|encrypt for USER-ID")),
|
|
|
|
ARGPARSE_s_s (oHiddenRecipient, "hidden-recipient", "@"),
|
|
|
|
ARGPARSE_s_s (oRecipientFile, "recipient-file", "@"),
|
|
|
|
ARGPARSE_s_s (oHiddenRecipientFile, "hidden-recipient-file", "@"),
|
|
|
|
ARGPARSE_s_s (oRecipient, "remote-user", "@"), /* (old option name) */
|
|
|
|
ARGPARSE_s_n (oThrowKeyids, "throw-keyids", "@"),
|
|
|
|
ARGPARSE_s_n (oNoThrowKeyids, "no-throw-keyids", "@"),
|
|
|
|
ARGPARSE_s_s (oLocalUser, "local-user",
|
|
|
|
N_("|USER-ID|use USER-ID to sign or decrypt")),
|
|
|
|
ARGPARSE_s_s (oTrustedKey, "trusted-key", "@"),
|
|
|
|
ARGPARSE_s_s (oSender, "sender", "@"),
|
|
|
|
ARGPARSE_s_s (oTrySecretKey, "try-secret-key", "@"),
|
|
|
|
ARGPARSE_s_n (oTryAllSecrets, "try-all-secrets", "@"),
|
|
|
|
ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
|
|
|
|
ARGPARSE_s_n (oNoKeyring, "no-keyring", "@"),
|
|
|
|
ARGPARSE_s_s (oKeyring, "keyring", "@"),
|
|
|
|
ARGPARSE_s_s (oPrimaryKeyring, "primary-keyring", "@"),
|
|
|
|
ARGPARSE_s_s (oSecretKeyring, "secret-keyring", "@"),
|
|
|
|
ARGPARSE_s_n (oSkipHiddenRecipients, "skip-hidden-recipients", "@"),
|
|
|
|
ARGPARSE_s_n (oNoSkipHiddenRecipients, "no-skip-hidden-recipients", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_s (oOverrideSessionKey, "override-session-key", "@"),
|
2016-11-16 09:02:53 +01:00
|
|
|
ARGPARSE_s_i (oOverrideSessionKeyFD, "override-session-key-fd", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
|
|
|
|
|
|
|
|
ARGPARSE_header ("Security", N_("Options controlling the security")),
|
|
|
|
|
|
|
|
ARGPARSE_s_i (oS2KMode, "s2k-mode", "@"),
|
|
|
|
ARGPARSE_s_s (oS2KDigest, "s2k-digest-algo", "@"),
|
|
|
|
ARGPARSE_s_s (oS2KCipher, "s2k-cipher-algo", "@"),
|
|
|
|
ARGPARSE_s_i (oS2KCount, "s2k-count", "@"),
|
|
|
|
ARGPARSE_s_n (oForceAEAD, "force-aead", "@"),
|
|
|
|
ARGPARSE_s_n (oRequireCrossCert, "require-backsigs", "@"),
|
|
|
|
ARGPARSE_s_n (oRequireCrossCert, "require-cross-certification", "@"),
|
|
|
|
ARGPARSE_s_n (oNoRequireCrossCert, "no-require-backsigs", "@"),
|
|
|
|
ARGPARSE_s_n (oNoRequireCrossCert, "no-require-cross-certification", "@"),
|
|
|
|
/* Options to override new security defaults. */
|
|
|
|
ARGPARSE_s_n (oAllowWeakKeySignatures, "allow-weak-key-signatures", "@"),
|
|
|
|
ARGPARSE_s_n (oAllowWeakDigestAlgos, "allow-weak-digest-algos", "@"),
|
2021-02-10 14:31:34 +01:00
|
|
|
ARGPARSE_s_n (oAllowOldCipherAlgos, "allow-old-cipher-algos", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_s (oWeakDigest, "weak-digest","@"),
|
|
|
|
ARGPARSE_s_s (oVerifyOptions, "verify-options", "@"),
|
|
|
|
ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_n (oNoRandomSeedFile, "no-random-seed-file", "@"),
|
|
|
|
ARGPARSE_s_n (oNoSigCache, "no-sig-cache", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oIgnoreTimeConflict, "ignore-time-conflict", "@"),
|
|
|
|
ARGPARSE_s_n (oIgnoreValidFrom, "ignore-valid-from", "@"),
|
|
|
|
ARGPARSE_s_n (oIgnoreCrcError, "ignore-crc-error", "@"),
|
|
|
|
ARGPARSE_s_n (oIgnoreMDCError, "ignore-mdc-error", "@"),
|
|
|
|
ARGPARSE_s_s (oDisableCipherAlgo, "disable-cipher-algo", "@"),
|
|
|
|
ARGPARSE_s_s (oDisablePubkeyAlgo, "disable-pubkey-algo", "@"),
|
|
|
|
ARGPARSE_s_s (oCipherAlgo, "cipher-algo", "@"),
|
|
|
|
ARGPARSE_s_s (oAEADAlgo, "aead-algo", "@"),
|
|
|
|
ARGPARSE_s_s (oDigestAlgo, "digest-algo", "@"),
|
|
|
|
ARGPARSE_s_s (oCertDigestAlgo, "cert-digest-algo", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
|
2014-03-12 18:24:52 +01:00
|
|
|
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_header (NULL, N_("Options for unattended use")),
|
|
|
|
|
|
|
|
ARGPARSE_s_n (oBatch, "batch", "@"),
|
|
|
|
ARGPARSE_s_n (oNoBatch, "no-batch", "@"),
|
|
|
|
ARGPARSE_s_n (oAnswerYes, "yes", "@"),
|
|
|
|
ARGPARSE_s_n (oAnswerNo, "no", "@"),
|
|
|
|
ARGPARSE_s_i (oStatusFD, "status-fd", "@"),
|
|
|
|
ARGPARSE_s_s (oStatusFile, "status-file", "@"),
|
|
|
|
ARGPARSE_s_i (oAttributeFD, "attribute-fd", "@"),
|
|
|
|
ARGPARSE_s_s (oAttributeFile, "attribute-file", "@"),
|
|
|
|
ARGPARSE_s_i (oCommandFD, "command-fd", "@"),
|
|
|
|
ARGPARSE_s_s (oCommandFile, "command-file", "@"),
|
|
|
|
ARGPARSE_o_s (oPassphrase, "passphrase", "@"),
|
|
|
|
ARGPARSE_s_i (oPassphraseFD, "passphrase-fd", "@"),
|
|
|
|
ARGPARSE_s_s (oPassphraseFile, "passphrase-file", "@"),
|
|
|
|
ARGPARSE_s_i (oPassphraseRepeat,"passphrase-repeat", "@"),
|
|
|
|
ARGPARSE_s_s (oPinentryMode, "pinentry-mode", "@"),
|
2021-03-11 11:27:07 +01:00
|
|
|
ARGPARSE_s_n (oForceSignKey, "force-sign-key", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
|
|
|
|
ARGPARSE_header (NULL, N_("Other options")),
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oRequestOrigin, "request-origin", "@"),
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_s_s (oDisplay, "display", "@"),
|
|
|
|
ARGPARSE_s_s (oTTYname, "ttyname", "@"),
|
|
|
|
ARGPARSE_s_s (oTTYtype, "ttytype", "@"),
|
|
|
|
ARGPARSE_s_s (oLCctype, "lc-ctype", "@"),
|
|
|
|
ARGPARSE_s_s (oLCmessages, "lc-messages","@"),
|
|
|
|
ARGPARSE_s_s (oXauthority, "xauthority", "@"),
|
2020-08-14 12:19:11 +02:00
|
|
|
ARGPARSE_s_s (oChUid, "chuid", "@"),
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
|
|
|
|
ARGPARSE_s_n (oUseKeyboxd, "use-keyboxd", "@"),
|
|
|
|
/* Options which can be used in special circumstances. They are not
|
|
|
|
* published and we hope they are never required. */
|
|
|
|
ARGPARSE_s_n (oUseOnlyOpenPGPCard, "use-only-openpgp-card", "@"),
|
|
|
|
/* Esoteric compatibility options. */
|
|
|
|
ARGPARSE_s_n (oRFC2440Text, "rfc2440-text", "@"),
|
|
|
|
ARGPARSE_s_n (oNoRFC2440Text, "no-rfc2440-text", "@"),
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_header (NULL, ""), /* Stop the header group. */
|
2008-11-12 17:41:49 +00:00
|
|
|
|
2020-03-06 15:17:53 +01:00
|
|
|
/* Aliases. I constantly mistype these, and assume other people do
|
|
|
|
as well. */
|
|
|
|
ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-prefs", "@"),
|
|
|
|
ARGPARSE_s_s (oPersonalAEADPreferences, "personal-aead-prefs", "@"),
|
|
|
|
ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-prefs", "@"),
|
|
|
|
ARGPARSE_s_s (oPersonalCompressPreferences, "personal-compress-prefs", "@"),
|
2016-12-02 19:43:36 +01:00
|
|
|
|
2008-11-12 17:41:49 +00:00
|
|
|
/* These two are aliases to help users of the PGP command line
|
|
|
|
product use gpg with minimal pain. Many commands are common
|
|
|
|
already as they seem to have borrowed commands from us. Now I'm
|
|
|
|
returning the favor. */
|
|
|
|
ARGPARSE_s_s (oLocalUser, "sign-with", "@"),
|
|
|
|
ARGPARSE_s_s (oRecipient, "user", "@"),
|
|
|
|
|
2019-08-21 10:19:16 +02:00
|
|
|
|
2014-09-25 14:45:37 -04:00
|
|
|
/* Dummy options with warnings. */
|
2014-09-25 22:13:03 +02:00
|
|
|
ARGPARSE_s_n (oUseAgent, "use-agent", "@"),
|
|
|
|
ARGPARSE_s_n (oNoUseAgent, "no-use-agent", "@"),
|
|
|
|
ARGPARSE_s_s (oGpgAgentInfo, "gpg-agent-info", "@"),
|
2014-09-25 14:45:37 -04:00
|
|
|
ARGPARSE_s_s (oReaderPort, "reader-port", "@"),
|
|
|
|
ARGPARSE_s_s (octapiDriver, "ctapi-driver", "@"),
|
|
|
|
ARGPARSE_s_s (opcscDriver, "pcsc-driver", "@"),
|
|
|
|
ARGPARSE_s_n (oDisableCCID, "disable-ccid", "@"),
|
2014-12-08 15:14:35 +01:00
|
|
|
ARGPARSE_s_n (oHonorHttpProxy, "honor-http-proxy", "@"),
|
2016-08-05 14:40:36 +02:00
|
|
|
ARGPARSE_s_s (oTOFUDBFormat, "tofu-db-format", "@"),
|
2014-09-25 14:45:37 -04:00
|
|
|
|
2014-08-12 10:36:30 +02:00
|
|
|
/* Dummy options. */
|
2020-03-06 15:17:53 +01:00
|
|
|
ARGPARSE_ignore (oStrict, "strict"),
|
|
|
|
ARGPARSE_ignore (oNoStrict, "no-strict"),
|
|
|
|
ARGPARSE_ignore (oLoadExtension, "load-extension"), /* from 1.4. */
|
|
|
|
|
2014-08-12 10:36:30 +02:00
|
|
|
ARGPARSE_s_n (oNoop, "sk-comments", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "no-sk-comments", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "compress-keys", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "compress-sigs", "@"),
|
2014-10-12 20:07:12 +02:00
|
|
|
ARGPARSE_s_n (oNoop, "force-v3-sigs", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "no-force-v3-sigs", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "force-v4-certs", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "no-force-v4-certs", "@"),
|
2018-05-15 12:19:40 +02:00
|
|
|
ARGPARSE_s_n (oNoop, "no-mdc-warning", "@"),
|
2018-05-29 12:42:44 +02:00
|
|
|
ARGPARSE_s_n (oNoop, "force-mdc", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "no-force-mdc", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "disable-mdc", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "no-disable-mdc", "@"),
|
2018-05-30 22:05:57 +02:00
|
|
|
ARGPARSE_s_n (oNoop, "allow-multisig-verification", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "allow-multiple-messages", "@"),
|
|
|
|
ARGPARSE_s_n (oNoop, "no-allow-multiple-messages", "@"),
|
2014-08-12 10:36:30 +02:00
|
|
|
|
2020-03-06 15:17:53 +01:00
|
|
|
|
|
|
|
ARGPARSE_group (302, N_(
|
|
|
|
"@\n(See the man page for a complete listing of all commands and options)\n"
|
|
|
|
)),
|
|
|
|
|
|
|
|
ARGPARSE_group (303, N_("@\nExamples:\n\n"
|
|
|
|
" -se -r Bob [file] sign and encrypt for user Bob\n"
|
|
|
|
" --clear-sign [file] make a clear text signature\n"
|
|
|
|
" --detach-sign [file] make a detached signature\n"
|
|
|
|
" --list-keys [names] show keys\n"
|
|
|
|
" --fingerprint [names] show fingerprints\n")),
|
|
|
|
|
|
|
|
|
2008-11-12 17:41:49 +00:00
|
|
|
ARGPARSE_end ()
|
2006-04-19 11:26:11 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2015-06-22 21:01:10 +02:00
|
|
|
/* The list of supported debug flags. */
|
|
|
|
static struct debug_flags_s debug_flags [] =
|
|
|
|
{
|
|
|
|
{ DBG_PACKET_VALUE , "packet" },
|
|
|
|
{ DBG_MPI_VALUE , "mpi" },
|
|
|
|
{ DBG_CRYPTO_VALUE , "crypto" },
|
|
|
|
{ DBG_FILTER_VALUE , "filter" },
|
|
|
|
{ DBG_IOBUF_VALUE , "iobuf" },
|
|
|
|
{ DBG_MEMORY_VALUE , "memory" },
|
|
|
|
{ DBG_CACHE_VALUE , "cache" },
|
|
|
|
{ DBG_MEMSTAT_VALUE, "memstat" },
|
|
|
|
{ DBG_TRUST_VALUE , "trust" },
|
|
|
|
{ DBG_HASHING_VALUE, "hashing" },
|
|
|
|
{ DBG_IPC_VALUE , "ipc" },
|
|
|
|
{ DBG_CLOCK_VALUE , "clock" },
|
|
|
|
{ DBG_LOOKUP_VALUE , "lookup" },
|
|
|
|
{ DBG_EXTPROG_VALUE, "extprog" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
#ifdef ENABLE_SELINUX_HACKS
|
|
|
|
#define ALWAYS_ADD_KEYRINGS 1
|
|
|
|
#else
|
|
|
|
#define ALWAYS_ADD_KEYRINGS 0
|
|
|
|
#endif
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2019-08-23 13:22:15 +02:00
|
|
|
/* The list of the default AKL methods. */
|
|
|
|
#define DEFAULT_AKL_LIST "local,wkd"
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
int g10_errors_seen = 0;
|
|
|
|
|
2021-03-05 15:33:40 +01:00
|
|
|
static int utf8_strings =
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
1
|
|
|
|
#else
|
|
|
|
0
|
|
|
|
#endif
|
|
|
|
;
|
2003-06-05 07:14:21 +00:00
|
|
|
static int maybe_setuid = 1;
|
2018-01-24 18:29:08 +01:00
|
|
|
static unsigned int opt_set_iobuf_size;
|
|
|
|
static unsigned int opt_set_iobuf_size_used;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
static char *build_list( const char *text, char letter,
|
|
|
|
const char *(*mapf)(int), int (*chkf)(int) );
|
|
|
|
static void set_cmd( enum cmd_and_opt_values *ret_cmd,
|
|
|
|
enum cmd_and_opt_values new_cmd );
|
|
|
|
static void print_mds( const char *fname, int algo );
|
|
|
|
static void add_notation_data( const char *string, int which );
|
|
|
|
static void add_policy_url( const char *string, int which );
|
2003-09-23 17:48:33 +00:00
|
|
|
static void add_keyserver_url( const char *string, int which );
|
2003-06-27 20:53:09 +00:00
|
|
|
static void emergency_cleanup (void);
|
2016-11-16 09:02:53 +01:00
|
|
|
static void read_sessionkey_from_fd (int fd);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2019-09-10 16:05:54 +02:00
|
|
|
/* NPth wrapper function definitions. */
|
|
|
|
ASSUAN_SYSTEM_NPTH_IMPL;
|
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2008-11-18 18:01:03 +00:00
|
|
|
static char *
|
|
|
|
make_libversion (const char *libname, const char *(*getfnc)(const char*))
|
|
|
|
{
|
|
|
|
const char *s;
|
|
|
|
char *result;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2008-11-18 18:01:03 +00:00
|
|
|
if (maybe_setuid)
|
|
|
|
{
|
|
|
|
gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */
|
|
|
|
maybe_setuid = 0;
|
|
|
|
}
|
|
|
|
s = getfnc (NULL);
|
|
|
|
result = xmalloc (strlen (libname) + 1 + strlen (s) + 1);
|
|
|
|
strcpy (stpcpy (stpcpy (result, libname), " "), s);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-01-31 15:55:04 +01:00
|
|
|
static int
|
|
|
|
build_list_pk_test_algo (int algo)
|
|
|
|
{
|
2014-08-28 16:01:22 +02:00
|
|
|
/* Show only one "RSA" string. If RSA_E or RSA_S is available RSA
|
|
|
|
is also available. */
|
|
|
|
if (algo == PUBKEY_ALGO_RSA_E
|
|
|
|
|| algo == PUBKEY_ALGO_RSA_S)
|
|
|
|
return GPG_ERR_DIGEST_ALGO;
|
|
|
|
|
2014-01-31 15:55:04 +01:00
|
|
|
return openpgp_pk_test_algo (algo);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
build_list_pk_algo_name (int algo)
|
|
|
|
{
|
|
|
|
return openpgp_pk_algo_name (algo);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
build_list_cipher_test_algo (int algo)
|
|
|
|
{
|
|
|
|
return openpgp_cipher_test_algo (algo);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
build_list_cipher_algo_name (int algo)
|
|
|
|
{
|
|
|
|
return openpgp_cipher_algo_name (algo);
|
|
|
|
}
|
|
|
|
|
2018-01-23 19:08:16 +01:00
|
|
|
static int
|
|
|
|
build_list_aead_test_algo (int algo)
|
|
|
|
{
|
|
|
|
return openpgp_aead_test_algo (algo);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
build_list_aead_algo_name (int algo)
|
|
|
|
{
|
|
|
|
return openpgp_aead_algo_name (algo);
|
|
|
|
}
|
|
|
|
|
2014-01-31 15:55:04 +01:00
|
|
|
static int
|
|
|
|
build_list_md_test_algo (int algo)
|
|
|
|
{
|
2014-08-28 16:01:22 +02:00
|
|
|
/* By default we do not accept MD5 based signatures. To avoid
|
|
|
|
confusion we do not announce support for it either. */
|
|
|
|
if (algo == DIGEST_ALGO_MD5)
|
|
|
|
return GPG_ERR_DIGEST_ALGO;
|
|
|
|
|
2014-01-31 15:55:04 +01:00
|
|
|
return openpgp_md_test_algo (algo);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
build_list_md_algo_name (int algo)
|
|
|
|
{
|
|
|
|
return openpgp_md_algo_name (algo);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
static const char *
|
|
|
|
my_strusage( int level )
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2018-01-23 19:08:16 +01:00
|
|
|
static char *digests, *pubkeys, *ciphers, *zips, *aeads, *ver_gcry;
|
2008-11-18 18:01:03 +00:00
|
|
|
const char *p;
|
|
|
|
|
2020-02-20 10:03:11 +01:00
|
|
|
switch( level ) {
|
|
|
|
case 9: p = "GPL-3.0-or-later"; break;
|
2013-11-18 14:09:47 +01:00
|
|
|
case 11: p = "@GPG@ (@GNUPG@)";
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case 13: p = VERSION; break;
|
2020-02-20 10:03:11 +01:00
|
|
|
case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case 17: p = PRINTABLE_OS_NAME; break;
|
2009-07-21 14:21:05 +00:00
|
|
|
case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2008-11-18 18:01:03 +00:00
|
|
|
case 20:
|
|
|
|
if (!ver_gcry)
|
|
|
|
ver_gcry = make_libversion ("libgcrypt", gcry_check_version);
|
|
|
|
p = ver_gcry;
|
|
|
|
break;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
#ifdef IS_DEVELOPMENT_VERSION
|
2008-11-18 18:01:03 +00:00
|
|
|
case 25:
|
2006-04-19 11:26:11 +00:00
|
|
|
p="NOTE: THIS IS A DEVELOPMENT VERSION!";
|
|
|
|
break;
|
2008-11-18 18:01:03 +00:00
|
|
|
case 26:
|
2006-04-19 11:26:11 +00:00
|
|
|
p="It is only intended for test purposes and should NOT be";
|
|
|
|
break;
|
2008-11-18 18:01:03 +00:00
|
|
|
case 27:
|
2006-04-19 11:26:11 +00:00
|
|
|
p="used in a production environment or with production keys!";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case 1:
|
|
|
|
case 40: p =
|
2013-11-18 14:09:47 +01:00
|
|
|
_("Usage: @GPG@ [options] [files] (-h for help)");
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case 41: p =
|
2013-11-18 14:09:47 +01:00
|
|
|
_("Syntax: @GPG@ [options] [files]\n"
|
2012-08-22 12:54:38 -04:00
|
|
|
"Sign, check, encrypt or decrypt\n"
|
|
|
|
"Default operation depends on the input data\n");
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 31: p = "\nHome: "; break;
|
|
|
|
#ifndef __riscos__
|
2016-06-07 10:59:46 +02:00
|
|
|
case 32: p = gnupg_homedir (); break;
|
2003-06-05 07:14:21 +00:00
|
|
|
#else /* __riscos__ */
|
2016-06-07 10:59:46 +02:00
|
|
|
case 32: p = make_filename(gnupg_homedir (), NULL); break;
|
2003-06-05 07:14:21 +00:00
|
|
|
#endif /* __riscos__ */
|
|
|
|
case 33: p = _("\nSupported algorithms:\n"); break;
|
|
|
|
case 34:
|
2006-04-19 11:26:11 +00:00
|
|
|
if (!pubkeys)
|
2014-01-31 15:55:04 +01:00
|
|
|
pubkeys = build_list (_("Pubkey: "), 1,
|
|
|
|
build_list_pk_algo_name,
|
|
|
|
build_list_pk_test_algo );
|
2003-06-05 07:14:21 +00:00
|
|
|
p = pubkeys;
|
|
|
|
break;
|
|
|
|
case 35:
|
|
|
|
if( !ciphers )
|
2011-02-04 12:57:53 +01:00
|
|
|
ciphers = build_list(_("Cipher: "), 'S',
|
2014-01-31 15:55:04 +01:00
|
|
|
build_list_cipher_algo_name,
|
|
|
|
build_list_cipher_test_algo );
|
2003-06-05 07:14:21 +00:00
|
|
|
p = ciphers;
|
|
|
|
break;
|
|
|
|
case 36:
|
2018-01-23 19:08:16 +01:00
|
|
|
if (!aeads)
|
|
|
|
aeads = build_list ("AEAD: ", 'A',
|
|
|
|
build_list_aead_algo_name,
|
|
|
|
build_list_aead_test_algo);
|
|
|
|
p = aeads;
|
|
|
|
break;
|
|
|
|
case 37:
|
2003-06-05 07:14:21 +00:00
|
|
|
if( !digests )
|
2011-02-04 12:57:53 +01:00
|
|
|
digests = build_list(_("Hash: "), 'H',
|
2014-01-31 15:55:04 +01:00
|
|
|
build_list_md_algo_name,
|
|
|
|
build_list_md_test_algo );
|
2003-06-05 07:14:21 +00:00
|
|
|
p = digests;
|
|
|
|
break;
|
2018-01-23 19:08:16 +01:00
|
|
|
case 38:
|
2003-06-05 07:14:21 +00:00
|
|
|
if( !zips )
|
2006-04-19 11:26:11 +00:00
|
|
|
zips = build_list(_("Compression: "),'Z',
|
|
|
|
compress_algo_to_string,
|
|
|
|
check_compress_algo);
|
2003-06-05 07:14:21 +00:00
|
|
|
p = zips;
|
|
|
|
break;
|
|
|
|
|
2021-03-04 10:43:46 +01:00
|
|
|
case 95:
|
|
|
|
p = "1"; /* <-- Enable globbing under Windows (see init.c) */
|
|
|
|
break;
|
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
default: p = NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
2012-12-15 11:28:00 +01:00
|
|
|
build_list (const char *text, char letter,
|
|
|
|
const char * (*mapf)(int), int (*chkf)(int))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2012-12-15 11:28:00 +01:00
|
|
|
membuf_t mb;
|
|
|
|
int indent;
|
|
|
|
int i, j, len;
|
2018-01-23 19:08:16 +01:00
|
|
|
int limit;
|
2012-12-15 11:28:00 +01:00
|
|
|
const char *s;
|
|
|
|
char *string;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2012-12-15 11:28:00 +01:00
|
|
|
if (maybe_setuid)
|
|
|
|
gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2015-11-23 22:13:56 +01:00
|
|
|
indent = utf8_charcount (text, -1);
|
2012-12-15 11:28:00 +01:00
|
|
|
len = 0;
|
|
|
|
init_membuf (&mb, 512);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2018-01-23 19:08:16 +01:00
|
|
|
limit = (letter == 'A')? 4 : 110;
|
|
|
|
for (i=0; i <= limit; i++ )
|
2012-12-15 11:28:00 +01:00
|
|
|
{
|
|
|
|
if (!chkf (i) && (s = mapf (i)))
|
|
|
|
{
|
|
|
|
if (mb.len - len > 60)
|
|
|
|
{
|
|
|
|
put_membuf_str (&mb, ",\n");
|
|
|
|
len = mb.len;
|
|
|
|
for (j=0; j < indent; j++)
|
|
|
|
put_membuf_str (&mb, " ");
|
|
|
|
}
|
|
|
|
else if (mb.len)
|
|
|
|
put_membuf_str (&mb, ", ");
|
|
|
|
else
|
|
|
|
put_membuf_str (&mb, text);
|
|
|
|
|
|
|
|
put_membuf_str (&mb, s);
|
|
|
|
if (opt.verbose && letter)
|
|
|
|
{
|
|
|
|
char num[20];
|
2014-01-31 15:55:04 +01:00
|
|
|
if (letter == 1)
|
|
|
|
snprintf (num, sizeof num, " (%d)", i);
|
|
|
|
else
|
|
|
|
snprintf (num, sizeof num, " (%c%d)", letter, i);
|
2012-12-15 11:28:00 +01:00
|
|
|
put_membuf_str (&mb, num);
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
}
|
2012-12-15 11:28:00 +01:00
|
|
|
if (mb.len)
|
|
|
|
put_membuf_str (&mb, "\n");
|
|
|
|
put_membuf (&mb, "", 1);
|
|
|
|
|
|
|
|
string = get_membuf (&mb, NULL);
|
|
|
|
return xrealloc (string, strlen (string)+1);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
wrong_args( const char *text)
|
|
|
|
{
|
2015-02-19 17:22:27 +01:00
|
|
|
es_fprintf (es_stderr, _("usage: %s [options] %s\n"), GPG_NAME, text);
|
2018-04-06 17:32:08 +02:00
|
|
|
log_inc_errorcount ();
|
2014-06-25 20:25:28 +02:00
|
|
|
g10_exit(2);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
make_username( const char *string )
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
char *p;
|
|
|
|
if( utf8_strings )
|
|
|
|
p = xstrdup(string);
|
|
|
|
else
|
|
|
|
p = native_to_utf8( string );
|
|
|
|
return p;
|
2003-06-18 19:56:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-07-07 10:02:41 +00:00
|
|
|
static void
|
|
|
|
set_opt_session_env (const char *name, const char *value)
|
|
|
|
{
|
|
|
|
gpg_error_t err;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2009-07-07 10:02:41 +00:00
|
|
|
err = session_env_setenv (opt.session_env, name, value);
|
|
|
|
if (err)
|
|
|
|
log_fatal ("error setting session environment: %s\n",
|
|
|
|
gpg_strerror (err));
|
|
|
|
}
|
|
|
|
|
2015-06-22 21:01:10 +02:00
|
|
|
|
2004-03-23 13:03:09 +00:00
|
|
|
/* Setup the debugging. With a LEVEL of NULL only the active debug
|
|
|
|
flags are propagated to the subsystems. With LEVEL set, a specific
|
|
|
|
set of debug flags is set; thus overriding all flags already
|
|
|
|
set. */
|
2003-06-05 07:14:21 +00:00
|
|
|
static void
|
2004-03-23 13:03:09 +00:00
|
|
|
set_debug (const char *level)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2009-12-03 18:04:40 +00:00
|
|
|
int numok = (level && digitp (level));
|
|
|
|
int numlvl = numok? atoi (level) : 0;
|
|
|
|
|
2004-03-23 13:03:09 +00:00
|
|
|
if (!level)
|
|
|
|
;
|
2009-12-03 18:04:40 +00:00
|
|
|
else if (!strcmp (level, "none") || (numok && numlvl < 1))
|
2004-03-23 13:03:09 +00:00
|
|
|
opt.debug = 0;
|
2009-12-03 18:04:40 +00:00
|
|
|
else if (!strcmp (level, "basic") || (numok && numlvl <= 2))
|
2004-03-23 13:03:09 +00:00
|
|
|
opt.debug = DBG_MEMSTAT_VALUE;
|
2009-12-03 18:04:40 +00:00
|
|
|
else if (!strcmp (level, "advanced") || (numok && numlvl <= 5))
|
2004-03-23 13:03:09 +00:00
|
|
|
opt.debug = DBG_MEMSTAT_VALUE|DBG_TRUST_VALUE|DBG_EXTPROG_VALUE;
|
2009-12-03 18:04:40 +00:00
|
|
|
else if (!strcmp (level, "expert") || (numok && numlvl <= 8))
|
2004-03-23 13:03:09 +00:00
|
|
|
opt.debug = (DBG_MEMSTAT_VALUE|DBG_TRUST_VALUE|DBG_EXTPROG_VALUE
|
2015-04-06 13:27:26 +02:00
|
|
|
|DBG_CACHE_VALUE|DBG_LOOKUP|DBG_FILTER_VALUE|DBG_PACKET_VALUE);
|
2009-12-03 18:04:40 +00:00
|
|
|
else if (!strcmp (level, "guru") || numok)
|
|
|
|
{
|
|
|
|
opt.debug = ~0;
|
|
|
|
/* Unless the "guru" string has been used we don't want to allow
|
|
|
|
hashing debugging. The rationale is that people tend to
|
|
|
|
select the highest debug value and would then clutter their
|
2011-02-04 12:57:53 +01:00
|
|
|
disk with debug files which may reveal confidential data. */
|
2009-12-03 18:04:40 +00:00
|
|
|
if (numok)
|
|
|
|
opt.debug &= ~(DBG_HASHING_VALUE);
|
|
|
|
}
|
2004-03-23 13:03:09 +00:00
|
|
|
else
|
|
|
|
{
|
2015-06-22 21:01:10 +02:00
|
|
|
log_error (_("invalid debug-level '%s' given\n"), level);
|
|
|
|
g10_exit (2);
|
2004-03-23 13:03:09 +00:00
|
|
|
}
|
|
|
|
|
2016-10-07 07:54:38 +02:00
|
|
|
if ((opt.debug & DBG_MEMORY_VALUE))
|
2003-06-18 19:56:13 +00:00
|
|
|
memory_debug_mode = 1;
|
2016-10-07 07:54:38 +02:00
|
|
|
if ((opt.debug & DBG_MEMSTAT_VALUE))
|
2003-06-18 19:56:13 +00:00
|
|
|
memory_stat_debug_mode = 1;
|
2016-10-07 07:54:38 +02:00
|
|
|
if (DBG_MPI)
|
2003-06-18 19:56:13 +00:00
|
|
|
gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 2);
|
2016-10-07 07:54:38 +02:00
|
|
|
if (DBG_CRYPTO)
|
2003-06-18 19:56:13 +00:00
|
|
|
gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1);
|
2016-10-07 07:54:38 +02:00
|
|
|
if ((opt.debug & DBG_IOBUF_VALUE))
|
2003-06-18 19:56:13 +00:00
|
|
|
iobuf_debug_mode = 1;
|
2006-04-19 11:26:11 +00:00
|
|
|
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
|
2009-12-03 18:04:40 +00:00
|
|
|
|
|
|
|
if (opt.debug)
|
2015-06-22 21:01:10 +02:00
|
|
|
parse_debug_flag (NULL, &opt.debug, debug_flags);
|
2018-01-24 18:29:08 +01:00
|
|
|
|
|
|
|
if (opt_set_iobuf_size || opt_set_iobuf_size_used)
|
|
|
|
log_debug ("iobuf buffer size is %uk\n",
|
|
|
|
iobuf_set_buffer_size (opt_set_iobuf_size));
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/* We set the screen dimensions for UI purposes. Do not allow screens
|
|
|
|
smaller than 80x24 for the sake of simplicity. */
|
|
|
|
static void
|
|
|
|
set_screen_dimensions(void)
|
|
|
|
{
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
char *str;
|
|
|
|
|
|
|
|
str=getenv("COLUMNS");
|
|
|
|
if(str)
|
|
|
|
opt.screen_columns=atoi(str);
|
|
|
|
|
|
|
|
str=getenv("LINES");
|
|
|
|
if(str)
|
|
|
|
opt.screen_lines=atoi(str);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if(opt.screen_columns<80 || opt.screen_columns>255)
|
|
|
|
opt.screen_columns=80;
|
|
|
|
|
|
|
|
if(opt.screen_lines<24 || opt.screen_lines>255)
|
|
|
|
opt.screen_lines=24;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper to open a file FNAME either for reading or writing to be
|
|
|
|
used with --status-file etc functions. Not generally useful but it
|
|
|
|
avoids the riscos specific functions and well some Windows people
|
|
|
|
might like it too. Prints an error message and returns -1 on
|
2008-12-09 08:58:02 +00:00
|
|
|
error. On success the file descriptor is returned. */
|
2006-04-19 11:26:11 +00:00
|
|
|
static int
|
2008-12-09 08:58:02 +00:00
|
|
|
open_info_file (const char *fname, int for_write, int binary)
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
|
|
|
#ifdef __riscos__
|
|
|
|
return riscos_fdopenfile (fname, for_write);
|
|
|
|
#elif defined (ENABLE_SELINUX_HACKS)
|
|
|
|
/* We can't allow these even when testing for a secured filename
|
|
|
|
because files to be secured might not yet been secured. This is
|
|
|
|
similar to the option file but in that case it is unlikely that
|
|
|
|
sensitive information may be retrieved by means of error
|
|
|
|
messages. */
|
2008-12-09 08:58:02 +00:00
|
|
|
(void)fname;
|
|
|
|
(void)for_write;
|
|
|
|
(void)binary;
|
2006-04-19 11:26:11 +00:00
|
|
|
return -1;
|
2011-02-04 12:57:53 +01:00
|
|
|
#else
|
2006-04-19 11:26:11 +00:00
|
|
|
int fd;
|
|
|
|
|
2008-12-09 08:58:02 +00:00
|
|
|
if (binary)
|
|
|
|
binary = MY_O_BINARY;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/* if (is_secured_filename (fname)) */
|
|
|
|
/* { */
|
|
|
|
/* fd = -1; */
|
2010-04-01 13:24:55 +00:00
|
|
|
/* gpg_err_set_errno (EPERM); */
|
2006-04-19 11:26:11 +00:00
|
|
|
/* } */
|
|
|
|
/* else */
|
|
|
|
/* { */
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (for_write)
|
2020-10-20 14:08:35 +02:00
|
|
|
fd = gnupg_open (fname, O_CREAT | O_TRUNC | O_WRONLY | binary,
|
|
|
|
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
2020-10-20 14:08:35 +02:00
|
|
|
fd = gnupg_open (fname, O_RDONLY | binary, 0);
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
while (fd == -1 && errno == EINTR);
|
|
|
|
/* } */
|
|
|
|
if ( fd == -1)
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error ( for_write? _("can't create '%s': %s\n")
|
|
|
|
: _("can't open '%s': %s\n"), fname, strerror(errno));
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
return fd;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
static void
|
|
|
|
set_cmd( enum cmd_and_opt_values *ret_cmd, enum cmd_and_opt_values new_cmd )
|
|
|
|
{
|
|
|
|
enum cmd_and_opt_values cmd = *ret_cmd;
|
|
|
|
|
|
|
|
if( !cmd || cmd == new_cmd )
|
|
|
|
cmd = new_cmd;
|
|
|
|
else if( cmd == aSign && new_cmd == aEncr )
|
|
|
|
cmd = aSignEncr;
|
|
|
|
else if( cmd == aEncr && new_cmd == aSign )
|
|
|
|
cmd = aSignEncr;
|
|
|
|
else if( cmd == aSign && new_cmd == aSym )
|
|
|
|
cmd = aSignSym;
|
|
|
|
else if( cmd == aSym && new_cmd == aSign )
|
|
|
|
cmd = aSignSym;
|
2006-04-19 11:26:11 +00:00
|
|
|
else if( cmd == aSym && new_cmd == aEncr )
|
|
|
|
cmd = aEncrSym;
|
|
|
|
else if( cmd == aEncr && new_cmd == aSym )
|
|
|
|
cmd = aEncrSym;
|
|
|
|
else if (cmd == aSignEncr && new_cmd == aSym)
|
|
|
|
cmd = aSignEncrSym;
|
|
|
|
else if (cmd == aSignSym && new_cmd == aEncr)
|
|
|
|
cmd = aSignEncrSym;
|
|
|
|
else if (cmd == aEncrSym && new_cmd == aSign)
|
|
|
|
cmd = aSignEncrSym;
|
2003-06-05 07:14:21 +00:00
|
|
|
else if( ( cmd == aSign && new_cmd == aClearsign )
|
|
|
|
|| ( cmd == aClearsign && new_cmd == aSign ) )
|
|
|
|
cmd = aClearsign;
|
|
|
|
else {
|
|
|
|
log_error(_("conflicting commands\n"));
|
|
|
|
g10_exit(2);
|
|
|
|
}
|
|
|
|
|
|
|
|
*ret_cmd = cmd;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
static void
|
|
|
|
add_group(char *string)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
char *name,*value;
|
|
|
|
struct groupitem *item;
|
|
|
|
|
|
|
|
/* Break off the group name */
|
|
|
|
name=strsep(&string,"=");
|
|
|
|
if(string==NULL)
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("no = sign found in group definition '%s'\n"),name);
|
2003-06-05 07:14:21 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
trim_trailing_ws(name,strlen(name));
|
|
|
|
|
|
|
|
/* Does this group already exist? */
|
|
|
|
for(item=opt.grouplist;item;item=item->next)
|
|
|
|
if(strcasecmp(item->name,name)==0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if(!item)
|
|
|
|
{
|
|
|
|
item=xmalloc(sizeof(struct groupitem));
|
|
|
|
item->name=name;
|
|
|
|
item->next=opt.grouplist;
|
|
|
|
item->values=NULL;
|
|
|
|
opt.grouplist=item;
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
/* Break apart the values */
|
|
|
|
while ((value= strsep(&string," \t")))
|
|
|
|
{
|
|
|
|
if (*value)
|
2006-04-19 11:26:11 +00:00
|
|
|
add_to_strlist2(&item->values,value,utf8_strings);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
rm_group(char *name)
|
|
|
|
{
|
|
|
|
struct groupitem *item,*last=NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
trim_trailing_ws(name,strlen(name));
|
|
|
|
|
|
|
|
for(item=opt.grouplist;item;last=item,item=item->next)
|
|
|
|
{
|
|
|
|
if(strcasecmp(item->name,name)==0)
|
|
|
|
{
|
|
|
|
if(last)
|
|
|
|
last->next=item->next;
|
|
|
|
else
|
|
|
|
opt.grouplist=item->next;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
free_strlist(item->values);
|
|
|
|
xfree(item);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
/* We need to check three things.
|
|
|
|
|
|
|
|
0) The homedir. It must be x00, a directory, and owned by the
|
|
|
|
user.
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
1) The options/gpg.conf file. Okay unless it or its containing
|
|
|
|
directory is group or other writable or not owned by us. Disable
|
|
|
|
exec in this case.
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
2) Extensions. Same as #1.
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
Returns true if the item is unsafe. */
|
|
|
|
static int
|
2010-04-14 14:39:16 +00:00
|
|
|
check_permissions (const char *path, int item)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
#if defined(HAVE_STAT) && !defined(HAVE_DOSISH_SYSTEM)
|
|
|
|
static int homedir_cache=-1;
|
|
|
|
char *tmppath,*dir;
|
|
|
|
struct stat statbuf,dirbuf;
|
|
|
|
int homedir=0,ret=0,checkonly=0;
|
|
|
|
int perm=0,own=0,enc_dir_perm=0,enc_dir_own=0;
|
|
|
|
|
|
|
|
if(opt.no_perm_warn)
|
|
|
|
return 0;
|
|
|
|
|
2016-04-29 11:05:24 +02:00
|
|
|
log_assert(item==0 || item==1 || item==2);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
/* extensions may attach a path */
|
|
|
|
if(item==2 && path[0]!=DIRSEP_C)
|
|
|
|
{
|
|
|
|
if(strchr(path,DIRSEP_C))
|
|
|
|
tmppath=make_filename(path,NULL);
|
|
|
|
else
|
2007-06-14 17:05:07 +00:00
|
|
|
tmppath=make_filename(gnupg_libdir (),path,NULL);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else
|
2006-04-19 11:26:11 +00:00
|
|
|
tmppath=xstrdup(path);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
/* If the item is located in the homedir, but isn't the homedir,
|
|
|
|
don't continue if we already checked the homedir itself. This is
|
|
|
|
to avoid user confusion with an extra options file warning which
|
|
|
|
could be rectified if the homedir itself had proper
|
|
|
|
permissions. */
|
|
|
|
if(item!=0 && homedir_cache>-1
|
2016-06-07 10:59:46 +02:00
|
|
|
&& !ascii_strncasecmp (gnupg_homedir (), tmppath,
|
|
|
|
strlen (gnupg_homedir ())))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
ret=homedir_cache;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* It's okay if the file or directory doesn't exist */
|
2020-10-20 16:38:06 +02:00
|
|
|
if (gnupg_stat (tmppath,&statbuf))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
ret=0;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now check the enclosing directory. Theoretically, we could walk
|
|
|
|
this test up to the root directory /, but for the sake of sanity,
|
|
|
|
I'm stopping at one level down. */
|
|
|
|
dir=make_dirname(tmppath);
|
|
|
|
|
2020-10-20 16:38:06 +02:00
|
|
|
if (gnupg_stat (dir,&dirbuf) || !S_ISDIR (dirbuf.st_mode))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
/* Weird error */
|
|
|
|
ret=1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(dir);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
/* Assume failure */
|
|
|
|
ret=1;
|
|
|
|
|
|
|
|
if(item==0)
|
|
|
|
{
|
|
|
|
/* The homedir must be x00, a directory, and owned by the user. */
|
|
|
|
|
|
|
|
if(S_ISDIR(statbuf.st_mode))
|
|
|
|
{
|
|
|
|
if(statbuf.st_uid==getuid())
|
|
|
|
{
|
|
|
|
if((statbuf.st_mode & (S_IRWXG|S_IRWXO))==0)
|
|
|
|
ret=0;
|
|
|
|
else
|
|
|
|
perm=1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
own=1;
|
|
|
|
|
|
|
|
homedir_cache=ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(item==1 || item==2)
|
|
|
|
{
|
|
|
|
/* The options or extension file. Okay unless it or its
|
|
|
|
containing directory is group or other writable or not owned
|
|
|
|
by us or root. */
|
|
|
|
|
|
|
|
if(S_ISREG(statbuf.st_mode))
|
|
|
|
{
|
|
|
|
if(statbuf.st_uid==getuid() || statbuf.st_uid==0)
|
|
|
|
{
|
|
|
|
if((statbuf.st_mode & (S_IWGRP|S_IWOTH))==0)
|
|
|
|
{
|
|
|
|
/* it's not writable, so make sure the enclosing
|
|
|
|
directory is also not writable */
|
|
|
|
if(dirbuf.st_uid==getuid() || dirbuf.st_uid==0)
|
|
|
|
{
|
|
|
|
if((dirbuf.st_mode & (S_IWGRP|S_IWOTH))==0)
|
|
|
|
ret=0;
|
|
|
|
else
|
|
|
|
enc_dir_perm=1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
enc_dir_own=1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* it's writable, so the enclosing directory had
|
|
|
|
better not let people get to it. */
|
|
|
|
if(dirbuf.st_uid==getuid() || dirbuf.st_uid==0)
|
|
|
|
{
|
|
|
|
if((dirbuf.st_mode & (S_IRWXG|S_IRWXO))==0)
|
|
|
|
ret=0;
|
|
|
|
else
|
|
|
|
perm=enc_dir_perm=1; /* unclear which one to fix! */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
enc_dir_own=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
own=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
BUG();
|
|
|
|
|
|
|
|
if(!checkonly)
|
|
|
|
{
|
|
|
|
if(own)
|
|
|
|
{
|
|
|
|
if(item==0)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe ownership on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" homedir '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
else if(item==1)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe ownership on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" configuration file '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe ownership on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" extension '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
if(perm)
|
|
|
|
{
|
|
|
|
if(item==0)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe permissions on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" homedir '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
else if(item==1)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe permissions on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" configuration file '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe permissions on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" extension '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
if(enc_dir_own)
|
|
|
|
{
|
|
|
|
if(item==0)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe enclosing directory ownership on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" homedir '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
else if(item==1)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe enclosing directory ownership on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" configuration file '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe enclosing directory ownership on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" extension '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
if(enc_dir_perm)
|
|
|
|
{
|
|
|
|
if(item==0)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe enclosing directory permissions on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" homedir '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
else if(item==1)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe enclosing directory permissions on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" configuration file '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info(_("WARNING: unsafe enclosing directory permissions on"
|
2012-06-05 19:29:22 +02:00
|
|
|
" extension '%s'\n"),tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
end:
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(tmppath);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
if(homedir)
|
|
|
|
homedir_cache=ret;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
2010-04-14 14:39:16 +00:00
|
|
|
#else /*!(HAVE_STAT && !HAVE_DOSISH_SYSTEM)*/
|
|
|
|
(void)path;
|
|
|
|
(void)item;
|
2003-06-05 07:14:21 +00:00
|
|
|
return 0;
|
2010-04-14 14:39:16 +00:00
|
|
|
#endif /*!(HAVE_STAT && !HAVE_DOSISH_SYSTEM)*/
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2010-01-08 19:18:49 +00:00
|
|
|
/* Print the OpenPGP defined algo numbers. */
|
2006-04-19 11:26:11 +00:00
|
|
|
static void
|
|
|
|
print_algo_numbers(int (*checker)(int))
|
|
|
|
{
|
|
|
|
int i,first=1;
|
|
|
|
|
|
|
|
for(i=0;i<=110;i++)
|
|
|
|
{
|
|
|
|
if(!checker(i))
|
|
|
|
{
|
|
|
|
if(first)
|
|
|
|
first=0;
|
|
|
|
else
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf (";");
|
|
|
|
es_printf ("%d",i);
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-12-12 10:28:30 +00:00
|
|
|
static void
|
|
|
|
print_algo_names(int (*checker)(int),const char *(*mapper)(int))
|
|
|
|
{
|
|
|
|
int i,first=1;
|
|
|
|
|
|
|
|
for(i=0;i<=110;i++)
|
|
|
|
{
|
|
|
|
if(!checker(i))
|
|
|
|
{
|
|
|
|
if(first)
|
|
|
|
first=0;
|
|
|
|
else
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf (";");
|
|
|
|
es_printf ("%s",mapper(i));
|
2007-12-12 10:28:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/* In the future, we can do all sorts of interesting configuration
|
|
|
|
output here. For now, just give "group" as the Enigmail folks need
|
|
|
|
it, and pubkey, cipher, hash, and compress as they may be useful
|
|
|
|
for frontends. */
|
|
|
|
static void
|
|
|
|
list_config(char *items)
|
|
|
|
{
|
2015-03-10 15:26:02 +01:00
|
|
|
int show_all = !items;
|
|
|
|
char *name = NULL;
|
|
|
|
const char *s;
|
|
|
|
struct groupitem *giter;
|
|
|
|
int first, iter;
|
2006-04-19 11:26:11 +00:00
|
|
|
|
|
|
|
if(!opt.with_colons)
|
|
|
|
return;
|
|
|
|
|
|
|
|
while(show_all || (name=strsep(&items," ")))
|
|
|
|
{
|
|
|
|
int any=0;
|
|
|
|
|
|
|
|
if(show_all || ascii_strcasecmp(name,"group")==0)
|
|
|
|
{
|
2015-03-10 15:26:02 +01:00
|
|
|
for (giter = opt.grouplist; giter; giter = giter->next)
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2006-10-02 11:54:35 +00:00
|
|
|
strlist_t sl;
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2010-03-15 11:15:45 +00:00
|
|
|
es_fprintf (es_stdout, "cfg:group:");
|
2015-03-10 15:26:02 +01:00
|
|
|
es_write_sanitized (es_stdout, giter->name, strlen(giter->name),
|
2010-03-15 11:15:45 +00:00
|
|
|
":", NULL);
|
|
|
|
es_putc (':', es_stdout);
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2015-03-10 15:26:02 +01:00
|
|
|
for(sl=giter->values; sl; sl=sl->next)
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2015-01-28 20:12:21 +01:00
|
|
|
es_write_sanitized (es_stdout, sl->d, strlen (sl->d),
|
|
|
|
":;", NULL);
|
2006-04-19 11:26:11 +00:00
|
|
|
if(sl->next)
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf(";");
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf("\n");
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(show_all || ascii_strcasecmp(name,"version")==0)
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf("cfg:version:");
|
2010-03-15 11:15:45 +00:00
|
|
|
es_write_sanitized (es_stdout, VERSION, strlen(VERSION), ":", NULL);
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n");
|
2006-04-19 11:26:11 +00:00
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(show_all || ascii_strcasecmp(name,"pubkey")==0)
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("cfg:pubkey:");
|
2014-01-31 15:55:04 +01:00
|
|
|
print_algo_numbers (build_list_pk_test_algo);
|
|
|
|
es_printf ("\n");
|
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(show_all || ascii_strcasecmp(name,"pubkeyname")==0)
|
|
|
|
{
|
|
|
|
es_printf ("cfg:pubkeyname:");
|
|
|
|
print_algo_names (build_list_pk_test_algo,
|
|
|
|
build_list_pk_algo_name);
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n");
|
2006-04-19 11:26:11 +00:00
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(show_all || ascii_strcasecmp(name,"cipher")==0)
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("cfg:cipher:");
|
2014-01-31 15:55:04 +01:00
|
|
|
print_algo_numbers (build_list_cipher_test_algo);
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n");
|
2006-04-19 11:26:11 +00:00
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
2007-12-12 10:28:30 +00:00
|
|
|
if (show_all || !ascii_strcasecmp (name,"ciphername"))
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("cfg:ciphername:");
|
2014-01-31 15:55:04 +01:00
|
|
|
print_algo_names (build_list_cipher_test_algo,
|
|
|
|
build_list_cipher_algo_name);
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n");
|
2007-12-12 10:28:30 +00:00
|
|
|
any = 1;
|
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if(show_all
|
|
|
|
|| ascii_strcasecmp(name,"digest")==0
|
|
|
|
|| ascii_strcasecmp(name,"hash")==0)
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("cfg:digest:");
|
2014-01-31 15:55:04 +01:00
|
|
|
print_algo_numbers (build_list_md_test_algo);
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n");
|
2006-04-19 11:26:11 +00:00
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
2007-12-12 10:28:30 +00:00
|
|
|
if (show_all
|
|
|
|
|| !ascii_strcasecmp(name,"digestname")
|
|
|
|
|| !ascii_strcasecmp(name,"hashname"))
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("cfg:digestname:");
|
2014-01-31 15:55:04 +01:00
|
|
|
print_algo_names (build_list_md_test_algo,
|
|
|
|
build_list_md_algo_name);
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n");
|
2007-12-12 10:28:30 +00:00
|
|
|
any=1;
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if(show_all || ascii_strcasecmp(name,"compress")==0)
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("cfg:compress:");
|
2006-04-19 11:26:11 +00:00
|
|
|
print_algo_numbers(check_compress_algo);
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n");
|
2006-04-19 11:26:11 +00:00
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
2016-12-09 11:46:49 +01:00
|
|
|
if(show_all || ascii_strcasecmp (name, "compressname") == 0)
|
|
|
|
{
|
|
|
|
es_printf ("cfg:compressname:");
|
|
|
|
print_algo_names (check_compress_algo,
|
|
|
|
compress_algo_to_string);
|
|
|
|
es_printf ("\n");
|
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
2015-03-10 15:26:02 +01:00
|
|
|
if (show_all || !ascii_strcasecmp(name,"ccid-reader-id"))
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2015-03-10 15:26:02 +01:00
|
|
|
/* We ignore this for GnuPG 1.4 backward compatibility. */
|
|
|
|
any=1;
|
|
|
|
}
|
2006-08-16 10:47:53 +00:00
|
|
|
|
2015-03-10 15:26:02 +01:00
|
|
|
if (show_all || !ascii_strcasecmp (name,"curve"))
|
|
|
|
{
|
|
|
|
es_printf ("cfg:curve:");
|
|
|
|
for (iter=0, first=1; (s = openpgp_enum_curves (&iter)); first=0)
|
|
|
|
es_printf ("%s%s", first?"":";", s);
|
|
|
|
es_printf ("\n");
|
|
|
|
any=1;
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2015-03-10 15:26:02 +01:00
|
|
|
/* Curve OIDs are rarely useful and thus only printed if requested. */
|
|
|
|
if (name && !ascii_strcasecmp (name,"curveoid"))
|
|
|
|
{
|
|
|
|
es_printf ("cfg:curveoid:");
|
|
|
|
for (iter=0, first=1; (s = openpgp_enum_curves (&iter)); first = 0)
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2020-02-11 14:38:03 +01:00
|
|
|
s = openpgp_curve_to_oid (s, NULL, NULL);
|
2015-03-10 15:26:02 +01:00
|
|
|
es_printf ("%s%s", first?"":";", s? s:"[?]");
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
2015-03-10 15:26:02 +01:00
|
|
|
es_printf ("\n");
|
2006-04-19 11:26:11 +00:00
|
|
|
any=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(show_all)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if(!any)
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("unknown configuration item '%s'\n"),name);
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-03-14 18:53:43 +01:00
|
|
|
/* List default values for use by gpgconf. */
|
2006-04-19 11:26:11 +00:00
|
|
|
static void
|
2020-03-14 18:53:43 +01:00
|
|
|
gpgconf_list (void)
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
|
2016-12-16 16:02:02 +01:00
|
|
|
es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg");
|
2007-06-18 20:15:01 +00:00
|
|
|
|
2009-12-04 19:47:54 +00:00
|
|
|
/* The next one is an info only item and should match the macros at
|
|
|
|
the top of keygen.c */
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("default_pubkey_algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT,
|
2016-12-12 10:50:21 +01:00
|
|
|
get_default_pubkey_algo ());
|
2021-04-01 13:11:16 +02:00
|
|
|
/* This info only mode tells whether the we are running in de-vs
|
|
|
|
* compliance mode. This does not test all parameters but the basic
|
|
|
|
* conditions like a proper RNG and Libgcrypt. AS of now we always
|
|
|
|
* return 0 because this version of gnupg has not yet received an
|
|
|
|
* appoval. */
|
|
|
|
es_printf ("compliance_de_vs:%lu:%d:\n", GC_OPT_FLAG_DEFAULT,
|
|
|
|
0 /*gnupg_rng_is_compliant (CO_DE_VS)*/);
|
|
|
|
|
2021-04-19 11:33:19 +02:00
|
|
|
es_printf ("use_keyboxd:%lu:%d:\n", GC_OPT_FLAG_DEFAULT, opt.use_keyboxd);
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
parse_subpacket_list(char *list)
|
|
|
|
{
|
|
|
|
char *tok;
|
|
|
|
byte subpackets[128],i;
|
|
|
|
int count=0;
|
|
|
|
|
|
|
|
if(!list)
|
|
|
|
{
|
|
|
|
/* No arguments means all subpackets */
|
|
|
|
memset(subpackets+1,1,sizeof(subpackets)-1);
|
|
|
|
count=127;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memset(subpackets,0,sizeof(subpackets));
|
|
|
|
|
|
|
|
/* Merge with earlier copy */
|
|
|
|
if(opt.show_subpackets)
|
|
|
|
{
|
|
|
|
byte *in;
|
|
|
|
|
|
|
|
for(in=opt.show_subpackets;*in;in++)
|
|
|
|
{
|
|
|
|
if(*in>127 || *in<1)
|
|
|
|
BUG();
|
|
|
|
|
|
|
|
if(!subpackets[*in])
|
|
|
|
count++;
|
|
|
|
subpackets[*in]=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while((tok=strsep(&list," ,")))
|
|
|
|
{
|
|
|
|
if(!*tok)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
i=atoi(tok);
|
|
|
|
if(i>127 || i<1)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if(!subpackets[i])
|
|
|
|
count++;
|
|
|
|
subpackets[i]=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
xfree(opt.show_subpackets);
|
|
|
|
opt.show_subpackets=xmalloc(count+1);
|
|
|
|
opt.show_subpackets[count--]=0;
|
|
|
|
|
|
|
|
for(i=1;i<128 && count>=0;i++)
|
|
|
|
if(subpackets[i])
|
|
|
|
opt.show_subpackets[count--]=i;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
parse_list_options(char *str)
|
|
|
|
{
|
|
|
|
char *subpackets=""; /* something that isn't NULL */
|
|
|
|
struct parse_options lopts[]=
|
|
|
|
{
|
|
|
|
{"show-photos",LIST_SHOW_PHOTOS,NULL,
|
|
|
|
N_("display photo IDs during key listings")},
|
2014-08-12 10:36:30 +02:00
|
|
|
{"show-usage",LIST_SHOW_USAGE,NULL,
|
|
|
|
N_("show key usage information during key listings")},
|
2006-04-19 11:26:11 +00:00
|
|
|
{"show-policy-urls",LIST_SHOW_POLICY_URLS,NULL,
|
|
|
|
N_("show policy URLs during signature listings")},
|
|
|
|
{"show-notations",LIST_SHOW_NOTATIONS,NULL,
|
|
|
|
N_("show all notations during signature listings")},
|
|
|
|
{"show-std-notations",LIST_SHOW_STD_NOTATIONS,NULL,
|
|
|
|
N_("show IETF standard notations during signature listings")},
|
|
|
|
{"show-standard-notations",LIST_SHOW_STD_NOTATIONS,NULL,
|
|
|
|
NULL},
|
|
|
|
{"show-user-notations",LIST_SHOW_USER_NOTATIONS,NULL,
|
|
|
|
N_("show user-supplied notations during signature listings")},
|
|
|
|
{"show-keyserver-urls",LIST_SHOW_KEYSERVER_URLS,NULL,
|
|
|
|
N_("show preferred keyserver URLs during signature listings")},
|
|
|
|
{"show-uid-validity",LIST_SHOW_UID_VALIDITY,NULL,
|
|
|
|
N_("show user ID validity during key listings")},
|
|
|
|
{"show-unusable-uids",LIST_SHOW_UNUSABLE_UIDS,NULL,
|
|
|
|
N_("show revoked and expired user IDs in key listings")},
|
|
|
|
{"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS,NULL,
|
|
|
|
N_("show revoked and expired subkeys in key listings")},
|
|
|
|
{"show-keyring",LIST_SHOW_KEYRING,NULL,
|
|
|
|
N_("show the keyring name in key listings")},
|
|
|
|
{"show-sig-expire",LIST_SHOW_SIG_EXPIRE,NULL,
|
|
|
|
N_("show expiration dates during signature listings")},
|
|
|
|
{"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL,
|
|
|
|
NULL},
|
2018-12-04 12:32:28 +01:00
|
|
|
{"show-only-fpr-mbox",LIST_SHOW_ONLY_FPR_MBOX, NULL,
|
|
|
|
NULL},
|
2020-10-27 17:10:48 +01:00
|
|
|
{"sort-sigs", LIST_SORT_SIGS, NULL,
|
|
|
|
NULL},
|
2006-04-19 11:26:11 +00:00
|
|
|
{NULL,0,NULL,NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
/* C99 allows for non-constant initializers, but we'd like to
|
|
|
|
compile everywhere, so fill in the show-sig-subpackets argument
|
|
|
|
here. Note that if the parse_options array changes, we'll have
|
|
|
|
to change the subscript here. */
|
2015-06-30 11:01:16 +02:00
|
|
|
lopts[13].value=&subpackets;
|
2006-04-19 11:26:11 +00:00
|
|
|
|
|
|
|
if(parse_options(str,&opt.list_options,lopts,1))
|
|
|
|
{
|
|
|
|
if(opt.list_options&LIST_SHOW_SIG_SUBPACKETS)
|
|
|
|
{
|
|
|
|
/* Unset so users can pass multiple lists in. */
|
|
|
|
opt.list_options&=~LIST_SHOW_SIG_SUBPACKETS;
|
|
|
|
if(!parse_subpacket_list(subpackets))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if(subpackets==NULL && opt.show_subpackets)
|
|
|
|
{
|
|
|
|
/* User did 'no-show-subpackets' */
|
|
|
|
xfree(opt.show_subpackets);
|
|
|
|
opt.show_subpackets=NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Collapses argc/argv into a single string that must be freed */
|
|
|
|
static char *
|
|
|
|
collapse_args(int argc,char *argv[])
|
|
|
|
{
|
|
|
|
char *str=NULL;
|
|
|
|
int i,first=1,len=0;
|
|
|
|
|
|
|
|
for(i=0;i<argc;i++)
|
|
|
|
{
|
|
|
|
len+=strlen(argv[i])+2;
|
|
|
|
str=xrealloc(str,len);
|
|
|
|
if(first)
|
|
|
|
{
|
|
|
|
str[0]='\0';
|
|
|
|
first=0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
strcat(str," ");
|
|
|
|
|
|
|
|
strcat(str,argv[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
|
|
|
|
#ifndef NO_TRUST_MODELS
|
2006-04-19 11:26:11 +00:00
|
|
|
static void
|
|
|
|
parse_trust_model(const char *model)
|
|
|
|
{
|
|
|
|
if(ascii_strcasecmp(model,"pgp")==0)
|
|
|
|
opt.trust_model=TM_PGP;
|
|
|
|
else if(ascii_strcasecmp(model,"classic")==0)
|
|
|
|
opt.trust_model=TM_CLASSIC;
|
|
|
|
else if(ascii_strcasecmp(model,"always")==0)
|
|
|
|
opt.trust_model=TM_ALWAYS;
|
|
|
|
else if(ascii_strcasecmp(model,"direct")==0)
|
|
|
|
opt.trust_model=TM_DIRECT;
|
2015-10-20 17:32:23 +02:00
|
|
|
#ifdef USE_TOFU
|
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
|
|
|
else if(ascii_strcasecmp(model,"tofu")==0)
|
|
|
|
opt.trust_model=TM_TOFU;
|
|
|
|
else if(ascii_strcasecmp(model,"tofu+pgp")==0)
|
|
|
|
opt.trust_model=TM_TOFU_PGP;
|
2015-10-20 17:32:23 +02:00
|
|
|
#endif /*USE_TOFU*/
|
2006-04-19 11:26:11 +00:00
|
|
|
else if(ascii_strcasecmp(model,"auto")==0)
|
|
|
|
opt.trust_model=TM_AUTO;
|
|
|
|
else
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error("unknown trust model '%s'\n",model);
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#endif /*NO_TRUST_MODELS*/
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2015-12-03 16:19:35 +01:00
|
|
|
|
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
|
|
|
static int
|
2015-12-03 16:19:35 +01:00
|
|
|
parse_tofu_policy (const char *policystr)
|
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
|
|
|
{
|
2015-10-20 17:32:23 +02:00
|
|
|
#ifdef USE_TOFU
|
2015-12-03 16:19:35 +01:00
|
|
|
struct { const char *keyword; int policy; } list[] = {
|
|
|
|
{ "auto", TOFU_POLICY_AUTO },
|
|
|
|
{ "good", TOFU_POLICY_GOOD },
|
|
|
|
{ "unknown", TOFU_POLICY_UNKNOWN },
|
|
|
|
{ "bad", TOFU_POLICY_BAD },
|
|
|
|
{ "ask", TOFU_POLICY_ASK }
|
|
|
|
};
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!ascii_strcasecmp (policystr, "help"))
|
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-11-15 13:03:29 +01:00
|
|
|
log_info (_("valid values for option '%s':\n"), "--tofu-policy");
|
2015-12-03 16:19:35 +01:00
|
|
|
for (i=0; i < DIM (list); i++)
|
|
|
|
log_info (" %s\n", list[i].keyword);
|
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
|
|
|
g10_exit (1);
|
|
|
|
}
|
2015-12-03 16:19:35 +01:00
|
|
|
|
|
|
|
for (i=0; i < DIM (list); i++)
|
|
|
|
if (!ascii_strcasecmp (policystr, list[i].keyword))
|
|
|
|
return list[i].policy;
|
|
|
|
#endif /*USE_TOFU*/
|
|
|
|
|
|
|
|
log_error (_("unknown TOFU policy '%s'\n"), policystr);
|
|
|
|
if (!opt.quiet)
|
|
|
|
log_info (_("(use \"help\" to list choices)\n"));
|
|
|
|
g10_exit (1);
|
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-11-15 13:03:29 +01:00
|
|
|
|
2017-06-07 11:50:54 +02:00
|
|
|
static struct gnupg_compliance_option compliance_options[] =
|
|
|
|
{
|
2016-11-15 13:03:29 +01:00
|
|
|
{ "gnupg", oGnuPG },
|
|
|
|
{ "openpgp", oOpenPGP },
|
|
|
|
{ "rfc4880bis", oRFC4880bis },
|
|
|
|
{ "rfc4880", oRFC4880 },
|
|
|
|
{ "rfc2440", oRFC2440 },
|
2018-05-29 13:01:12 +02:00
|
|
|
{ "pgp6", oPGP7 },
|
2016-11-15 13:03:29 +01:00
|
|
|
{ "pgp7", oPGP7 },
|
2016-11-15 17:50:03 +01:00
|
|
|
{ "pgp8", oPGP8 },
|
|
|
|
{ "de-vs", oDE_VS }
|
2016-11-15 13:03:29 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2017-04-28 10:06:33 +09:00
|
|
|
/* Helper to set compliance related options. This is a separate
|
2016-11-15 13:03:29 +01:00
|
|
|
* function so that it can also be used by the --compliance option
|
|
|
|
* parser. */
|
|
|
|
static void
|
|
|
|
set_compliance_option (enum cmd_and_opt_values option)
|
|
|
|
{
|
2020-02-10 00:33:51 +01:00
|
|
|
opt.flags.rfc4880bis = 0; /* Clear because it is initially set. */
|
2019-03-14 11:23:56 +01:00
|
|
|
|
2016-11-15 13:03:29 +01:00
|
|
|
switch (option)
|
|
|
|
{
|
|
|
|
case oRFC4880bis:
|
|
|
|
opt.flags.rfc4880bis = 1;
|
2021-02-10 14:31:34 +01:00
|
|
|
opt.compliance = CO_RFC4880;
|
|
|
|
opt.flags.dsa2 = 1;
|
|
|
|
opt.flags.require_cross_cert = 1;
|
|
|
|
opt.rfc2440_text = 0;
|
|
|
|
opt.allow_non_selfsigned_uid = 1;
|
|
|
|
opt.allow_freeform_uid = 1;
|
|
|
|
opt.escape_from = 1;
|
|
|
|
opt.not_dash_escaped = 0;
|
|
|
|
opt.def_cipher_algo = 0;
|
|
|
|
opt.def_aead_algo = 0;
|
|
|
|
opt.def_digest_algo = 0;
|
|
|
|
opt.cert_digest_algo = 0;
|
|
|
|
opt.compress_algo = -1;
|
|
|
|
opt.s2k_mode = 3; /* iterated+salted */
|
|
|
|
opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
|
|
|
|
opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
|
|
|
|
break;
|
2016-11-15 13:03:29 +01:00
|
|
|
case oOpenPGP:
|
|
|
|
case oRFC4880:
|
|
|
|
/* This is effectively the same as RFC2440, but with
|
|
|
|
"--enable-dsa2 --no-rfc2440-text --escape-from-lines
|
|
|
|
--require-cross-certification". */
|
|
|
|
opt.compliance = CO_RFC4880;
|
|
|
|
opt.flags.dsa2 = 1;
|
|
|
|
opt.flags.require_cross_cert = 1;
|
|
|
|
opt.rfc2440_text = 0;
|
|
|
|
opt.allow_non_selfsigned_uid = 1;
|
|
|
|
opt.allow_freeform_uid = 1;
|
|
|
|
opt.escape_from = 1;
|
|
|
|
opt.not_dash_escaped = 0;
|
|
|
|
opt.def_cipher_algo = 0;
|
2018-01-10 11:42:38 +01:00
|
|
|
opt.def_aead_algo = 0;
|
2016-11-15 13:03:29 +01:00
|
|
|
opt.def_digest_algo = 0;
|
|
|
|
opt.cert_digest_algo = 0;
|
|
|
|
opt.compress_algo = -1;
|
|
|
|
opt.s2k_mode = 3; /* iterated+salted */
|
|
|
|
opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
|
|
|
|
opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
|
2021-02-10 14:31:34 +01:00
|
|
|
opt.flags.allow_old_cipher_algos = 1;
|
2016-11-15 13:03:29 +01:00
|
|
|
break;
|
|
|
|
case oRFC2440:
|
|
|
|
opt.compliance = CO_RFC2440;
|
|
|
|
opt.flags.dsa2 = 0;
|
|
|
|
opt.rfc2440_text = 1;
|
|
|
|
opt.allow_non_selfsigned_uid = 1;
|
|
|
|
opt.allow_freeform_uid = 1;
|
|
|
|
opt.escape_from = 0;
|
|
|
|
opt.not_dash_escaped = 0;
|
|
|
|
opt.def_cipher_algo = 0;
|
2018-01-10 11:42:38 +01:00
|
|
|
opt.def_aead_algo = 0;
|
2016-11-15 13:03:29 +01:00
|
|
|
opt.def_digest_algo = 0;
|
|
|
|
opt.cert_digest_algo = 0;
|
|
|
|
opt.compress_algo = -1;
|
|
|
|
opt.s2k_mode = 3; /* iterated+salted */
|
|
|
|
opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
|
|
|
|
opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
|
2021-02-10 14:31:34 +01:00
|
|
|
opt.flags.allow_old_cipher_algos = 1;
|
2016-11-15 13:03:29 +01:00
|
|
|
break;
|
|
|
|
case oPGP7: opt.compliance = CO_PGP7; break;
|
|
|
|
case oPGP8: opt.compliance = CO_PGP8; break;
|
2019-03-14 11:23:56 +01:00
|
|
|
case oGnuPG:
|
|
|
|
opt.compliance = CO_GNUPG;
|
|
|
|
opt.flags.rfc4880bis = 1;
|
|
|
|
break;
|
2016-11-15 17:50:03 +01:00
|
|
|
|
|
|
|
case oDE_VS:
|
|
|
|
set_compliance_option (oOpenPGP);
|
|
|
|
opt.compliance = CO_DE_VS;
|
2018-01-10 11:42:38 +01:00
|
|
|
opt.def_aead_algo = 0;
|
2020-11-03 13:55:25 +01:00
|
|
|
/* We divert here from the backward compatible rfc4880 algos. */
|
|
|
|
opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
|
|
|
|
opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
|
2016-11-15 17:50:03 +01:00
|
|
|
break;
|
|
|
|
|
2016-11-15 13:03:29 +01:00
|
|
|
default:
|
|
|
|
BUG ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-11-16 12:41:46 +01:00
|
|
|
/* This function called to initialized a new control object. It is
|
2006-12-21 19:40:00 +00:00
|
|
|
assumed that this object has been zeroed out before calling this
|
|
|
|
function. */
|
|
|
|
static void
|
|
|
|
gpg_init_default_ctrl (ctrl_t ctrl)
|
|
|
|
{
|
2017-03-31 20:06:54 +02:00
|
|
|
ctrl->magic = SERVER_CONTROL_MAGIC;
|
2006-12-21 19:40:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* This function is called to deinitialize a control object. It is
|
|
|
|
not deallocated. */
|
|
|
|
static void
|
|
|
|
gpg_deinit_default_ctrl (ctrl_t ctrl)
|
|
|
|
{
|
2016-05-24 13:01:27 +02:00
|
|
|
#ifdef USE_TOFU
|
2016-05-21 12:26:44 +02:00
|
|
|
tofu_closedbs (ctrl);
|
2016-05-24 13:01:27 +02:00
|
|
|
#endif
|
2011-01-10 14:30:17 +01:00
|
|
|
gpg_dirmngr_deinit_session_data (ctrl);
|
2017-03-31 20:44:05 +02:00
|
|
|
|
|
|
|
keydb_release (ctrl->cached_getkey_kdb);
|
2019-09-10 16:05:54 +02:00
|
|
|
gpg_keyboxd_deinit_session_data (ctrl);
|
2006-12-21 19:40:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
int
|
2008-02-09 00:05:55 +00:00
|
|
|
main (int argc, char **argv)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2020-02-20 10:03:11 +01:00
|
|
|
gpgrt_argparse_t pargs;
|
2006-04-19 11:26:11 +00:00
|
|
|
IOBUF a;
|
2003-06-05 07:14:21 +00:00
|
|
|
int rc=0;
|
|
|
|
int orig_argc;
|
|
|
|
char **orig_argv;
|
|
|
|
const char *fname;
|
|
|
|
char *username;
|
|
|
|
int may_coredump;
|
2015-12-04 08:56:02 +01:00
|
|
|
strlist_t sl;
|
|
|
|
strlist_t remusr = NULL;
|
|
|
|
strlist_t locusr = NULL;
|
2010-04-23 11:36:59 +00:00
|
|
|
strlist_t nrings = NULL;
|
2006-12-06 10:16:50 +00:00
|
|
|
armor_filter_context_t *afx = NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
int detached_sig = 0;
|
2020-02-20 10:03:11 +01:00
|
|
|
char *last_configname = NULL;
|
|
|
|
const char *configname = NULL; /* NULL or points to last_configname.
|
|
|
|
* NULL also indicates that we are
|
|
|
|
* processing options from the cmdline. */
|
|
|
|
int debug_argparser = 0;
|
2003-06-05 07:14:21 +00:00
|
|
|
int default_keyring = 1;
|
|
|
|
int greeting = 0;
|
|
|
|
int nogreeting = 0;
|
2004-03-23 13:03:09 +00:00
|
|
|
char *logfile = NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
int use_random_seed = 1;
|
|
|
|
enum cmd_and_opt_values cmd = 0;
|
2004-03-23 13:03:09 +00:00
|
|
|
const char *debug_level = NULL;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#ifndef NO_TRUST_MODELS
|
2003-06-05 07:14:21 +00:00
|
|
|
const char *trustdb_name = NULL;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#endif /*!NO_TRUST_MODELS*/
|
2003-06-05 07:14:21 +00:00
|
|
|
char *def_cipher_string = NULL;
|
2018-01-10 11:42:38 +01:00
|
|
|
char *def_aead_string = NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
char *def_digest_string = NULL;
|
2006-04-19 11:26:11 +00:00
|
|
|
char *compress_algo_string = NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
char *cert_digest_string = NULL;
|
|
|
|
char *s2k_cipher_string = NULL;
|
|
|
|
char *s2k_digest_string = NULL;
|
|
|
|
char *pers_cipher_list = NULL;
|
2018-01-10 11:42:38 +01:00
|
|
|
char *pers_aead_list = NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
char *pers_digest_list = NULL;
|
|
|
|
char *pers_compress_list = NULL;
|
|
|
|
int eyes_only=0;
|
2003-09-23 17:48:33 +00:00
|
|
|
int multifile=0;
|
2003-06-05 07:14:21 +00:00
|
|
|
int pwfd = -1;
|
2016-11-16 09:02:53 +01:00
|
|
|
int ovrseskeyfd = -1;
|
2009-05-20 10:23:33 +00:00
|
|
|
int fpr_maybe_cmd = 0; /* --fingerprint maybe a command. */
|
2003-06-05 07:14:21 +00:00
|
|
|
int any_explicit_recipient = 0;
|
2017-08-04 21:58:46 +02:00
|
|
|
int default_akl = 1;
|
2016-07-14 15:19:36 +02:00
|
|
|
int require_secmem = 0;
|
|
|
|
int got_secmem = 0;
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
struct assuan_malloc_hooks malloc_hooks;
|
2010-08-31 15:58:39 +00:00
|
|
|
ctrl_t ctrl;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2016-07-14 15:19:36 +02:00
|
|
|
static int print_dane_records;
|
2018-07-24 09:50:02 +02:00
|
|
|
static int allow_large_chunks;
|
2020-08-14 12:19:11 +02:00
|
|
|
static const char *homedirvalue;
|
|
|
|
static const char *changeuser;
|
2016-07-14 15:19:36 +02:00
|
|
|
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
#ifdef __riscos__
|
|
|
|
opt.lock_once = 1;
|
|
|
|
#endif /* __riscos__ */
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/* Please note that we may running SUID(ROOT), so be very CAREFUL
|
|
|
|
when adding any stuff between here and the call to
|
|
|
|
secmem_init() somewhere after the option parsing. */
|
2015-01-28 19:57:22 +01:00
|
|
|
early_system_init ();
|
2013-11-18 14:09:47 +01:00
|
|
|
gnupg_reopen_std (GPG_NAME);
|
2006-09-21 13:30:45 +00:00
|
|
|
trap_unaligned ();
|
|
|
|
gnupg_rl_initialize ();
|
2020-02-20 10:03:11 +01:00
|
|
|
gpgrt_set_strusage (my_strusage);
|
2003-06-18 19:56:13 +00:00
|
|
|
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
|
Call log_set_prefix() with human-readable labels.
* agent/preset-passphrase.c, agent/protect-tool.c, dirmngr/dirmngr.c
* dirmngr/t-http.c, g10/gpg.c, g10/gpgv.c, g13/g13-syshelp.c
* g13/g13.c, kbx/kbxutil.c, scd/scdaemon.c, sm/gpgsm.c
* tests/gpgscm/main.c, tools/gpg-check-pattern.c
* tools/gpg-connect-agent.c, tools/gpgconf.c, tools/gpgtar.c
* tools/symcryptrun.c: Invoke log_set_prefix() with
human-readable labels.
--
Some invocations of log_set_prefix() were done with raw numeric values
instead of values that humans can understand. Use symbolic
representations instead of numeric for better readability.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2016-08-12 01:37:57 -04:00
|
|
|
log_set_prefix (GPG_NAME, GPGRT_LOG_WITH_PREFIX);
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2007-06-14 17:05:07 +00:00
|
|
|
/* Make sure that our subsystems are ready. */
|
2008-12-09 08:58:02 +00:00
|
|
|
i18n_init();
|
2010-03-22 12:46:05 +00:00
|
|
|
init_common_subsystems (&argc, &argv);
|
2007-06-14 17:05:07 +00:00
|
|
|
|
2011-02-02 15:48:54 +01:00
|
|
|
/* Use our own logging handler for Libcgrypt. */
|
|
|
|
setup_libgcrypt_logging ();
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/* Put random number into secure memory */
|
2003-06-18 19:56:13 +00:00
|
|
|
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
may_coredump = disable_core_dumps();
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2003-06-27 20:53:09 +00:00
|
|
|
gnupg_init_signals (0, emergency_cleanup);
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2011-09-28 15:41:58 +02:00
|
|
|
dotlock_create (NULL, 0); /* Register lock file cleanup. */
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2017-06-07 15:38:50 +02:00
|
|
|
/* Tell the compliance module who we are. */
|
|
|
|
gnupg_initialize_compliance (GNUPG_MODULE_NAME_GPG);
|
|
|
|
|
2014-11-28 09:44:19 +01:00
|
|
|
opt.autostart = 1;
|
2009-07-07 10:02:41 +00:00
|
|
|
opt.session_env = session_env_new ();
|
|
|
|
if (!opt.session_env)
|
|
|
|
log_fatal ("error allocating session environment block: %s\n",
|
|
|
|
strerror (errno));
|
2003-06-18 19:56:13 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
opt.command_fd = -1; /* no command fd */
|
2006-04-19 11:26:11 +00:00
|
|
|
opt.compress_level = -1; /* defaults to standard compress level */
|
|
|
|
opt.bz2_compress_level = -1; /* defaults to standard compress level */
|
2003-06-05 07:14:21 +00:00
|
|
|
/* note: if you change these lines, look at oOpenPGP */
|
|
|
|
opt.def_cipher_algo = 0;
|
2018-01-10 11:42:38 +01:00
|
|
|
opt.def_aead_algo = 0;
|
2003-06-05 07:14:21 +00:00
|
|
|
opt.def_digest_algo = 0;
|
|
|
|
opt.cert_digest_algo = 0;
|
2006-04-19 11:26:11 +00:00
|
|
|
opt.compress_algo = -1; /* defaults to DEFAULT_COMPRESS_ALGO */
|
2003-06-05 07:14:21 +00:00
|
|
|
opt.s2k_mode = 3; /* iterated+salted */
|
2010-01-08 19:18:49 +00:00
|
|
|
opt.s2k_count = 0; /* Auto-calibrate when needed. */
|
2014-08-18 11:45:00 +02:00
|
|
|
opt.s2k_cipher_algo = DEFAULT_CIPHER_ALGO;
|
2003-06-05 07:14:21 +00:00
|
|
|
opt.completes_needed = 1;
|
|
|
|
opt.marginals_needed = 3;
|
|
|
|
opt.max_cert_depth = 5;
|
|
|
|
opt.escape_from = 1;
|
2007-10-25 09:06:21 +00:00
|
|
|
opt.flags.require_cross_cert = 1;
|
2020-08-25 10:33:57 +02:00
|
|
|
opt.import_options = (IMPORT_REPAIR_KEYS
|
|
|
|
| IMPORT_COLLAPSE_UIDS
|
|
|
|
| IMPORT_COLLAPSE_SUBKEYS);
|
2010-08-31 15:58:39 +00:00
|
|
|
opt.export_options = EXPORT_ATTRIBUTES;
|
2017-06-13 15:35:01 +02:00
|
|
|
opt.keyserver_options.import_options = (IMPORT_REPAIR_KEYS
|
2019-07-04 15:45:39 +02:00
|
|
|
| IMPORT_REPAIR_PKS_SUBKEY_BUG
|
|
|
|
| IMPORT_SELF_SIGS_ONLY
|
2020-08-25 10:33:57 +02:00
|
|
|
| IMPORT_COLLAPSE_UIDS
|
|
|
|
| IMPORT_COLLAPSE_SUBKEYS
|
2019-07-04 15:45:39 +02:00
|
|
|
| IMPORT_CLEAN);
|
2010-08-31 15:58:39 +00:00
|
|
|
opt.keyserver_options.export_options = EXPORT_ATTRIBUTES;
|
2021-02-02 19:53:21 +01:00
|
|
|
opt.keyserver_options.options = 0;
|
2014-06-24 09:53:46 +02:00
|
|
|
opt.verify_options = (LIST_SHOW_UID_VALIDITY
|
|
|
|
| VERIFY_SHOW_POLICY_URLS
|
2010-08-31 15:58:39 +00:00
|
|
|
| VERIFY_SHOW_STD_NOTATIONS
|
|
|
|
| VERIFY_SHOW_KEYSERVER_URLS);
|
2016-01-14 12:22:33 +01:00
|
|
|
opt.list_options = (LIST_SHOW_UID_VALIDITY
|
2020-10-27 17:10:48 +01:00
|
|
|
| LIST_SORT_SIGS
|
2016-01-14 12:22:33 +01:00
|
|
|
| LIST_SHOW_USAGE);
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#ifdef NO_TRUST_MODELS
|
|
|
|
opt.trust_model = TM_ALWAYS;
|
|
|
|
#else
|
2010-08-31 15:58:39 +00:00
|
|
|
opt.trust_model = TM_AUTO;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#endif
|
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
|
|
|
opt.tofu_default_policy = TOFU_POLICY_AUTO;
|
2010-08-31 15:58:39 +00:00
|
|
|
opt.mangle_dos_filenames = 0;
|
|
|
|
opt.min_cert_level = 2;
|
|
|
|
set_screen_dimensions ();
|
2016-06-06 17:03:47 +02:00
|
|
|
opt.keyid_format = KF_NONE;
|
2010-08-31 15:58:39 +00:00
|
|
|
opt.def_sig_expire = "0";
|
|
|
|
opt.def_cert_expire = "0";
|
|
|
|
opt.passphrase_repeat = 1;
|
2016-08-04 16:58:13 -04:00
|
|
|
opt.emit_version = 0;
|
2015-10-23 17:46:57 -04:00
|
|
|
opt.weak_digests = NULL;
|
2019-03-14 11:23:56 +01:00
|
|
|
opt.compliance = CO_GNUPG;
|
|
|
|
opt.flags.rfc4880bis = 1;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2020-02-20 10:03:11 +01:00
|
|
|
/* Check special options given on the command line. */
|
2003-06-05 07:14:21 +00:00
|
|
|
orig_argc = argc;
|
|
|
|
orig_argv = argv;
|
|
|
|
pargs.argc = &argc;
|
|
|
|
pargs.argv = &argv;
|
2012-03-27 12:35:13 +02:00
|
|
|
pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
|
2020-02-20 10:03:11 +01:00
|
|
|
while (gpgrt_argparse (NULL, &pargs, opts))
|
|
|
|
{
|
|
|
|
switch (pargs.r_opt)
|
2007-12-14 16:08:53 +00:00
|
|
|
{
|
2020-02-20 10:03:11 +01:00
|
|
|
case oDebug:
|
|
|
|
case oDebugAll:
|
|
|
|
debug_argparser++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oDebugIOLBF:
|
|
|
|
es_setvbuf (es_stdout, NULL, _IOLBF, 0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oNoOptions:
|
|
|
|
/* Set here here because the homedir would otherwise be
|
|
|
|
* created before main option parsing starts. */
|
2007-12-14 16:08:53 +00:00
|
|
|
opt.no_homedir_creation = 1;
|
2020-02-20 10:03:11 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case oHomedir:
|
2020-08-14 12:19:11 +02:00
|
|
|
homedirvalue = pargs.r.ret_str;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oChUid:
|
|
|
|
changeuser = pargs.r.ret_str;
|
2020-02-20 10:03:11 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case oNoPermissionWarn:
|
|
|
|
opt.no_perm_warn = 1;
|
|
|
|
break;
|
2007-12-14 16:08:53 +00:00
|
|
|
}
|
2020-02-20 10:03:11 +01:00
|
|
|
}
|
|
|
|
/* Reset the flags. */
|
|
|
|
pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
2020-02-20 10:03:11 +01:00
|
|
|
/* FIXME: Do we still need this? No: gnupg_homedir calls
|
|
|
|
* make_filename which changes the slashed anyway. IsDBCSLeadByte still
|
|
|
|
* needed? See bug #561. */
|
2016-06-08 15:14:06 +02:00
|
|
|
if ( strchr (gnupg_homedir (), '\\') ) {
|
2016-06-07 10:59:46 +02:00
|
|
|
char *d, *buf = xmalloc (strlen (gnupg_homedir ())+1);
|
|
|
|
const char *s;
|
|
|
|
for (d=buf, s = gnupg_homedir (); *s; s++)
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2003-06-05 07:14:21 +00:00
|
|
|
*d++ = *s == '\\'? '/': *s;
|
2006-04-19 11:26:11 +00:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
if (s[1] && IsDBCSLeadByte (*s))
|
|
|
|
*d++ = *++s;
|
|
|
|
#endif
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
*d = 0;
|
2016-06-07 10:59:46 +02:00
|
|
|
gnupg_set_homedir (buf);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
/* Initialize the secure memory. */
|
2014-10-09 16:54:15 -04:00
|
|
|
if (!gcry_control (GCRYCTL_INIT_SECMEM, SECMEM_BUFFER_SIZE, 0))
|
2011-02-04 12:57:53 +01:00
|
|
|
got_secmem = 1;
|
2006-04-19 11:26:11 +00:00
|
|
|
#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
|
|
|
|
/* There should be no way to get to this spot while still carrying
|
2008-07-17 19:49:51 +00:00
|
|
|
setuid privs. Just in case, bomb out if we are. */
|
|
|
|
if ( getuid () != geteuid () )
|
2008-07-17 19:40:53 +00:00
|
|
|
BUG ();
|
2006-04-19 11:26:11 +00:00
|
|
|
#endif
|
2003-06-05 07:14:21 +00:00
|
|
|
maybe_setuid = 0;
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
/* Okay, we are now working under our real uid */
|
|
|
|
|
2003-06-27 20:53:09 +00:00
|
|
|
/* malloc hooks go here ... */
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
malloc_hooks.malloc = gcry_malloc;
|
|
|
|
malloc_hooks.realloc = gcry_realloc;
|
|
|
|
malloc_hooks.free = gcry_free;
|
|
|
|
assuan_set_malloc_hooks (&malloc_hooks);
|
|
|
|
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
|
2016-09-05 10:55:10 +02:00
|
|
|
setup_libassuan_logging (&opt.debug, NULL);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2020-08-14 12:19:11 +02:00
|
|
|
/* Change UID and then set the homedir. */
|
|
|
|
if (changeuser && gnupg_chuid (changeuser, 0))
|
|
|
|
log_inc_errorcount (); /* Force later termination. */
|
|
|
|
gnupg_set_homedir (homedirvalue);
|
|
|
|
|
2017-08-04 21:58:46 +02:00
|
|
|
/* Set default options which require that malloc stuff is ready. */
|
|
|
|
additional_weak_digest ("MD5");
|
2019-08-23 13:22:15 +02:00
|
|
|
parse_auto_key_locate (DEFAULT_AKL_LIST);
|
2017-08-04 21:58:46 +02:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
argc = orig_argc;
|
|
|
|
argv = orig_argv;
|
|
|
|
pargs.argc = &argc;
|
|
|
|
pargs.argv = &argv;
|
2020-02-20 10:03:11 +01:00
|
|
|
/* We are re-using the struct, thus the reset flag. We OR the
|
|
|
|
* flags so that the internal intialized flag won't be cleared. */
|
|
|
|
pargs.flags |= (ARGPARSE_FLAG_RESET
|
|
|
|
| ARGPARSE_FLAG_KEEP
|
|
|
|
| ARGPARSE_FLAG_SYS
|
2020-02-25 15:18:55 +01:00
|
|
|
| ARGPARSE_FLAG_USER
|
|
|
|
| ARGPARSE_FLAG_USERVERS);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
/* By this point we have a homedir, and cannot change it. */
|
2016-06-07 10:59:46 +02:00
|
|
|
check_permissions (gnupg_homedir (), 0);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2020-02-20 10:03:11 +01:00
|
|
|
/* The configuraton directories for use by gpgrt_argparser. */
|
|
|
|
gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
|
|
|
|
gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
|
|
|
|
|
|
|
|
while (gpgrt_argparser (&pargs, opts, GPG_NAME EXTSEP_S "conf" ))
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2020-02-20 10:03:11 +01:00
|
|
|
switch (pargs.r_opt)
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2020-02-20 10:03:11 +01:00
|
|
|
case ARGPARSE_CONFFILE:
|
|
|
|
if (debug_argparser)
|
|
|
|
log_info (_("reading options from '%s'\n"),
|
|
|
|
pargs.r_type? pargs.r.ret_str: "[cmdline]");
|
|
|
|
if (pargs.r_type)
|
|
|
|
{
|
|
|
|
xfree (last_configname);
|
|
|
|
last_configname = xstrdup (pargs.r.ret_str);
|
|
|
|
configname = last_configname;
|
2020-02-25 12:11:57 +01:00
|
|
|
if (is_secured_filename (configname))
|
|
|
|
{
|
|
|
|
pargs.r_opt = ARGPARSE_PERMISSION_ERROR;
|
|
|
|
pargs.err = ARGPARSE_PRINT_ERROR;
|
|
|
|
}
|
|
|
|
else if (strncmp (configname, gnupg_sysconfdir (),
|
|
|
|
strlen (gnupg_sysconfdir ())))
|
|
|
|
{
|
|
|
|
/* This is not the global config file and thus we
|
|
|
|
* need to check the permissions: If the file is
|
|
|
|
* unsafe, then disable any external programs for
|
|
|
|
* keyserver calls or photo IDs. Since the
|
|
|
|
* external program to call is set in the options
|
|
|
|
* file, a unsafe options file can lead to an
|
|
|
|
* arbitrary program being run. */
|
|
|
|
if (check_permissions (configname, 1))
|
|
|
|
opt.exec_disable=1;
|
|
|
|
}
|
2020-02-20 10:03:11 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
configname = NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* case oOptions: */
|
|
|
|
/* case oNoOptions: */
|
|
|
|
/* We will never see these options here because
|
|
|
|
* gpgrt_argparse handles them for us. */
|
|
|
|
/* break */
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case aListConfig:
|
2015-03-10 15:26:02 +01:00
|
|
|
case aListGcryptConfig:
|
2006-04-19 11:26:11 +00:00
|
|
|
case aGPGConfList:
|
2006-10-23 14:02:13 +00:00
|
|
|
case aGPGConfTest:
|
2016-09-01 19:22:48 +02:00
|
|
|
set_cmd (&cmd, pargs.r_opt);
|
|
|
|
/* Do not register a keyring for these commands. */
|
|
|
|
default_keyring = -1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aCheckKeys:
|
2006-04-19 11:26:11 +00:00
|
|
|
case aListPackets:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aImport:
|
|
|
|
case aFastImport:
|
|
|
|
case aSendKeys:
|
|
|
|
case aRecvKeys:
|
2006-04-19 11:26:11 +00:00
|
|
|
case aSearchKeys:
|
|
|
|
case aRefreshKeys:
|
|
|
|
case aFetchKeys:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aExport:
|
2006-09-06 11:53:24 +00:00
|
|
|
#ifdef ENABLE_CARD_SUPPORT
|
|
|
|
case aCardStatus:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aCardEdit:
|
2006-09-06 11:53:24 +00:00
|
|
|
case aChangePIN:
|
|
|
|
#endif /* ENABLE_CARD_SUPPORT*/
|
2011-02-04 12:57:53 +01:00
|
|
|
case aListKeys:
|
2008-05-07 15:40:36 +00:00
|
|
|
case aLocateKeys:
|
2019-07-04 15:13:26 +02:00
|
|
|
case aLocateExtKeys:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aListSigs:
|
|
|
|
case aExportSecret:
|
|
|
|
case aExportSecretSub:
|
2016-01-08 17:22:32 +01:00
|
|
|
case aExportSshKey:
|
2006-10-04 16:45:04 +00:00
|
|
|
case aSym:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aClearsign:
|
|
|
|
case aGenRevoke:
|
|
|
|
case aDesigRevoke:
|
|
|
|
case aPrimegen:
|
2006-10-04 16:45:04 +00:00
|
|
|
case aGenRandom:
|
|
|
|
case aPrintMD:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aPrintMDs:
|
|
|
|
case aListTrustDB:
|
2006-10-04 16:45:04 +00:00
|
|
|
case aCheckTrustDB:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aUpdateTrustDB:
|
|
|
|
case aFixTrustDB:
|
|
|
|
case aListTrustPath:
|
|
|
|
case aDeArmor:
|
|
|
|
case aEnArmor:
|
|
|
|
case aSign:
|
2014-03-27 16:33:40 +01:00
|
|
|
case aQuickSignKey:
|
|
|
|
case aQuickLSignKey:
|
2020-10-28 17:06:27 +01:00
|
|
|
case aQuickRevSig:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aSignKey:
|
2006-10-04 16:45:04 +00:00
|
|
|
case aLSignKey:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aStore:
|
2014-07-23 15:12:43 +02:00
|
|
|
case aQuickKeygen:
|
2015-05-08 16:08:57 +02:00
|
|
|
case aQuickAddUid:
|
2016-06-02 15:54:48 +02:00
|
|
|
case aQuickAddKey:
|
2016-06-16 18:05:57 -04:00
|
|
|
case aQuickRevUid:
|
2016-12-05 10:58:39 +01:00
|
|
|
case aQuickSetExpire:
|
2017-03-21 14:47:21 +01:00
|
|
|
case aQuickSetPrimaryUid:
|
2011-02-04 12:57:53 +01:00
|
|
|
case aExportOwnerTrust:
|
|
|
|
case aImportOwnerTrust:
|
2006-10-04 16:45:04 +00:00
|
|
|
case aRebuildKeydbCaches:
|
2006-04-19 11:26:11 +00:00
|
|
|
set_cmd (&cmd, pargs.r_opt);
|
|
|
|
break;
|
2006-09-06 11:53:24 +00:00
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
case aKeygen:
|
2014-09-27 15:14:13 +02:00
|
|
|
case aFullKeygen:
|
2006-10-04 16:45:04 +00:00
|
|
|
case aEditKey:
|
2006-04-19 11:26:11 +00:00
|
|
|
case aDeleteSecretKeys:
|
2003-06-05 07:14:21 +00:00
|
|
|
case aDeleteSecretAndPublicKeys:
|
2006-10-04 16:45:04 +00:00
|
|
|
case aDeleteKeys:
|
2010-01-08 19:18:49 +00:00
|
|
|
case aPasswd:
|
2006-10-04 16:45:04 +00:00
|
|
|
set_cmd (&cmd, pargs.r_opt);
|
|
|
|
greeting=1;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
2018-06-06 11:50:58 +02:00
|
|
|
case aShowKeys:
|
|
|
|
set_cmd (&cmd, pargs.r_opt);
|
|
|
|
opt.import_options |= IMPORT_SHOW;
|
|
|
|
opt.import_options |= IMPORT_DRY_RUN;
|
|
|
|
opt.import_options &= ~IMPORT_REPAIR_KEYS;
|
2018-06-11 08:46:37 +02:00
|
|
|
opt.list_options |= LIST_SHOW_UNUSABLE_UIDS;
|
|
|
|
opt.list_options |= LIST_SHOW_UNUSABLE_SUBKEYS;
|
|
|
|
opt.list_options |= LIST_SHOW_NOTATIONS;
|
|
|
|
opt.list_options |= LIST_SHOW_POLICY_URLS;
|
2018-06-06 11:50:58 +02:00
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aDetachedSign: detached_sig = 1; set_cmd( &cmd, aSign ); break;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case aDecryptFiles: multifile=1; /* fall through */
|
2003-06-05 07:14:21 +00:00
|
|
|
case aDecrypt: set_cmd( &cmd, aDecrypt); break;
|
|
|
|
|
2003-09-23 17:48:33 +00:00
|
|
|
case aEncrFiles: multifile=1; /* fall through */
|
2003-06-05 07:14:21 +00:00
|
|
|
case aEncr: set_cmd( &cmd, aEncr); break;
|
2003-09-23 17:48:33 +00:00
|
|
|
|
|
|
|
case aVerifyFiles: multifile=1; /* fall through */
|
|
|
|
case aVerify: set_cmd( &cmd, aVerify); break;
|
|
|
|
|
2006-12-21 19:40:00 +00:00
|
|
|
case aServer:
|
|
|
|
set_cmd (&cmd, pargs.r_opt);
|
|
|
|
opt.batch = 1;
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
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
|
|
|
case aTOFUPolicy:
|
|
|
|
set_cmd (&cmd, pargs.r_opt);
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oArmor: opt.armor = 1; opt.no_armor=0; break;
|
|
|
|
case oOutput: opt.outfile = pargs.r.ret_str; break;
|
2016-08-11 21:31:12 +02:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case oMaxOutput: opt.max_output = pargs.r.ret_ulong; break;
|
2016-08-11 21:31:12 +02:00
|
|
|
|
|
|
|
case oInputSizeHint:
|
|
|
|
opt.input_size_hint = string_to_u64 (pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
|
2018-01-23 19:08:16 +01:00
|
|
|
case oChunkSize:
|
|
|
|
opt.chunk_size = pargs.r.ret_int;
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oQuiet: opt.quiet = 1; break;
|
|
|
|
case oNoTTY: tty_no_terminal(1); break;
|
|
|
|
case oDryRun: opt.dry_run = 1; break;
|
|
|
|
case oInteractive: opt.interactive = 1; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oVerbose:
|
|
|
|
opt.verbose++;
|
|
|
|
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
|
|
|
|
opt.list_options|=LIST_SHOW_UNUSABLE_UIDS;
|
|
|
|
opt.list_options|=LIST_SHOW_UNUSABLE_SUBKEYS;
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2007-01-30 20:16:28 +00:00
|
|
|
case oBatch:
|
|
|
|
opt.batch = 1;
|
|
|
|
nogreeting = 1;
|
|
|
|
break;
|
|
|
|
|
2006-10-04 16:45:04 +00:00
|
|
|
case oUseAgent: /* Dummy. */
|
2007-01-30 20:16:28 +00:00
|
|
|
break;
|
2014-09-25 22:13:03 +02:00
|
|
|
|
2007-01-30 20:16:28 +00:00
|
|
|
case oNoUseAgent:
|
2020-02-20 10:03:11 +01:00
|
|
|
obsolete_option (configname, pargs.lineno, "no-use-agent");
|
2007-01-30 20:16:28 +00:00
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
case oGpgAgentInfo:
|
2020-02-20 10:03:11 +01:00
|
|
|
obsolete_option (configname, pargs.lineno, "gpg-agent-info");
|
2007-01-30 20:16:28 +00:00
|
|
|
break;
|
2019-09-09 14:34:09 +02:00
|
|
|
|
|
|
|
case oUseKeyboxd:
|
|
|
|
opt.use_keyboxd = 1;
|
|
|
|
break;
|
|
|
|
|
2014-09-25 14:45:37 -04:00
|
|
|
case oReaderPort:
|
2020-02-20 10:03:11 +01:00
|
|
|
obsolete_scdaemon_option (configname, pargs.lineno, "reader-port");
|
2014-09-25 14:45:37 -04:00
|
|
|
break;
|
|
|
|
case octapiDriver:
|
2020-02-20 10:03:11 +01:00
|
|
|
obsolete_scdaemon_option (configname, pargs.lineno, "ctapi-driver");
|
2014-09-25 14:45:37 -04:00
|
|
|
break;
|
|
|
|
case opcscDriver:
|
2020-02-20 10:03:11 +01:00
|
|
|
obsolete_scdaemon_option (configname, pargs.lineno, "pcsc-driver");
|
2014-09-25 14:45:37 -04:00
|
|
|
break;
|
|
|
|
case oDisableCCID:
|
2020-02-20 10:03:11 +01:00
|
|
|
obsolete_scdaemon_option (configname, pargs.lineno, "disable-ccid");
|
2014-09-25 14:45:37 -04:00
|
|
|
break;
|
2014-12-08 15:14:35 +01:00
|
|
|
case oHonorHttpProxy:
|
2020-02-20 10:03:11 +01:00
|
|
|
obsolete_option (configname, pargs.lineno, "honor-http-proxy");
|
2014-12-08 15:14:35 +01:00
|
|
|
break;
|
2014-09-25 14:45:37 -04:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oAnswerYes: opt.answer_yes = 1; break;
|
|
|
|
case oAnswerNo: opt.answer_no = 1; break;
|
2021-03-11 11:27:07 +01:00
|
|
|
|
|
|
|
case oForceSignKey: opt.flags.force_sign_key = 1; break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
|
|
|
|
case oPrimaryKeyring:
|
2012-12-27 15:04:29 +01:00
|
|
|
sl = append_to_strlist (&nrings, pargs.r.ret_str);
|
|
|
|
sl->flags = KEYDB_RESOURCE_FLAG_PRIMARY;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oShowKeyring:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--show-keyring",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--list-options ","show-keyring");
|
|
|
|
opt.list_options|=LIST_SHOW_KEYRING;
|
|
|
|
break;
|
|
|
|
|
2015-06-22 21:01:10 +02:00
|
|
|
case oDebug:
|
|
|
|
if (parse_debug_flag (pargs.r.ret_str, &opt.debug, debug_flags))
|
|
|
|
{
|
|
|
|
pargs.r_opt = ARGPARSE_INVALID_ARG;
|
|
|
|
pargs.err = ARGPARSE_PRINT_ERROR;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oDebugAll: opt.debug = ~0; break;
|
2004-03-23 13:03:09 +00:00
|
|
|
case oDebugLevel: debug_level = pargs.r.ret_str; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2015-04-06 14:07:50 +02:00
|
|
|
case oDebugIOLBF: break; /* Already set in pre-parse step. */
|
|
|
|
|
2018-01-24 18:29:08 +01:00
|
|
|
case oDebugSetIobufSize:
|
|
|
|
opt_set_iobuf_size = pargs.r.ret_ulong;
|
|
|
|
opt_set_iobuf_size_used = 1;
|
|
|
|
break;
|
|
|
|
|
2018-07-24 09:50:02 +02:00
|
|
|
case oDebugAllowLargeChunks:
|
|
|
|
allow_large_chunks = 1;
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oStatusFD:
|
2008-12-09 08:58:02 +00:00
|
|
|
set_status_fd ( translate_sys2libc_fd_int (pargs.r.ret_int, 1) );
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oStatusFile:
|
2008-12-09 08:58:02 +00:00
|
|
|
set_status_fd ( open_info_file (pargs.r.ret_str, 1, 0) );
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oAttributeFD:
|
2008-12-09 08:58:02 +00:00
|
|
|
set_attrib_fd ( translate_sys2libc_fd_int (pargs.r.ret_int, 1) );
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oAttributeFile:
|
2008-12-09 08:58:02 +00:00
|
|
|
set_attrib_fd ( open_info_file (pargs.r.ret_str, 1, 1) );
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oLoggerFD:
|
2007-07-12 15:28:30 +00:00
|
|
|
log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oLoggerFile:
|
|
|
|
logfile = pargs.r.ret_str;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oWithFingerprint:
|
|
|
|
opt.with_fingerprint = 1;
|
2009-05-20 10:23:33 +00:00
|
|
|
opt.fingerprint++;
|
|
|
|
break;
|
2016-06-06 16:55:03 +02:00
|
|
|
case oWithSubkeyFingerprint:
|
|
|
|
opt.with_subkey_fingerprint = 1;
|
|
|
|
break;
|
2015-02-23 17:54:05 +01:00
|
|
|
case oWithICAOSpelling:
|
|
|
|
opt.with_icao_spelling = 1;
|
|
|
|
break;
|
2009-05-20 10:23:33 +00:00
|
|
|
case oFingerprint:
|
|
|
|
opt.fingerprint++;
|
|
|
|
fpr_maybe_cmd = 1;
|
|
|
|
break;
|
|
|
|
|
2010-10-08 11:11:08 +00:00
|
|
|
case oWithKeygrip:
|
|
|
|
opt.with_keygrip = 1;
|
|
|
|
break;
|
|
|
|
|
2017-10-17 21:10:19 +02:00
|
|
|
case oWithKeyScreening:
|
|
|
|
opt.with_key_screening = 1;
|
|
|
|
break;
|
|
|
|
|
2014-06-03 21:35:59 +02:00
|
|
|
case oWithSecret:
|
|
|
|
opt.with_secret = 1;
|
|
|
|
break;
|
|
|
|
|
2016-04-27 08:34:29 +02:00
|
|
|
case oWithWKDHash:
|
|
|
|
opt.with_wkd_hash = 1;
|
|
|
|
break;
|
|
|
|
|
2017-07-20 17:27:48 +02:00
|
|
|
case oWithKeyOrigin:
|
|
|
|
opt.with_key_origin = 1;
|
|
|
|
break;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case oSecretKeyring:
|
2010-04-23 11:36:59 +00:00
|
|
|
/* Ignore this old option. */
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
2010-04-23 11:36:59 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oNoArmor: opt.no_armor=1; opt.armor=0; break;
|
2016-07-06 15:33:40 +02:00
|
|
|
|
|
|
|
case oNoDefKeyring:
|
|
|
|
if (default_keyring > 0)
|
|
|
|
default_keyring = 0;
|
|
|
|
break;
|
|
|
|
case oNoKeyring:
|
|
|
|
default_keyring = -1;
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oNoGreeting: nogreeting = 1; break;
|
2011-02-04 12:57:53 +01:00
|
|
|
case oNoVerbose:
|
2006-04-19 11:26:11 +00:00
|
|
|
opt.verbose = 0;
|
|
|
|
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
|
|
|
|
opt.list_sigs=0;
|
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
case oQuickRandom:
|
2006-08-21 20:20:23 +00:00
|
|
|
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
|
|
|
|
break;
|
2013-11-27 09:20:02 +01:00
|
|
|
case oEmitVersion: opt.emit_version++; break;
|
|
|
|
case oNoEmitVersion: opt.emit_version=0; break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oCompletesNeeded: opt.completes_needed = pargs.r.ret_int; break;
|
|
|
|
case oMarginalsNeeded: opt.marginals_needed = pargs.r.ret_int; break;
|
|
|
|
case oMaxCertDepth: opt.max_cert_depth = pargs.r.ret_int; break;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
|
|
|
|
#ifndef NO_TRUST_MODELS
|
2003-06-05 07:14:21 +00:00
|
|
|
case oTrustDBName: trustdb_name = pargs.r.ret_str; break;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
|
|
|
|
#endif /*!NO_TRUST_MODELS*/
|
2015-11-03 23:15:27 +01:00
|
|
|
case oDefaultKey:
|
2015-11-05 17:29:53 +01:00
|
|
|
sl = add_to_strlist (&opt.def_secret_key, pargs.r.ret_str);
|
2015-12-04 08:56:02 +01:00
|
|
|
sl->flags = (pargs.r_opt << PK_LIST_SHIFT);
|
2020-02-20 10:03:11 +01:00
|
|
|
if (configname)
|
2015-12-17 10:44:55 +01:00
|
|
|
sl->flags |= PK_LIST_CONFIG;
|
2015-11-03 23:15:27 +01:00
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oDefRecipient:
|
2006-08-21 20:20:23 +00:00
|
|
|
if( *pargs.r.ret_str )
|
2015-10-29 09:57:00 +01:00
|
|
|
{
|
|
|
|
xfree (opt.def_recipient);
|
|
|
|
opt.def_recipient = make_username(pargs.r.ret_str);
|
|
|
|
}
|
2006-08-21 20:20:23 +00:00
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oDefRecipientSelf:
|
2006-08-21 20:20:23 +00:00
|
|
|
xfree(opt.def_recipient); opt.def_recipient = NULL;
|
|
|
|
opt.def_recipient_self = 1;
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oNoDefRecipient:
|
2006-08-21 20:20:23 +00:00
|
|
|
xfree(opt.def_recipient); opt.def_recipient = NULL;
|
|
|
|
opt.def_recipient_self = 0;
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oHomedir: break;
|
2020-08-14 12:19:11 +02:00
|
|
|
case oChUid: break; /* Command line only (see above). */
|
2003-06-05 07:14:21 +00:00
|
|
|
case oNoBatch: opt.batch = 0; break;
|
2008-05-07 15:40:36 +00:00
|
|
|
|
2016-08-25 09:26:36 +02:00
|
|
|
case oWithTofuInfo: opt.with_tofu_info = 1; break;
|
|
|
|
|
2008-05-07 15:40:36 +00:00
|
|
|
case oWithKeyData: opt.with_key_data=1; /*FALLTHRU*/
|
2003-06-05 07:14:21 +00:00
|
|
|
case oWithColons: opt.with_colons=':'; break;
|
|
|
|
|
2008-05-07 15:40:36 +00:00
|
|
|
case oWithSigCheck: opt.check_sigs = 1; /*FALLTHRU*/
|
2011-02-04 12:57:53 +01:00
|
|
|
case oWithSigList: opt.list_sigs = 1; break;
|
2008-05-07 15:40:36 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oSkipVerify: opt.skip_verify=1; break;
|
2009-11-23 19:18:04 +00:00
|
|
|
|
|
|
|
case oSkipHiddenRecipients: opt.skip_hidden_recipients = 1; break;
|
|
|
|
case oNoSkipHiddenRecipients: opt.skip_hidden_recipients = 0; break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aListSecretKeys: set_cmd( &cmd, aListSecretKeys); break;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
|
|
|
|
#ifndef NO_TRUST_MODELS
|
2003-06-05 07:14:21 +00:00
|
|
|
/* There are many programs (like mutt) that call gpg with
|
|
|
|
--always-trust so keep this option around for a long
|
|
|
|
time. */
|
|
|
|
case oAlwaysTrust: opt.trust_model=TM_ALWAYS; break;
|
|
|
|
case oTrustModel:
|
2006-04-19 11:26:11 +00:00
|
|
|
parse_trust_model(pargs.r.ret_str);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#endif /*!NO_TRUST_MODELS*/
|
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
|
|
|
case oTOFUDefaultPolicy:
|
|
|
|
opt.tofu_default_policy = parse_tofu_policy (pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
case oTOFUDBFormat:
|
2020-02-20 10:03:11 +01:00
|
|
|
obsolete_option (configname, pargs.lineno, "tofu-db-format");
|
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
|
|
|
break;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oForceOwnertrust:
|
2014-10-10 15:29:42 +02:00
|
|
|
log_info(_("Note: %s is not for normal use!\n"),
|
2003-06-05 07:14:21 +00:00
|
|
|
"--force-ownertrust");
|
|
|
|
opt.force_ownertrust=string_to_trust_value(pargs.r.ret_str);
|
|
|
|
if(opt.force_ownertrust==-1)
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error("invalid ownertrust '%s'\n",pargs.r.ret_str);
|
2003-06-05 07:14:21 +00:00
|
|
|
opt.force_ownertrust=0;
|
|
|
|
}
|
|
|
|
break;
|
2016-11-15 13:03:29 +01:00
|
|
|
|
2021-03-15 10:47:19 +01:00
|
|
|
case oNoAutoTrustNewKey: opt.flags.no_auto_trust_new_key = 1; break;
|
|
|
|
|
2016-11-15 13:03:29 +01:00
|
|
|
case oCompliance:
|
2017-06-07 11:50:54 +02:00
|
|
|
{
|
2017-07-13 17:28:32 +02:00
|
|
|
int compliance = gnupg_parse_compliance_option
|
|
|
|
(pargs.r.ret_str,
|
|
|
|
compliance_options, DIM (compliance_options),
|
|
|
|
opt.quiet);
|
2017-06-07 11:50:54 +02:00
|
|
|
if (compliance < 0)
|
|
|
|
g10_exit (1);
|
|
|
|
set_compliance_option (compliance);
|
|
|
|
}
|
2016-11-15 13:03:29 +01:00
|
|
|
break;
|
|
|
|
case oOpenPGP:
|
|
|
|
case oRFC2440:
|
|
|
|
case oRFC4880:
|
2016-06-20 22:19:23 +02:00
|
|
|
case oRFC4880bis:
|
2016-11-15 13:03:29 +01:00
|
|
|
case oPGP7:
|
|
|
|
case oPGP8:
|
|
|
|
case oGnuPG:
|
|
|
|
set_compliance_option (pargs.r_opt);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oRFC2440Text: opt.rfc2440_text=1; break;
|
|
|
|
case oNoRFC2440Text: opt.rfc2440_text=0; break;
|
|
|
|
|
2006-04-28 14:31:29 +00:00
|
|
|
case oSetFilename:
|
|
|
|
if(utf8_strings)
|
|
|
|
opt.set_filename = pargs.r.ret_str;
|
|
|
|
else
|
|
|
|
opt.set_filename = native_to_utf8(pargs.r.ret_str);
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oForYourEyesOnly: eyes_only = 1; break;
|
|
|
|
case oNoForYourEyesOnly: eyes_only = 0; break;
|
|
|
|
case oSetPolicyURL:
|
|
|
|
add_policy_url(pargs.r.ret_str,0);
|
|
|
|
add_policy_url(pargs.r.ret_str,1);
|
|
|
|
break;
|
|
|
|
case oSigPolicyURL: add_policy_url(pargs.r.ret_str,0); break;
|
|
|
|
case oCertPolicyURL: add_policy_url(pargs.r.ret_str,1); break;
|
|
|
|
case oShowPolicyURL:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--show-policy-url",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--list-options ","show-policy-urls");
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--show-policy-url",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--verify-options ","show-policy-urls");
|
|
|
|
opt.list_options|=LIST_SHOW_POLICY_URLS;
|
|
|
|
opt.verify_options|=VERIFY_SHOW_POLICY_URLS;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oNoShowPolicyURL:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--no-show-policy-url",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--list-options ","no-show-policy-urls");
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--no-show-policy-url",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--verify-options ","no-show-policy-urls");
|
|
|
|
opt.list_options&=~LIST_SHOW_POLICY_URLS;
|
|
|
|
opt.verify_options&=~VERIFY_SHOW_POLICY_URLS;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2003-09-23 17:48:33 +00:00
|
|
|
case oSigKeyserverURL: add_keyserver_url(pargs.r.ret_str,0); break;
|
2006-04-28 14:31:29 +00:00
|
|
|
case oUseEmbeddedFilename:
|
|
|
|
opt.flags.use_embedded_filename=1;
|
|
|
|
break;
|
|
|
|
case oNoUseEmbeddedFilename:
|
|
|
|
opt.flags.use_embedded_filename=0;
|
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oComment:
|
|
|
|
if(pargs.r.ret_str[0])
|
|
|
|
append_to_strlist(&opt.comments,pargs.r.ret_str);
|
|
|
|
break;
|
2003-09-23 17:48:33 +00:00
|
|
|
case oDefaultComment:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,
|
2003-09-23 17:48:33 +00:00
|
|
|
"--default-comment","--no-comments","");
|
|
|
|
/* fall through */
|
|
|
|
case oNoComments:
|
|
|
|
free_strlist(opt.comments);
|
|
|
|
opt.comments=NULL;
|
|
|
|
break;
|
2014-12-03 11:28:10 +01:00
|
|
|
case oThrowKeyids: opt.throw_keyids = 1; break;
|
|
|
|
case oNoThrowKeyids: opt.throw_keyids = 0; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oShowPhotos:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--show-photos",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--list-options ","show-photos");
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--show-photos",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--verify-options ","show-photos");
|
2003-06-05 07:14:21 +00:00
|
|
|
opt.list_options|=LIST_SHOW_PHOTOS;
|
|
|
|
opt.verify_options|=VERIFY_SHOW_PHOTOS;
|
|
|
|
break;
|
|
|
|
case oNoShowPhotos:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--no-show-photos",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--list-options ","no-show-photos");
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--no-show-photos",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--verify-options ","no-show-photos");
|
2003-06-05 07:14:21 +00:00
|
|
|
opt.list_options&=~LIST_SHOW_PHOTOS;
|
|
|
|
opt.verify_options&=~VERIFY_SHOW_PHOTOS;
|
|
|
|
break;
|
|
|
|
case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
|
2014-10-12 20:07:12 +02:00
|
|
|
|
2018-01-10 17:07:11 +01:00
|
|
|
case oForceAEAD: opt.force_aead = 1; break;
|
|
|
|
|
2016-06-13 11:24:09 +02:00
|
|
|
case oDisableSignerUID: opt.flags.disable_signer_uid = 1; break;
|
2020-03-13 13:28:35 +01:00
|
|
|
case oIncludeKeyBlock: opt.flags.include_key_block = 1; break;
|
2020-03-14 18:04:47 +01:00
|
|
|
case oNoIncludeKeyBlock: opt.flags.include_key_block = 0; break;
|
2016-06-13 11:24:09 +02:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oS2KMode: opt.s2k_mode = pargs.r.ret_int; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oS2KDigest: s2k_digest_string = xstrdup(pargs.r.ret_str); break;
|
|
|
|
case oS2KCipher: s2k_cipher_string = xstrdup(pargs.r.ret_str); break;
|
2006-10-13 04:06:24 +00:00
|
|
|
case oS2KCount:
|
2010-01-08 19:18:49 +00:00
|
|
|
if (pargs.r.ret_int)
|
|
|
|
opt.s2k_count = encode_s2k_iterations (pargs.r.ret_int);
|
|
|
|
else
|
|
|
|
opt.s2k_count = 0; /* Auto-calibrate when needed. */
|
2006-10-13 04:06:24 +00:00
|
|
|
break;
|
2016-07-06 14:03:50 +02:00
|
|
|
|
|
|
|
case oRecipient:
|
|
|
|
case oHiddenRecipient:
|
|
|
|
case oRecipientFile:
|
|
|
|
case oHiddenRecipientFile:
|
|
|
|
/* Store the recipient. Note that we also store the
|
|
|
|
* option as private data in the flags. This is achieved
|
|
|
|
* by shifting the option value to the left so to keep
|
|
|
|
* enough space for the flags. */
|
2003-06-05 07:14:21 +00:00
|
|
|
sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
|
2016-07-06 14:03:50 +02:00
|
|
|
sl->flags = (pargs.r_opt << PK_LIST_SHIFT);
|
2020-02-20 10:03:11 +01:00
|
|
|
if (configname)
|
2015-12-04 08:56:02 +01:00
|
|
|
sl->flags |= PK_LIST_CONFIG;
|
2016-07-06 14:03:50 +02:00
|
|
|
if (pargs.r_opt == oHiddenRecipient
|
|
|
|
|| pargs.r_opt == oHiddenRecipientFile)
|
|
|
|
sl->flags |= PK_LIST_HIDDEN;
|
|
|
|
if (pargs.r_opt == oRecipientFile
|
|
|
|
|| pargs.r_opt == oHiddenRecipientFile)
|
|
|
|
sl->flags |= PK_LIST_FROM_FILE;
|
|
|
|
any_explicit_recipient = 1;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2016-07-06 14:03:50 +02:00
|
|
|
|
|
|
|
case oEncryptTo:
|
|
|
|
case oHiddenEncryptTo:
|
|
|
|
/* Store an additional recipient. */
|
2003-06-05 07:14:21 +00:00
|
|
|
sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
|
2016-07-06 14:03:50 +02:00
|
|
|
sl->flags = ((pargs.r_opt << PK_LIST_SHIFT) | PK_LIST_ENCRYPT_TO);
|
2020-02-20 10:03:11 +01:00
|
|
|
if (configname)
|
2015-12-04 08:56:02 +01:00
|
|
|
sl->flags |= PK_LIST_CONFIG;
|
2016-07-06 14:03:50 +02:00
|
|
|
if (pargs.r_opt == oHiddenEncryptTo)
|
|
|
|
sl->flags |= PK_LIST_HIDDEN;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2016-07-06 14:03:50 +02:00
|
|
|
|
|
|
|
case oNoEncryptTo:
|
|
|
|
opt.no_encrypt_to = 1;
|
|
|
|
break;
|
2015-11-03 23:39:46 +01:00
|
|
|
case oEncryptToDefaultKey:
|
2020-02-20 10:03:11 +01:00
|
|
|
opt.encrypt_to_default_key = configname ? 2 : 1;
|
2015-11-03 23:39:46 +01:00
|
|
|
break;
|
2010-10-13 15:57:08 +00:00
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
case oTrySecretKey:
|
2010-10-13 15:57:08 +00:00
|
|
|
add_to_strlist2 (&opt.secret_keys_to_try,
|
|
|
|
pargs.r.ret_str, utf8_strings);
|
|
|
|
break;
|
|
|
|
|
2016-07-13 13:31:12 +02:00
|
|
|
case oMimemode: opt.mimemode = opt.textmode = 1; break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oTextmodeShort: opt.textmode = 2; break;
|
|
|
|
case oTextmode: opt.textmode=1; break;
|
2016-07-13 13:31:12 +02:00
|
|
|
case oNoTextmode: opt.textmode=opt.mimemode=0; break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oExpert: opt.expert = 1; break;
|
|
|
|
case oNoExpert: opt.expert = 0; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oDefSigExpire:
|
|
|
|
if(*pargs.r.ret_str!='\0')
|
|
|
|
{
|
|
|
|
if(parse_expire_string(pargs.r.ret_str)==(u32)-1)
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("'%s' is not a valid signature expiration\n"),
|
2006-04-19 11:26:11 +00:00
|
|
|
pargs.r.ret_str);
|
|
|
|
else
|
|
|
|
opt.def_sig_expire=pargs.r.ret_str;
|
|
|
|
}
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oAskSigExpire: opt.ask_sig_expire = 1; break;
|
|
|
|
case oNoAskSigExpire: opt.ask_sig_expire = 0; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oDefCertExpire:
|
|
|
|
if(*pargs.r.ret_str!='\0')
|
|
|
|
{
|
|
|
|
if(parse_expire_string(pargs.r.ret_str)==(u32)-1)
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("'%s' is not a valid signature expiration\n"),
|
2006-04-19 11:26:11 +00:00
|
|
|
pargs.r.ret_str);
|
|
|
|
else
|
|
|
|
opt.def_cert_expire=pargs.r.ret_str;
|
|
|
|
}
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oAskCertExpire: opt.ask_cert_expire = 1; break;
|
|
|
|
case oNoAskCertExpire: opt.ask_cert_expire = 0; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oDefCertLevel: opt.def_cert_level=pargs.r.ret_int; break;
|
|
|
|
case oMinCertLevel: opt.min_cert_level=pargs.r.ret_int; break;
|
|
|
|
case oAskCertLevel: opt.ask_cert_level = 1; break;
|
|
|
|
case oNoAskCertLevel: opt.ask_cert_level = 0; break;
|
|
|
|
case oLocalUser: /* store the local users */
|
2015-11-05 17:29:53 +01:00
|
|
|
sl = add_to_strlist2( &locusr, pargs.r.ret_str, utf8_strings );
|
2015-12-04 08:56:02 +01:00
|
|
|
sl->flags = (pargs.r_opt << PK_LIST_SHIFT);
|
2020-02-20 10:03:11 +01:00
|
|
|
if (configname)
|
2015-12-04 08:56:02 +01:00
|
|
|
sl->flags |= PK_LIST_CONFIG;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2016-08-18 10:08:34 +02:00
|
|
|
case oSender:
|
|
|
|
{
|
2018-11-12 07:44:33 +01:00
|
|
|
char *mbox = mailbox_from_userid (pargs.r.ret_str, 0);
|
2016-08-18 10:08:34 +02:00
|
|
|
if (!mbox)
|
|
|
|
log_error (_("\"%s\" is not a proper mail address\n"),
|
|
|
|
pargs.r.ret_str);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
add_to_strlist (&opt.sender_list, mbox);
|
|
|
|
xfree (mbox);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oCompress:
|
|
|
|
/* this is the -z command line option */
|
|
|
|
opt.compress_level = opt.bz2_compress_level = pargs.r.ret_int;
|
|
|
|
break;
|
|
|
|
case oCompressLevel: opt.compress_level = pargs.r.ret_int; break;
|
|
|
|
case oBZ2CompressLevel: opt.bz2_compress_level = pargs.r.ret_int; break;
|
|
|
|
case oBZ2DecompressLowmem: opt.bz2_decompress_lowmem=1; break;
|
2010-01-08 19:18:49 +00:00
|
|
|
case oPassphrase:
|
2019-07-19 17:17:15 +09:00
|
|
|
set_passphrase_from_string (pargs.r_type ? pargs.r.ret_str : "");
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
2010-01-08 19:18:49 +00:00
|
|
|
case oPassphraseFD:
|
2007-07-12 15:28:30 +00:00
|
|
|
pwfd = translate_sys2libc_fd_int (pargs.r.ret_int, 0);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2010-01-08 19:18:49 +00:00
|
|
|
case oPassphraseFile:
|
2008-12-09 08:58:02 +00:00
|
|
|
pwfd = open_info_file (pargs.r.ret_str, 0, 1);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2013-02-07 20:37:58 +01:00
|
|
|
case oPassphraseRepeat:
|
|
|
|
opt.passphrase_repeat = pargs.r.ret_int;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oPinentryMode:
|
|
|
|
opt.pinentry_mode = parse_pinentry_mode (pargs.r.ret_str);
|
|
|
|
if (opt.pinentry_mode == -1)
|
|
|
|
log_error (_("invalid pinentry mode '%s'\n"), pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
|
2018-03-23 09:06:20 +01:00
|
|
|
case oRequestOrigin:
|
|
|
|
opt.request_origin = parse_request_origin (pargs.r.ret_str);
|
|
|
|
if (opt.request_origin == -1)
|
|
|
|
log_error (_("invalid request origin '%s'\n"), pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oCommandFD:
|
2007-07-12 15:28:30 +00:00
|
|
|
opt.command_fd = translate_sys2libc_fd_int (pargs.r.ret_int, 0);
|
2017-02-08 13:49:41 +01:00
|
|
|
if (! gnupg_fd_valid (opt.command_fd))
|
2018-04-06 17:32:08 +02:00
|
|
|
log_error ("command-fd is invalid: %s\n", strerror (errno));
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oCommandFile:
|
2008-12-09 08:58:02 +00:00
|
|
|
opt.command_fd = open_info_file (pargs.r.ret_str, 0, 1);
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
case oCipherAlgo:
|
2006-04-19 11:26:11 +00:00
|
|
|
def_cipher_string = xstrdup(pargs.r.ret_str);
|
|
|
|
break;
|
2018-01-10 11:42:38 +01:00
|
|
|
case oAEADAlgo:
|
|
|
|
def_aead_string = xstrdup (pargs.r.ret_str);
|
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oDigestAlgo:
|
|
|
|
def_digest_string = xstrdup(pargs.r.ret_str);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oCompressAlgo:
|
|
|
|
/* If it is all digits, stick a Z in front of it for
|
|
|
|
later. This is for backwards compatibility with
|
|
|
|
versions that took the compress algorithm number. */
|
|
|
|
{
|
|
|
|
char *pt=pargs.r.ret_str;
|
|
|
|
while(*pt)
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
if (!isascii (*pt) || !isdigit (*pt))
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
pt++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(*pt=='\0')
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
compress_algo_string=xmalloc(strlen(pargs.r.ret_str)+2);
|
|
|
|
strcpy(compress_algo_string,"Z");
|
|
|
|
strcat(compress_algo_string,pargs.r.ret_str);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else
|
2006-04-19 11:26:11 +00:00
|
|
|
compress_algo_string = xstrdup(pargs.r.ret_str);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
case oCertDigestAlgo:
|
2006-05-23 16:19:43 +00:00
|
|
|
cert_digest_string = xstrdup(pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
case oNoSecmemWarn:
|
|
|
|
gcry_control (GCRYCTL_DISABLE_SECMEM_WARN);
|
2006-05-23 16:19:43 +00:00
|
|
|
break;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case oRequireSecmem: require_secmem=1; break;
|
|
|
|
case oNoRequireSecmem: require_secmem=0; break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oNoPermissionWarn: opt.no_perm_warn=1; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oDisplayCharset:
|
2003-06-05 07:14:21 +00:00
|
|
|
if( set_native_charset( pargs.r.ret_str ) )
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("'%s' is not a valid character set\n"),
|
2006-04-19 11:26:11 +00:00
|
|
|
pargs.r.ret_str);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oNotDashEscaped: opt.not_dash_escaped = 1; break;
|
|
|
|
case oEscapeFrom: opt.escape_from = 1; break;
|
|
|
|
case oNoEscapeFrom: opt.escape_from = 0; break;
|
|
|
|
case oLockOnce: opt.lock_once = 1; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oLockNever:
|
2011-09-23 14:43:58 +02:00
|
|
|
dotlock_disable ();
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oLockMultiple:
|
|
|
|
#ifndef __riscos__
|
|
|
|
opt.lock_once = 0;
|
|
|
|
#else /* __riscos__ */
|
|
|
|
riscos_not_implemented("lock-multiple");
|
|
|
|
#endif /* __riscos__ */
|
|
|
|
break;
|
|
|
|
case oKeyServer:
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
2011-01-10 14:30:17 +01:00
|
|
|
keyserver_spec_t keyserver;
|
2015-01-05 15:07:23 +01:00
|
|
|
keyserver = parse_keyserver_uri (pargs.r.ret_str, 0);
|
2011-01-10 14:30:17 +01:00
|
|
|
if (!keyserver)
|
|
|
|
log_error (_("could not parse keyserver URL\n"));
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
|
|
|
{
|
2015-03-28 16:55:10 +01:00
|
|
|
/* We only support a single keyserver. Later ones
|
|
|
|
override earlier ones. (Since we parse the
|
|
|
|
config file first and then the command line
|
|
|
|
arguments, the command line takes
|
|
|
|
precedence.) */
|
|
|
|
if (opt.keyserver)
|
|
|
|
free_keyserver_spec (opt.keyserver);
|
2011-01-10 14:30:17 +01:00
|
|
|
opt.keyserver = keyserver;
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oKeyServerOptions:
|
2006-04-19 11:26:11 +00:00
|
|
|
if(!parse_keyserver_options(pargs.r.ret_str))
|
|
|
|
{
|
|
|
|
if(configname)
|
|
|
|
log_error(_("%s:%d: invalid keyserver options\n"),
|
2020-02-20 10:03:11 +01:00
|
|
|
configname,pargs.lineno);
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
|
|
|
log_error(_("invalid keyserver options\n"));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oImportOptions:
|
2006-04-19 11:26:11 +00:00
|
|
|
if(!parse_import_options(pargs.r.ret_str,&opt.import_options,1))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
if(configname)
|
|
|
|
log_error(_("%s:%d: invalid import options\n"),
|
2020-02-20 10:03:11 +01:00
|
|
|
configname,pargs.lineno);
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
|
|
|
log_error(_("invalid import options\n"));
|
|
|
|
}
|
|
|
|
break;
|
2016-07-01 16:24:04 +02:00
|
|
|
case oImportFilter:
|
|
|
|
rc = parse_and_set_import_filter (pargs.r.ret_str);
|
|
|
|
if (rc)
|
|
|
|
log_error (_("invalid filter option: %s\n"), gpg_strerror (rc));
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oExportOptions:
|
2006-04-19 11:26:11 +00:00
|
|
|
if(!parse_export_options(pargs.r.ret_str,&opt.export_options,1))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
if(configname)
|
|
|
|
log_error(_("%s:%d: invalid export options\n"),
|
2020-02-20 10:03:11 +01:00
|
|
|
configname,pargs.lineno);
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
|
|
|
log_error(_("invalid export options\n"));
|
|
|
|
}
|
|
|
|
break;
|
2016-07-01 16:50:12 +02:00
|
|
|
case oExportFilter:
|
|
|
|
rc = parse_and_set_export_filter (pargs.r.ret_str);
|
|
|
|
if (rc)
|
|
|
|
log_error (_("invalid filter option: %s\n"), gpg_strerror (rc));
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oListOptions:
|
2006-04-19 11:26:11 +00:00
|
|
|
if(!parse_list_options(pargs.r.ret_str))
|
|
|
|
{
|
|
|
|
if(configname)
|
|
|
|
log_error(_("%s:%d: invalid list options\n"),
|
2020-02-20 10:03:11 +01:00
|
|
|
configname,pargs.lineno);
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
|
|
|
log_error(_("invalid list options\n"));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oVerifyOptions:
|
|
|
|
{
|
|
|
|
struct parse_options vopts[]=
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
{"show-photos",VERIFY_SHOW_PHOTOS,NULL,
|
|
|
|
N_("display photo IDs during signature verification")},
|
|
|
|
{"show-policy-urls",VERIFY_SHOW_POLICY_URLS,NULL,
|
|
|
|
N_("show policy URLs during signature verification")},
|
|
|
|
{"show-notations",VERIFY_SHOW_NOTATIONS,NULL,
|
|
|
|
N_("show all notations during signature verification")},
|
|
|
|
{"show-std-notations",VERIFY_SHOW_STD_NOTATIONS,NULL,
|
|
|
|
N_("show IETF standard notations during signature verification")},
|
|
|
|
{"show-standard-notations",VERIFY_SHOW_STD_NOTATIONS,NULL,
|
|
|
|
NULL},
|
|
|
|
{"show-user-notations",VERIFY_SHOW_USER_NOTATIONS,NULL,
|
|
|
|
N_("show user-supplied notations during signature verification")},
|
|
|
|
{"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS,NULL,
|
|
|
|
N_("show preferred keyserver URLs during signature verification")},
|
|
|
|
{"show-uid-validity",VERIFY_SHOW_UID_VALIDITY,NULL,
|
|
|
|
N_("show user ID validity during signature verification")},
|
|
|
|
{"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL,
|
|
|
|
N_("show revoked and expired user IDs in signature verification")},
|
2007-02-26 20:24:29 +00:00
|
|
|
{"show-primary-uid-only",VERIFY_SHOW_PRIMARY_UID_ONLY,NULL,
|
|
|
|
N_("show only the primary user ID in signature verification")},
|
2006-04-19 11:26:11 +00:00
|
|
|
{NULL,0,NULL,NULL}
|
2003-06-05 07:14:21 +00:00
|
|
|
};
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if(!parse_options(pargs.r.ret_str,&opt.verify_options,vopts,1))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
if(configname)
|
|
|
|
log_error(_("%s:%d: invalid verify options\n"),
|
2020-02-20 10:03:11 +01:00
|
|
|
configname,pargs.lineno);
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
|
|
|
log_error(_("invalid verify options\n"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case oTempDir: opt.temp_dir=pargs.r.ret_str; break;
|
|
|
|
case oExecPath:
|
2006-04-19 11:26:11 +00:00
|
|
|
if(set_exec_path(pargs.r.ret_str))
|
2003-06-05 07:14:21 +00:00
|
|
|
log_error(_("unable to set exec-path to %s\n"),pargs.r.ret_str);
|
|
|
|
else
|
|
|
|
opt.exec_path_set=1;
|
|
|
|
break;
|
2003-09-23 17:48:33 +00:00
|
|
|
case oSetNotation:
|
2003-06-05 07:14:21 +00:00
|
|
|
add_notation_data( pargs.r.ret_str, 0 );
|
|
|
|
add_notation_data( pargs.r.ret_str, 1 );
|
|
|
|
break;
|
|
|
|
case oSigNotation: add_notation_data( pargs.r.ret_str, 0 ); break;
|
|
|
|
case oCertNotation: add_notation_data( pargs.r.ret_str, 1 ); break;
|
2018-08-29 09:36:09 +02:00
|
|
|
case oKnownNotation: register_known_notation (pargs.r.ret_str); break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oShowNotation:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--show-notation",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--list-options ","show-notations");
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--show-notation",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--verify-options ","show-notations");
|
|
|
|
opt.list_options|=LIST_SHOW_NOTATIONS;
|
|
|
|
opt.verify_options|=VERIFY_SHOW_NOTATIONS;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oNoShowNotation:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--no-show-notation",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--list-options ","no-show-notations");
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--no-show-notation",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--verify-options ","no-show-notations");
|
|
|
|
opt.list_options&=~LIST_SHOW_NOTATIONS;
|
|
|
|
opt.verify_options&=~VERIFY_SHOW_NOTATIONS;
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case oUtf8Strings: utf8_strings = 1; break;
|
2021-03-05 15:33:40 +01:00
|
|
|
case oNoUtf8Strings:
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
utf8_strings = 0;
|
|
|
|
#endif
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oDisableCipherAlgo:
|
2003-06-18 19:56:13 +00:00
|
|
|
{
|
2006-05-24 11:12:28 +00:00
|
|
|
int algo = string_to_cipher_algo (pargs.r.ret_str);
|
2006-04-19 11:26:11 +00:00
|
|
|
gcry_cipher_ctl (NULL, GCRYCTL_DISABLE_ALGO, &algo, sizeof algo);
|
2003-06-18 19:56:13 +00:00
|
|
|
}
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oDisablePubkeyAlgo:
|
2003-06-18 19:56:13 +00:00
|
|
|
{
|
|
|
|
int algo = gcry_pk_map_name (pargs.r.ret_str);
|
2006-04-19 11:26:11 +00:00
|
|
|
gcry_pk_ctl (GCRYCTL_DISABLE_ALGO, &algo, sizeof algo);
|
2003-06-18 19:56:13 +00:00
|
|
|
}
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oNoSigCache: opt.no_sig_cache = 1; break;
|
|
|
|
case oAllowNonSelfsignedUID: opt.allow_non_selfsigned_uid = 1; break;
|
|
|
|
case oNoAllowNonSelfsignedUID: opt.allow_non_selfsigned_uid=0; break;
|
|
|
|
case oAllowFreeformUID: opt.allow_freeform_uid = 1; break;
|
|
|
|
case oNoAllowFreeformUID: opt.allow_freeform_uid = 0; break;
|
|
|
|
case oNoLiteral: opt.no_literal = 1; break;
|
|
|
|
case oSetFilesize: opt.set_filesize = pargs.r.ret_ulong; break;
|
|
|
|
case oFastListMode: opt.fast_list_mode = 1; break;
|
2008-06-11 08:07:54 +00:00
|
|
|
case oFixedListMode: /* Dummy */ break;
|
2014-02-05 10:37:59 +01:00
|
|
|
case oLegacyListMode: opt.legacy_list_mode = 1; break;
|
2016-07-14 15:19:36 +02:00
|
|
|
case oPrintDANERecords: print_dane_records = 1; break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oListOnly: opt.list_only=1; break;
|
|
|
|
case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
|
|
|
|
case oIgnoreValidFrom: opt.ignore_valid_from = 1; break;
|
|
|
|
case oIgnoreCrcError: opt.ignore_crc_error = 1; break;
|
|
|
|
case oIgnoreMDCError: opt.ignore_mdc_error = 1; break;
|
|
|
|
case oNoRandomSeedFile: use_random_seed = 0; break;
|
2017-08-23 16:45:20 +02:00
|
|
|
|
2020-03-14 18:04:47 +01:00
|
|
|
case oAutoKeyImport: opt.flags.auto_key_import = 1; break;
|
|
|
|
case oNoAutoKeyImport: opt.flags.auto_key_import = 0; break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oAutoKeyRetrieve:
|
2017-08-23 16:45:20 +02:00
|
|
|
opt.keyserver_options.options |= KEYSERVER_AUTO_KEY_RETRIEVE;
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oNoAutoKeyRetrieve:
|
2017-08-23 16:45:20 +02:00
|
|
|
opt.keyserver_options.options &= ~KEYSERVER_AUTO_KEY_RETRIEVE;
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oShowSessionKey: opt.show_session_key = 1; break;
|
|
|
|
case oOverrideSessionKey:
|
|
|
|
opt.override_session_key = pargs.r.ret_str;
|
|
|
|
break;
|
2016-11-16 09:02:53 +01:00
|
|
|
case oOverrideSessionKeyFD:
|
|
|
|
ovrseskeyfd = translate_sys2libc_fd_int (pargs.r.ret_int, 0);
|
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oMergeOnly:
|
2020-02-20 10:03:11 +01:00
|
|
|
deprecated_warning(configname,pargs.lineno,"--merge-only",
|
2006-04-19 11:26:11 +00:00
|
|
|
"--import-options ","merge-only");
|
|
|
|
opt.import_options|=IMPORT_MERGE_ONLY;
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oAllowSecretKeyImport: /* obsolete */ break;
|
|
|
|
case oTryAllSecrets: opt.try_all_secrets = 1; break;
|
|
|
|
case oTrustedKey: register_trusted_key( pargs.r.ret_str ); break;
|
2016-11-29 16:18:24 +01:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oEnableSpecialFilenames:
|
2016-11-29 16:18:24 +01:00
|
|
|
enable_special_filenames ();
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2016-11-29 16:18:24 +01:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oNoExpensiveTrustChecks: opt.no_expensive_trust_checks=1; break;
|
|
|
|
case oAutoCheckTrustDB: opt.no_auto_check_trustdb=0; break;
|
|
|
|
case oNoAutoCheckTrustDB: opt.no_auto_check_trustdb=1; break;
|
|
|
|
case oPreservePermissions: opt.preserve_permissions=1; break;
|
|
|
|
case oDefaultPreferenceList:
|
|
|
|
opt.def_preference_list = pargs.r.ret_str;
|
|
|
|
break;
|
2006-06-27 14:30:59 +00:00
|
|
|
case oDefaultKeyserverURL:
|
|
|
|
{
|
2011-01-10 14:30:17 +01:00
|
|
|
keyserver_spec_t keyserver;
|
2015-01-05 15:07:23 +01:00
|
|
|
keyserver = parse_keyserver_uri (pargs.r.ret_str,1 );
|
2011-01-10 14:30:17 +01:00
|
|
|
if (!keyserver)
|
|
|
|
log_error (_("could not parse keyserver URL\n"));
|
2006-06-27 14:30:59 +00:00
|
|
|
else
|
2011-01-10 14:30:17 +01:00
|
|
|
free_keyserver_spec (keyserver);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2006-06-27 14:30:59 +00:00
|
|
|
opt.def_keyserver_url = pargs.r.ret_str;
|
|
|
|
}
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oPersonalCipherPreferences:
|
|
|
|
pers_cipher_list=pargs.r.ret_str;
|
|
|
|
break;
|
2018-01-10 11:42:38 +01:00
|
|
|
case oPersonalAEADPreferences:
|
|
|
|
pers_aead_list = pargs.r.ret_str;
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oPersonalDigestPreferences:
|
|
|
|
pers_digest_list=pargs.r.ret_str;
|
|
|
|
break;
|
|
|
|
case oPersonalCompressPreferences:
|
|
|
|
pers_compress_list=pargs.r.ret_str;
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case oAgentProgram: opt.agent_program = pargs.r.ret_str; break;
|
2019-09-09 14:34:09 +02:00
|
|
|
case oKeyboxdProgram: opt.keyboxd_program = pargs.r.ret_str; break;
|
2014-03-12 18:24:52 +01:00
|
|
|
case oDirmngrProgram: opt.dirmngr_program = pargs.r.ret_str; break;
|
2017-08-08 11:43:22 +02:00
|
|
|
case oDisableDirmngr: opt.disable_dirmngr = 1; break;
|
2015-10-18 17:35:32 -04:00
|
|
|
case oWeakDigest:
|
|
|
|
additional_weak_digest(pargs.r.ret_str);
|
|
|
|
break;
|
2015-11-05 12:20:42 +01:00
|
|
|
case oUnwrap:
|
|
|
|
opt.unwrap_encryption = 1;
|
|
|
|
break;
|
2015-11-06 13:14:57 +01:00
|
|
|
case oOnlySignTextIDs:
|
|
|
|
opt.only_sign_text_ids = 1;
|
|
|
|
break;
|
2009-07-07 10:02:41 +00:00
|
|
|
|
|
|
|
case oDisplay:
|
|
|
|
set_opt_session_env ("DISPLAY", pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
case oTTYname:
|
|
|
|
set_opt_session_env ("GPG_TTY", pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
case oTTYtype:
|
|
|
|
set_opt_session_env ("TERM", pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
case oXauthority:
|
|
|
|
set_opt_session_env ("XAUTHORITY", pargs.r.ret_str);
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oLCctype: opt.lc_ctype = pargs.r.ret_str; break;
|
|
|
|
case oLCmessages: opt.lc_messages = pargs.r.ret_str; break;
|
2009-07-07 10:02:41 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oGroup: add_group(pargs.r.ret_str); break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oUnGroup: rm_group(pargs.r.ret_str); break;
|
|
|
|
case oNoGroups:
|
|
|
|
while(opt.grouplist)
|
|
|
|
{
|
|
|
|
struct groupitem *iter=opt.grouplist;
|
|
|
|
free_strlist(iter->values);
|
|
|
|
opt.grouplist=opt.grouplist->next;
|
|
|
|
xfree(iter);
|
|
|
|
}
|
|
|
|
break;
|
2006-05-23 16:19:43 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case oMangleDosFilenames: opt.mangle_dos_filenames = 1; break;
|
|
|
|
case oNoMangleDosFilenames: opt.mangle_dos_filenames = 0; break;
|
|
|
|
case oEnableProgressFilter: opt.enable_progress_filter = 1; break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case oMultifile: multifile=1; break;
|
|
|
|
case oKeyidFormat:
|
|
|
|
if(ascii_strcasecmp(pargs.r.ret_str,"short")==0)
|
|
|
|
opt.keyid_format=KF_SHORT;
|
|
|
|
else if(ascii_strcasecmp(pargs.r.ret_str,"long")==0)
|
|
|
|
opt.keyid_format=KF_LONG;
|
|
|
|
else if(ascii_strcasecmp(pargs.r.ret_str,"0xshort")==0)
|
|
|
|
opt.keyid_format=KF_0xSHORT;
|
|
|
|
else if(ascii_strcasecmp(pargs.r.ret_str,"0xlong")==0)
|
|
|
|
opt.keyid_format=KF_0xLONG;
|
2016-06-06 16:00:50 +02:00
|
|
|
else if(ascii_strcasecmp(pargs.r.ret_str,"none")==0)
|
|
|
|
opt.keyid_format = KF_NONE;
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error("unknown keyid-format '%s'\n",pargs.r.ret_str);
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case oExitOnStatusWriteError:
|
|
|
|
opt.exit_on_status_write_error = 1;
|
|
|
|
break;
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
case oLimitCardInsertTries:
|
|
|
|
opt.limit_card_insert_tries = pargs.r.ret_int;
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case oRequireCrossCert: opt.flags.require_cross_cert=1; break;
|
|
|
|
case oNoRequireCrossCert: opt.flags.require_cross_cert=0; break;
|
|
|
|
|
|
|
|
case oAutoKeyLocate:
|
2017-08-04 21:58:46 +02:00
|
|
|
if (default_akl)
|
|
|
|
{
|
2018-11-21 09:20:56 +01:00
|
|
|
/* This is the first time --auto-key-locate is seen.
|
2017-08-04 21:58:46 +02:00
|
|
|
* We need to reset the default akl. */
|
|
|
|
default_akl = 0;
|
|
|
|
release_akl();
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
if(!parse_auto_key_locate(pargs.r.ret_str))
|
|
|
|
{
|
|
|
|
if(configname)
|
|
|
|
log_error(_("%s:%d: invalid auto-key-locate list\n"),
|
2020-02-20 10:03:11 +01:00
|
|
|
configname,pargs.lineno);
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
|
|
|
log_error(_("invalid auto-key-locate list\n"));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case oNoAutoKeyLocate:
|
|
|
|
release_akl();
|
|
|
|
break;
|
|
|
|
|
2017-07-13 17:28:32 +02:00
|
|
|
case oKeyOrigin:
|
|
|
|
if(!parse_key_origin (pargs.r.ret_str))
|
|
|
|
log_error (_("invalid argument for option \"%.50s\"\n"),
|
|
|
|
"--key-origin");
|
|
|
|
break;
|
|
|
|
|
2014-10-09 16:54:15 -04:00
|
|
|
case oEnableLargeRSA:
|
|
|
|
#if SECMEM_BUFFER_SIZE >= 65536
|
|
|
|
opt.flags.large_rsa=1;
|
|
|
|
#else
|
|
|
|
if (configname)
|
|
|
|
log_info("%s:%d: WARNING: gpg not built with large secure "
|
|
|
|
"memory buffer. Ignoring enable-large-rsa\n",
|
2020-02-20 10:03:11 +01:00
|
|
|
configname,pargs.lineno);
|
2014-10-09 16:54:15 -04:00
|
|
|
else
|
|
|
|
log_info("WARNING: gpg not built with large secure "
|
|
|
|
"memory buffer. Ignoring --enable-large-rsa\n");
|
|
|
|
#endif /* SECMEM_BUFFER_SIZE >= 65536 */
|
|
|
|
break;
|
|
|
|
case oDisableLargeRSA: opt.flags.large_rsa=0;
|
|
|
|
break;
|
|
|
|
|
2006-04-28 14:31:29 +00:00
|
|
|
case oEnableDSA2: opt.flags.dsa2=1; break;
|
|
|
|
case oDisableDSA2: opt.flags.dsa2=0; break;
|
|
|
|
|
2014-03-17 17:54:36 +01:00
|
|
|
case oAllowWeakDigestAlgos:
|
|
|
|
opt.flags.allow_weak_digest_algos = 1;
|
|
|
|
break;
|
2019-11-07 10:36:17 +01:00
|
|
|
|
|
|
|
case oAllowWeakKeySignatures:
|
|
|
|
opt.flags.allow_weak_key_signatures = 1;
|
|
|
|
break;
|
2014-03-17 17:54:36 +01:00
|
|
|
|
2021-02-10 14:31:34 +01:00
|
|
|
case oAllowOldCipherAlgos:
|
|
|
|
opt.flags.allow_old_cipher_algos = 1;
|
|
|
|
break;
|
|
|
|
|
2009-12-17 17:25:26 +00:00
|
|
|
case oFakedSystemTime:
|
|
|
|
{
|
2017-01-18 18:52:12 +01:00
|
|
|
size_t len = strlen (pargs.r.ret_str);
|
|
|
|
int freeze = 0;
|
|
|
|
time_t faked_time;
|
|
|
|
|
|
|
|
if (len > 0 && pargs.r.ret_str[len-1] == '!')
|
|
|
|
{
|
|
|
|
freeze = 1;
|
|
|
|
pargs.r.ret_str[len-1] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
faked_time = isotime2epoch (pargs.r.ret_str);
|
2009-12-17 17:25:26 +00:00
|
|
|
if (faked_time == (time_t)(-1))
|
|
|
|
faked_time = (time_t)strtoul (pargs.r.ret_str, NULL, 10);
|
2017-01-18 18:52:12 +01:00
|
|
|
gnupg_set_time (faked_time, freeze);
|
2009-12-17 17:25:26 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2014-11-28 09:44:19 +01:00
|
|
|
case oNoAutostart: opt.autostart = 0; break;
|
2018-04-11 20:35:40 +02:00
|
|
|
case oNoSymkeyCache: opt.no_symkey_cache = 1; break;
|
2014-11-28 09:44:19 +01:00
|
|
|
|
2016-12-02 19:43:36 +01:00
|
|
|
case oDefaultNewKeyAlgo:
|
|
|
|
opt.def_new_key_algo = pargs.r.ret_str;
|
|
|
|
break;
|
|
|
|
|
2019-08-21 10:19:16 +02:00
|
|
|
case oUseOnlyOpenPGPCard:
|
|
|
|
opt.flags.use_only_openpgp_card = 1;
|
|
|
|
break;
|
|
|
|
|
2020-02-13 14:01:07 +01:00
|
|
|
case oFullTimestrings:
|
|
|
|
opt.flags.full_timestrings = 1;
|
|
|
|
break;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case oNoop: break;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
default:
|
2020-02-20 10:03:11 +01:00
|
|
|
if (configname)
|
2018-04-06 17:32:08 +02:00
|
|
|
pargs.err = ARGPARSE_PRINT_WARNING;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pargs.err = ARGPARSE_PRINT_ERROR;
|
2018-06-12 16:11:19 +02:00
|
|
|
/* The argparse function calls a plain exit and thus
|
2018-04-06 17:32:08 +02:00
|
|
|
* we need to print a status here. */
|
|
|
|
write_status_failure ("option-parser",
|
|
|
|
gpg_error(GPG_ERR_GENERAL));
|
|
|
|
}
|
2008-11-12 17:41:49 +00:00
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-20 10:03:11 +01:00
|
|
|
gpgrt_argparse (NULL, &pargs, NULL); /* Release internal state. */
|
|
|
|
|
2010-10-01 20:33:53 +00:00
|
|
|
if (log_get_errorcount (0))
|
2018-04-06 17:32:08 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("option-parser", gpg_error(GPG_ERR_GENERAL));
|
|
|
|
g10_exit(2);
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2021-04-19 11:33:19 +02:00
|
|
|
/* Process common component options. */
|
|
|
|
if (parse_comopt (GNUPG_MODULE_NAME_GPG, debug_argparser))
|
|
|
|
{
|
|
|
|
write_status_failure ("option-parser", gpg_error(GPG_ERR_GENERAL));
|
|
|
|
g10_exit(2);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opt.use_keyboxd)
|
|
|
|
log_info ("Note: Please move option \"%s\" to \"common.conf\"\n",
|
|
|
|
"use-keyboxd");
|
|
|
|
opt.use_keyboxd = comopt.use_keyboxd; /* Override. */
|
|
|
|
|
|
|
|
if (opt.keyboxd_program)
|
|
|
|
log_info ("Note: Please move option \"%s\" to \"common.conf\"\n",
|
|
|
|
"keyboxd-program");
|
|
|
|
if (!opt.keyboxd_program && comopt.keyboxd_program)
|
|
|
|
{
|
|
|
|
opt.keyboxd_program = comopt.keyboxd_program;
|
|
|
|
comopt.keyboxd_program = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/* The command --gpgconf-list is pretty simple and may be called
|
|
|
|
directly after the option parsing. */
|
|
|
|
if (cmd == aGPGConfList)
|
|
|
|
{
|
2020-03-14 18:53:43 +01:00
|
|
|
gpgconf_list ();
|
2006-04-19 11:26:11 +00:00
|
|
|
g10_exit (0);
|
|
|
|
}
|
2020-02-20 10:03:11 +01:00
|
|
|
xfree (last_configname);
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2016-07-14 15:19:36 +02:00
|
|
|
if (print_dane_records)
|
|
|
|
log_error ("invalid option \"%s\"; use \"%s\" instead\n",
|
|
|
|
"--print-dane-records",
|
|
|
|
"--export-options export-dane");
|
|
|
|
if (log_get_errorcount (0))
|
2018-04-06 17:32:08 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("option-checking", gpg_error(GPG_ERR_GENERAL));
|
|
|
|
g10_exit(2);
|
|
|
|
}
|
2016-07-14 15:19:36 +02:00
|
|
|
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
if( nogreeting )
|
|
|
|
greeting = 0;
|
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
if( greeting )
|
|
|
|
{
|
|
|
|
es_fprintf (es_stderr, "%s %s; %s\n",
|
2020-02-20 10:03:11 +01:00
|
|
|
gpgrt_strusage(11), gpgrt_strusage(13), gpgrt_strusage(14));
|
|
|
|
es_fprintf (es_stderr, "%s\n", gpgrt_strusage(15) );
|
2010-08-18 19:25:15 +00:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
#ifdef IS_DEVELOPMENT_VERSION
|
2008-12-09 12:32:53 +00:00
|
|
|
if (!opt.batch)
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
|
|
|
const char *s;
|
|
|
|
|
2020-02-20 10:03:11 +01:00
|
|
|
if((s=gpgrt_strusage(25)))
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info("%s\n",s);
|
2020-02-20 10:03:11 +01:00
|
|
|
if((s=gpgrt_strusage(26)))
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info("%s\n",s);
|
2020-02-20 10:03:11 +01:00
|
|
|
if((s=gpgrt_strusage(27)))
|
2006-04-19 11:26:11 +00:00
|
|
|
log_info("%s\n",s);
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
#endif
|
|
|
|
|
2019-09-10 16:05:54 +02:00
|
|
|
/* Init threading which is used by some helper functions. */
|
|
|
|
npth_init ();
|
|
|
|
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
|
|
|
|
gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
|
|
|
|
|
2019-11-06 14:44:50 +01:00
|
|
|
if (logfile)
|
2004-03-23 13:03:09 +00:00
|
|
|
{
|
|
|
|
log_set_file (logfile);
|
2019-09-10 16:05:54 +02:00
|
|
|
log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX
|
|
|
|
| GPGRT_LOG_WITH_TIME
|
|
|
|
| GPGRT_LOG_WITH_PID ));
|
2004-03-23 13:03:09 +00:00
|
|
|
}
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
if (opt.verbose > 2)
|
2012-06-05 19:29:22 +02:00
|
|
|
log_info ("using character set '%s'\n", get_native_charset ());
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
if( may_coredump && !opt.quiet )
|
|
|
|
log_info(_("WARNING: program may create a core file!\n"));
|
|
|
|
|
2016-06-20 22:19:23 +02:00
|
|
|
if (opt.flags.rfc4880bis)
|
2019-08-23 11:45:49 +02:00
|
|
|
{
|
2019-11-07 09:24:38 +01:00
|
|
|
if (opt.verbose)
|
2019-08-23 11:45:49 +02:00
|
|
|
log_info ("Note: RFC4880bis features are enabled.\n");
|
|
|
|
}
|
2016-07-13 13:31:12 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
opt.mimemode = 0; /* This will use text mode instead. */
|
|
|
|
}
|
2016-06-20 22:19:23 +02:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
if (eyes_only) {
|
|
|
|
if (opt.set_filename)
|
|
|
|
log_info(_("WARNING: %s overrides %s\n"),
|
|
|
|
"--for-your-eyes-only","--set-filename");
|
|
|
|
|
|
|
|
opt.set_filename="_CONSOLE";
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opt.no_literal) {
|
2014-10-10 15:29:42 +02:00
|
|
|
log_info(_("Note: %s is not for normal use!\n"), "--no-literal");
|
2003-06-05 07:14:21 +00:00
|
|
|
if (opt.textmode)
|
|
|
|
log_error(_("%s not allowed with %s!\n"),
|
|
|
|
"--textmode", "--no-literal" );
|
|
|
|
if (opt.set_filename)
|
|
|
|
log_error(_("%s makes no sense with %s!\n"),
|
|
|
|
eyes_only?"--for-your-eyes-only":"--set-filename",
|
|
|
|
"--no-literal" );
|
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
if (opt.set_filesize)
|
2014-10-10 15:29:42 +02:00
|
|
|
log_info(_("Note: %s is not for normal use!\n"), "--set-filesize");
|
2003-06-05 07:14:21 +00:00
|
|
|
if( opt.batch )
|
|
|
|
tty_batchmode( 1 );
|
|
|
|
|
2009-12-17 17:25:26 +00:00
|
|
|
if (gnupg_faked_time_p ())
|
|
|
|
{
|
|
|
|
gnupg_isotime_t tbuf;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2009-12-17 17:25:26 +00:00
|
|
|
log_info (_("WARNING: running with faked system time: "));
|
|
|
|
gnupg_get_isotime (tbuf);
|
|
|
|
dump_isotime (tbuf);
|
|
|
|
log_printf ("\n");
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2012-03-27 12:35:13 +02:00
|
|
|
/* Print a warning if an argument looks like an option. */
|
|
|
|
if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i=0; i < argc; i++)
|
|
|
|
if (argv[i][0] == '-' && argv[i][1] == '-')
|
2014-10-10 15:29:42 +02:00
|
|
|
log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
|
2012-03-27 12:35:13 +02:00
|
|
|
}
|
|
|
|
|
2009-12-17 17:25:26 +00:00
|
|
|
|
2003-07-29 08:53:19 +00:00
|
|
|
gcry_control (GCRYCTL_RESUME_SECMEM_WARN);
|
2006-04-19 11:26:11 +00:00
|
|
|
|
|
|
|
if(require_secmem && !got_secmem)
|
|
|
|
{
|
|
|
|
log_info(_("will not run with insecure memory due to %s\n"),
|
|
|
|
"--require-secmem");
|
2018-04-06 17:32:08 +02:00
|
|
|
write_status_failure ("option-checking", gpg_error(GPG_ERR_GENERAL));
|
2006-04-19 11:26:11 +00:00
|
|
|
g10_exit(2);
|
|
|
|
}
|
|
|
|
|
2004-03-23 13:03:09 +00:00
|
|
|
set_debug (debug_level);
|
2013-01-07 16:51:24 +01:00
|
|
|
if (DBG_CLOCK)
|
|
|
|
log_clock ("start");
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
/* Do these after the switch(), so they can override settings. */
|
2018-05-29 13:01:12 +02:00
|
|
|
if (PGP7)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2014-10-12 20:07:12 +02:00
|
|
|
/* That does not anymore work because we have no more support
|
|
|
|
for v3 signatures. */
|
2003-06-05 07:14:21 +00:00
|
|
|
opt.escape_from=1;
|
|
|
|
opt.ask_sig_expire=0;
|
|
|
|
}
|
|
|
|
else if(PGP8)
|
|
|
|
{
|
|
|
|
opt.escape_from=1;
|
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
if( def_cipher_string ) {
|
2006-05-24 11:12:28 +00:00
|
|
|
opt.def_cipher_algo = string_to_cipher_algo (def_cipher_string);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(def_cipher_string); def_cipher_string = NULL;
|
|
|
|
if ( openpgp_cipher_test_algo (opt.def_cipher_algo) )
|
2003-06-05 07:14:21 +00:00
|
|
|
log_error(_("selected cipher algorithm is invalid\n"));
|
|
|
|
}
|
2018-01-10 11:42:38 +01:00
|
|
|
if (def_aead_string)
|
|
|
|
{
|
|
|
|
opt.def_aead_algo = string_to_aead_algo (def_aead_string);
|
|
|
|
xfree (def_aead_string); def_aead_string = NULL;
|
|
|
|
if (openpgp_aead_test_algo (opt.def_aead_algo))
|
|
|
|
log_error(_("selected AEAD algorithm is invalid\n"));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
if( def_digest_string ) {
|
2006-05-24 11:12:28 +00:00
|
|
|
opt.def_digest_algo = string_to_digest_algo (def_digest_string);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(def_digest_string); def_digest_string = NULL;
|
|
|
|
if ( openpgp_md_test_algo (opt.def_digest_algo) )
|
2003-06-05 07:14:21 +00:00
|
|
|
log_error(_("selected digest algorithm is invalid\n"));
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
if( compress_algo_string ) {
|
|
|
|
opt.compress_algo = string_to_compress_algo(compress_algo_string);
|
|
|
|
xfree(compress_algo_string); compress_algo_string = NULL;
|
|
|
|
if( check_compress_algo(opt.compress_algo) )
|
|
|
|
log_error(_("selected compression algorithm is invalid\n"));
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
if( cert_digest_string ) {
|
2006-05-24 11:12:28 +00:00
|
|
|
opt.cert_digest_algo = string_to_digest_algo (cert_digest_string);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(cert_digest_string); cert_digest_string = NULL;
|
|
|
|
if (openpgp_md_test_algo(opt.cert_digest_algo))
|
|
|
|
log_error(_("selected certification digest algorithm is invalid\n"));
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
if( s2k_cipher_string ) {
|
2006-05-24 11:12:28 +00:00
|
|
|
opt.s2k_cipher_algo = string_to_cipher_algo (s2k_cipher_string);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(s2k_cipher_string); s2k_cipher_string = NULL;
|
|
|
|
if (openpgp_cipher_test_algo (opt.s2k_cipher_algo))
|
|
|
|
log_error(_("selected cipher algorithm is invalid\n"));
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
if( s2k_digest_string ) {
|
2006-05-24 11:12:28 +00:00
|
|
|
opt.s2k_digest_algo = string_to_digest_algo (s2k_digest_string);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(s2k_digest_string); s2k_digest_string = NULL;
|
|
|
|
if (openpgp_md_test_algo(opt.s2k_digest_algo))
|
|
|
|
log_error(_("selected digest algorithm is invalid\n"));
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
if( opt.completes_needed < 1 )
|
2006-04-19 11:26:11 +00:00
|
|
|
log_error(_("completes-needed must be greater than 0\n"));
|
2003-06-05 07:14:21 +00:00
|
|
|
if( opt.marginals_needed < 2 )
|
2006-04-19 11:26:11 +00:00
|
|
|
log_error(_("marginals-needed must be greater than 1\n"));
|
2003-06-05 07:14:21 +00:00
|
|
|
if( opt.max_cert_depth < 1 || opt.max_cert_depth > 255 )
|
2006-04-19 11:26:11 +00:00
|
|
|
log_error(_("max-cert-depth must be in the range from 1 to 255\n"));
|
|
|
|
if(opt.def_cert_level<0 || opt.def_cert_level>3)
|
|
|
|
log_error(_("invalid default-cert-level; must be 0, 1, 2, or 3\n"));
|
|
|
|
if( opt.min_cert_level < 1 || opt.min_cert_level > 3 )
|
|
|
|
log_error(_("invalid min-cert-level; must be 1, 2, or 3\n"));
|
2003-06-05 07:14:21 +00:00
|
|
|
switch( opt.s2k_mode ) {
|
|
|
|
case 0:
|
2021-03-24 10:46:21 +01:00
|
|
|
if (!opt.quiet)
|
|
|
|
log_info(_("Note: simple S2K mode (0) is strongly discouraged\n"));
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case 1: case 3: break;
|
|
|
|
default:
|
|
|
|
log_error(_("invalid S2K mode; must be 0, 1 or 3\n"));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This isn't actually needed, but does serve to error out if the
|
|
|
|
string is invalid. */
|
|
|
|
if(opt.def_preference_list &&
|
|
|
|
keygen_set_std_prefs(opt.def_preference_list,0))
|
|
|
|
log_error(_("invalid default preferences\n"));
|
|
|
|
|
|
|
|
if(pers_cipher_list &&
|
|
|
|
keygen_set_std_prefs(pers_cipher_list,PREFTYPE_SYM))
|
|
|
|
log_error(_("invalid personal cipher preferences\n"));
|
|
|
|
|
2018-01-10 11:42:38 +01:00
|
|
|
if (pers_aead_list && keygen_set_std_prefs (pers_aead_list, PREFTYPE_AEAD))
|
|
|
|
log_error(_("invalid personal AEAD preferences\n"));
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
if(pers_digest_list &&
|
|
|
|
keygen_set_std_prefs(pers_digest_list,PREFTYPE_HASH))
|
|
|
|
log_error(_("invalid personal digest preferences\n"));
|
|
|
|
|
|
|
|
if(pers_compress_list &&
|
|
|
|
keygen_set_std_prefs(pers_compress_list,PREFTYPE_ZIP))
|
|
|
|
log_error(_("invalid personal compress preferences\n"));
|
|
|
|
|
2018-10-24 15:56:18 -04:00
|
|
|
/* Check chunk size. Please fix also the man page if you change
|
2018-01-23 19:08:16 +01:00
|
|
|
* the default. The limits are given by the specs. */
|
|
|
|
if (!opt.chunk_size)
|
2018-07-24 09:50:02 +02:00
|
|
|
opt.chunk_size = 27; /* Default to the suggested max of 128 MiB. */
|
2018-01-23 19:08:16 +01:00
|
|
|
else if (opt.chunk_size < 6)
|
|
|
|
{
|
|
|
|
opt.chunk_size = 6;
|
|
|
|
log_info (_("chunk size invalid - using %d\n"), opt.chunk_size);
|
|
|
|
}
|
2018-07-24 09:50:02 +02:00
|
|
|
else if (opt.chunk_size > (allow_large_chunks? 62 : 27))
|
2018-01-23 19:08:16 +01:00
|
|
|
{
|
2018-07-24 09:50:02 +02:00
|
|
|
opt.chunk_size = (allow_large_chunks? 62 : 27);
|
2018-01-23 19:08:16 +01:00
|
|
|
log_info (_("chunk size invalid - using %d\n"), opt.chunk_size);
|
|
|
|
}
|
|
|
|
|
2003-09-23 17:48:33 +00:00
|
|
|
/* We don't support all possible commands with multifile yet */
|
|
|
|
if(multifile)
|
|
|
|
{
|
|
|
|
char *cmdname;
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2003-09-23 17:48:33 +00:00
|
|
|
switch(cmd)
|
|
|
|
{
|
|
|
|
case aSign:
|
|
|
|
cmdname="--sign";
|
|
|
|
break;
|
2015-11-04 13:27:49 +01:00
|
|
|
case aSignEncr:
|
|
|
|
cmdname="--sign --encrypt";
|
|
|
|
break;
|
2003-09-23 17:48:33 +00:00
|
|
|
case aClearsign:
|
2016-09-23 14:10:07 +02:00
|
|
|
cmdname="--clear-sign";
|
2003-09-23 17:48:33 +00:00
|
|
|
break;
|
|
|
|
case aDetachedSign:
|
|
|
|
cmdname="--detach-sign";
|
|
|
|
break;
|
|
|
|
case aSym:
|
|
|
|
cmdname="--symmetric";
|
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
case aEncrSym:
|
|
|
|
cmdname="--symmetric --encrypt";
|
|
|
|
break;
|
2003-09-23 17:48:33 +00:00
|
|
|
case aStore:
|
|
|
|
cmdname="--store";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
cmdname=NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(cmdname)
|
|
|
|
log_error(_("%s does not yet work with %s\n"),cmdname,"--multifile");
|
|
|
|
}
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
if( log_get_errorcount(0) )
|
2018-04-06 17:32:08 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("option-postprocessing",
|
|
|
|
gpg_error(GPG_ERR_GENERAL));
|
|
|
|
g10_exit (2);
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if(opt.compress_level==0)
|
|
|
|
opt.compress_algo=COMPRESS_ALGO_NONE;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
/* Check our chosen algorithms against the list of legal
|
|
|
|
algorithms. */
|
|
|
|
|
2018-01-21 16:24:43 +01:00
|
|
|
if(!GNUPG && !opt.flags.rfc4880bis)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
const char *badalg=NULL;
|
|
|
|
preftype_t badtype=PREFTYPE_NONE;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if(opt.def_cipher_algo
|
|
|
|
&& !algo_available(PREFTYPE_SYM,opt.def_cipher_algo,NULL))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2007-12-12 10:28:30 +00:00
|
|
|
badalg = openpgp_cipher_algo_name (opt.def_cipher_algo);
|
2003-06-18 19:56:13 +00:00
|
|
|
badtype = PREFTYPE_SYM;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2018-01-10 11:42:38 +01:00
|
|
|
else if(opt.def_aead_algo
|
|
|
|
&& !algo_available(PREFTYPE_AEAD, opt.def_aead_algo, NULL))
|
|
|
|
{
|
|
|
|
badalg = openpgp_aead_algo_name (opt.def_aead_algo);
|
|
|
|
badtype = PREFTYPE_AEAD;
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
else if(opt.def_digest_algo
|
|
|
|
&& !algo_available(PREFTYPE_HASH,opt.def_digest_algo,NULL))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2003-06-18 19:56:13 +00:00
|
|
|
badalg = gcry_md_algo_name (opt.def_digest_algo);
|
|
|
|
badtype = PREFTYPE_HASH;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
else if(opt.cert_digest_algo
|
|
|
|
&& !algo_available(PREFTYPE_HASH,opt.cert_digest_algo,NULL))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2003-06-18 19:56:13 +00:00
|
|
|
badalg = gcry_md_algo_name (opt.cert_digest_algo);
|
|
|
|
badtype = PREFTYPE_HASH;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
else if(opt.compress_algo!=-1
|
|
|
|
&& !algo_available(PREFTYPE_ZIP,opt.compress_algo,NULL))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
badalg = compress_algo_to_string(opt.compress_algo);
|
2003-06-18 19:56:13 +00:00
|
|
|
badtype = PREFTYPE_ZIP;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if(badalg)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
switch(badtype)
|
|
|
|
{
|
|
|
|
case PREFTYPE_SYM:
|
2017-07-28 17:46:43 +02:00
|
|
|
log_info (_("cipher algorithm '%s'"
|
|
|
|
" may not be used in %s mode\n"),
|
|
|
|
badalg,
|
|
|
|
gnupg_compliance_option_string (opt.compliance));
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2018-01-10 11:42:38 +01:00
|
|
|
case PREFTYPE_AEAD:
|
|
|
|
log_info (_("AEAD algorithm '%s'"
|
|
|
|
" may not be used in %s mode\n"),
|
|
|
|
badalg,
|
|
|
|
gnupg_compliance_option_string (opt.compliance));
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
case PREFTYPE_HASH:
|
2017-07-28 17:46:43 +02:00
|
|
|
log_info (_("digest algorithm '%s'"
|
|
|
|
" may not be used in %s mode\n"),
|
|
|
|
badalg,
|
|
|
|
gnupg_compliance_option_string (opt.compliance));
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case PREFTYPE_ZIP:
|
2017-07-28 17:46:43 +02:00
|
|
|
log_info (_("compression algorithm '%s'"
|
|
|
|
" may not be used in %s mode\n"),
|
|
|
|
badalg,
|
|
|
|
gnupg_compliance_option_string (opt.compliance));
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
|
|
|
compliance_failure();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-06 16:01:40 +02:00
|
|
|
/* Check our chosen algorithms against the list of allowed
|
|
|
|
* algorithms in the current compliance mode, and fail hard if it
|
|
|
|
* is not. This is us being nice to the user informing her early
|
|
|
|
* that the chosen algorithms are not available. We also check
|
|
|
|
* and enforce this right before the actual operation. */
|
2018-01-10 11:42:38 +01:00
|
|
|
/* FIXME: We also need to check the AEAD algo. */
|
2017-06-06 16:01:40 +02:00
|
|
|
if (opt.def_cipher_algo
|
|
|
|
&& ! gnupg_cipher_is_allowed (opt.compliance,
|
|
|
|
cmd == aEncr
|
|
|
|
|| cmd == aSignEncr
|
|
|
|
|| cmd == aEncrSym
|
|
|
|
|| cmd == aSym
|
|
|
|
|| cmd == aSignSym
|
|
|
|
|| cmd == aSignEncrSym,
|
|
|
|
opt.def_cipher_algo,
|
|
|
|
GCRY_CIPHER_MODE_NONE))
|
2017-07-28 17:46:43 +02:00
|
|
|
log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
|
2017-06-06 16:01:40 +02:00
|
|
|
openpgp_cipher_algo_name (opt.def_cipher_algo),
|
|
|
|
gnupg_compliance_option_string (opt.compliance));
|
|
|
|
|
|
|
|
if (opt.def_digest_algo
|
|
|
|
&& ! gnupg_digest_is_allowed (opt.compliance,
|
|
|
|
cmd == aSign
|
|
|
|
|| cmd == aSignEncr
|
|
|
|
|| cmd == aSignEncrSym
|
|
|
|
|| cmd == aSignSym
|
|
|
|
|| cmd == aClearsign,
|
|
|
|
opt.def_digest_algo))
|
2017-07-28 17:46:43 +02:00
|
|
|
log_error (_("digest algorithm '%s' may not be used in %s mode\n"),
|
2017-06-06 16:01:40 +02:00
|
|
|
gcry_md_algo_name (opt.def_digest_algo),
|
|
|
|
gnupg_compliance_option_string (opt.compliance));
|
|
|
|
|
|
|
|
/* Fail hard. */
|
|
|
|
if (log_get_errorcount (0))
|
2018-04-06 17:32:08 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("option-checking", gpg_error(GPG_ERR_GENERAL));
|
2017-06-06 16:01:40 +02:00
|
|
|
g10_exit (2);
|
2018-04-06 17:32:08 +02:00
|
|
|
}
|
2017-06-06 16:01:40 +02:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
/* Set the random seed file. */
|
2020-10-20 10:43:55 +02:00
|
|
|
if (use_random_seed)
|
|
|
|
{
|
|
|
|
char *p = make_filename (gnupg_homedir (), "random_seed", NULL );
|
|
|
|
gcry_control (GCRYCTL_SET_RANDOM_SEED_FILE, p);
|
|
|
|
if (!gnupg_access (p, F_OK))
|
2006-04-19 11:26:11 +00:00
|
|
|
register_secured_file (p);
|
|
|
|
xfree(p);
|
2020-10-20 10:43:55 +02:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2009-05-20 10:23:33 +00:00
|
|
|
/* If there is no command but the --fingerprint is given, default
|
|
|
|
to the --list-keys command. */
|
|
|
|
if (!cmd && fpr_maybe_cmd)
|
|
|
|
{
|
|
|
|
set_cmd (&cmd, aListKeys);
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
|
|
|
|
if( opt.verbose > 1 )
|
|
|
|
set_packet_list_mode(1);
|
|
|
|
|
2016-07-06 15:33:40 +02:00
|
|
|
/* Add the keyrings, but not for some special commands. We always
|
|
|
|
* need to add the keyrings if we are running under SELinux, this
|
|
|
|
* is so that the rings are added to the list of secured files.
|
2019-09-09 14:34:09 +02:00
|
|
|
* We do not add any keyring if --no-keyring or --use-keyboxd has
|
|
|
|
* been used. */
|
|
|
|
if (!opt.use_keyboxd
|
|
|
|
&& default_keyring >= 0
|
2016-07-06 15:33:40 +02:00
|
|
|
&& (ALWAYS_ADD_KEYRINGS
|
|
|
|
|| (cmd != aDeArmor && cmd != aEnArmor && cmd != aGPGConfTest)))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2016-07-06 15:33:40 +02:00
|
|
|
if (!nrings || default_keyring > 0) /* Add default ring. */
|
2013-11-18 14:09:47 +01:00
|
|
|
keydb_add_resource ("pubring" EXTSEP_S GPGEXT_GPG,
|
2012-12-27 15:04:29 +01:00
|
|
|
KEYDB_RESOURCE_FLAG_DEFAULT);
|
2010-04-23 11:36:59 +00:00
|
|
|
for (sl = nrings; sl; sl = sl->next )
|
|
|
|
keydb_add_resource (sl->d, sl->flags);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
FREE_STRLIST(nrings);
|
|
|
|
|
2019-09-09 14:34:09 +02:00
|
|
|
/* In loopback mode, never ask for the password multiple times. */
|
2015-06-16 16:00:39 +02:00
|
|
|
if (opt.pinentry_mode == PINENTRY_MODE_LOOPBACK)
|
|
|
|
{
|
|
|
|
opt.passphrase_repeat = 0;
|
|
|
|
}
|
|
|
|
|
2020-01-13 15:20:49 +01:00
|
|
|
/* If no pinentry is expected shunt
|
|
|
|
* gnupg_allow_set_foregound_window to avoid useless error
|
|
|
|
* messages on Windows. */
|
|
|
|
if (opt.pinentry_mode != PINENTRY_MODE_ASK)
|
|
|
|
{
|
|
|
|
gnupg_inhibit_set_foregound_window (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-23 14:02:13 +00:00
|
|
|
if (cmd == aGPGConfTest)
|
|
|
|
g10_exit(0);
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2016-11-16 09:02:53 +01:00
|
|
|
if (pwfd != -1) /* Read the passphrase now. */
|
|
|
|
read_passphrase_from_fd (pwfd);
|
|
|
|
|
|
|
|
if (ovrseskeyfd != -1 ) /* Read the sessionkey now. */
|
|
|
|
read_sessionkey_from_fd (ovrseskeyfd);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
fname = argc? *argv : NULL;
|
|
|
|
|
2006-04-28 14:31:29 +00:00
|
|
|
if(fname && utf8_strings)
|
|
|
|
opt.flags.utf8_filename=1;
|
|
|
|
|
2010-10-01 20:33:53 +00:00
|
|
|
ctrl = xcalloc (1, sizeof *ctrl);
|
2010-08-31 15:58:39 +00:00
|
|
|
gpg_init_default_ctrl (ctrl);
|
|
|
|
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#ifndef NO_TRUST_MODELS
|
2013-08-02 09:10:17 +02:00
|
|
|
switch (cmd)
|
|
|
|
{
|
2003-06-05 07:14:21 +00:00
|
|
|
case aPrimegen:
|
|
|
|
case aPrintMD:
|
|
|
|
case aPrintMDs:
|
|
|
|
case aGenRandom:
|
|
|
|
case aDeArmor:
|
|
|
|
case aEnArmor:
|
2016-09-01 19:22:48 +02:00
|
|
|
case aListConfig:
|
|
|
|
case aListGcryptConfig:
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2009-07-22 09:43:10 +00:00
|
|
|
case aFixTrustDB:
|
2013-08-02 09:10:17 +02:00
|
|
|
case aExportOwnerTrust:
|
|
|
|
rc = setup_trustdb (0, trustdb_name);
|
|
|
|
break;
|
|
|
|
case aListTrustDB:
|
|
|
|
rc = setup_trustdb (argc? 1:0, trustdb_name);
|
|
|
|
break;
|
2017-03-02 16:25:20 +01:00
|
|
|
case aKeygen:
|
|
|
|
case aFullKeygen:
|
|
|
|
case aQuickKeygen:
|
|
|
|
rc = setup_trustdb (1, trustdb_name);
|
|
|
|
break;
|
2013-10-11 09:25:58 +02:00
|
|
|
default:
|
2013-08-02 09:10:17 +02:00
|
|
|
/* If we are using TM_ALWAYS, we do not need to create the
|
|
|
|
trustdb. */
|
|
|
|
rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (rc)
|
2015-01-22 12:06:11 +01:00
|
|
|
log_error (_("failed to initialize the TrustDB: %s\n"),
|
|
|
|
gpg_strerror (rc));
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#endif /*!NO_TRUST_MODELS*/
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
switch (cmd)
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
case aStore:
|
|
|
|
case aSym:
|
|
|
|
case aSign:
|
|
|
|
case aSignSym:
|
|
|
|
case aClearsign:
|
2003-06-05 07:14:21 +00:00
|
|
|
if (!opt.quiet && any_explicit_recipient)
|
|
|
|
log_info (_("WARNING: recipients (-r) given "
|
|
|
|
"without using public key encryption\n"));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2014-06-05 11:19:59 +02:00
|
|
|
|
|
|
|
/* Check for certain command whether we need to migrate a
|
|
|
|
secring.gpg to the gpg-agent. */
|
|
|
|
switch (cmd)
|
|
|
|
{
|
|
|
|
case aListSecretKeys:
|
|
|
|
case aSign:
|
|
|
|
case aSignEncr:
|
|
|
|
case aSignEncrSym:
|
|
|
|
case aSignSym:
|
|
|
|
case aClearsign:
|
|
|
|
case aDecrypt:
|
|
|
|
case aSignKey:
|
|
|
|
case aLSignKey:
|
|
|
|
case aEditKey:
|
|
|
|
case aPasswd:
|
|
|
|
case aDeleteSecretKeys:
|
|
|
|
case aDeleteSecretAndPublicKeys:
|
2014-07-23 15:12:43 +02:00
|
|
|
case aQuickKeygen:
|
2015-05-08 16:08:57 +02:00
|
|
|
case aQuickAddUid:
|
2016-06-02 15:54:48 +02:00
|
|
|
case aQuickAddKey:
|
2016-06-16 18:05:57 -04:00
|
|
|
case aQuickRevUid:
|
2017-03-21 14:47:21 +01:00
|
|
|
case aQuickSetPrimaryUid:
|
2014-09-27 15:14:13 +02:00
|
|
|
case aFullKeygen:
|
2014-06-05 11:19:59 +02:00
|
|
|
case aKeygen:
|
|
|
|
case aImport:
|
|
|
|
case aExportSecret:
|
|
|
|
case aExportSecretSub:
|
|
|
|
case aGenRevoke:
|
|
|
|
case aDesigRevoke:
|
|
|
|
case aCardEdit:
|
|
|
|
case aChangePIN:
|
|
|
|
migrate_secring (ctrl);
|
|
|
|
break;
|
|
|
|
case aListKeys:
|
|
|
|
if (opt.with_secret)
|
|
|
|
migrate_secring (ctrl);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The command dispatcher. */
|
2006-04-19 11:26:11 +00:00
|
|
|
switch( cmd )
|
|
|
|
{
|
2006-12-21 19:40:00 +00:00
|
|
|
case aServer:
|
2010-08-31 15:58:39 +00:00
|
|
|
gpg_server (ctrl);
|
2006-12-21 19:40:00 +00:00
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aStore: /* only store the file */
|
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--store [filename]");
|
2009-09-28 14:37:48 +00:00
|
|
|
if( (rc = encrypt_store(fname)) )
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("store", rc);
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error ("storing '%s' failed: %s\n",
|
2015-01-22 12:06:11 +01:00
|
|
|
print_fname_stdin(fname),gpg_strerror (rc) );
|
2015-08-25 09:03:31 +02:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
case aSym: /* encrypt the given file only with the symmetric cipher */
|
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--symmetric [filename]");
|
2009-09-28 14:37:48 +00:00
|
|
|
if( (rc = encrypt_symmetric(fname)) )
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("symencrypt", rc);
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error (_("symmetric encryption of '%s' failed: %s\n"),
|
2015-01-22 12:06:11 +01:00
|
|
|
print_fname_stdin(fname),gpg_strerror (rc) );
|
2015-08-25 09:03:31 +02:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aEncr: /* encrypt the given file */
|
2003-09-23 17:48:33 +00:00
|
|
|
if(multifile)
|
2010-10-01 20:33:53 +00:00
|
|
|
encrypt_crypt_files (ctrl, argc, argv, remusr);
|
2003-09-23 17:48:33 +00:00
|
|
|
else
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--encrypt [filename]");
|
2010-10-01 20:33:53 +00:00
|
|
|
if( (rc = encrypt_crypt (ctrl, -1, fname, remusr, 0, NULL, -1)) )
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("encrypt", rc);
|
|
|
|
log_error("%s: encryption failed: %s\n",
|
|
|
|
print_fname_stdin(fname), gpg_strerror (rc) );
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aEncrSym:
|
|
|
|
/* This works with PGP 8 in the sense that it acts just like a
|
|
|
|
symmetric message. It doesn't work at all with 2 or 6. It
|
|
|
|
might work with 7, but alas, I don't have a copy to test
|
|
|
|
with right now. */
|
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--symmetric --encrypt [filename]");
|
2006-04-19 11:26:11 +00:00
|
|
|
else if(opt.s2k_mode==0)
|
|
|
|
log_error(_("you cannot use --symmetric --encrypt"
|
|
|
|
" with --s2k-mode 0\n"));
|
2018-05-29 13:01:12 +02:00
|
|
|
else if (PGP7)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_error(_("you cannot use --symmetric --encrypt"
|
2017-07-28 17:46:43 +02:00
|
|
|
" in %s mode\n"),
|
2017-06-07 12:33:36 +02:00
|
|
|
gnupg_compliance_option_string (opt.compliance));
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
|
|
|
{
|
2010-10-01 20:33:53 +00:00
|
|
|
if( (rc = encrypt_crypt (ctrl, -1, fname, remusr, 1, NULL, -1)) )
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("encrypt", rc);
|
|
|
|
log_error ("%s: encryption failed: %s\n",
|
|
|
|
print_fname_stdin(fname), gpg_strerror (rc) );
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aSign: /* sign the given file */
|
|
|
|
sl = NULL;
|
|
|
|
if( detached_sig ) { /* sign all files */
|
|
|
|
for( ; argc; argc--, argv++ )
|
|
|
|
add_to_strlist( &sl, *argv );
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--sign [filename]");
|
2003-06-05 07:14:21 +00:00
|
|
|
if( argc ) {
|
2006-04-19 11:26:11 +00:00
|
|
|
sl = xmalloc_clear( sizeof *sl + strlen(fname));
|
2003-06-05 07:14:21 +00:00
|
|
|
strcpy(sl->d, fname);
|
|
|
|
}
|
|
|
|
}
|
2015-08-25 09:03:31 +02:00
|
|
|
if ((rc = sign_file (ctrl, sl, detached_sig, locusr, 0, NULL, NULL)))
|
|
|
|
{
|
|
|
|
write_status_failure ("sign", rc);
|
|
|
|
log_error ("signing failed: %s\n", gpg_strerror (rc) );
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aSignEncr: /* sign and encrypt the given file */
|
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--sign --encrypt [filename]");
|
2003-06-05 07:14:21 +00:00
|
|
|
if( argc ) {
|
2006-04-19 11:26:11 +00:00
|
|
|
sl = xmalloc_clear( sizeof *sl + strlen(fname));
|
2003-06-05 07:14:21 +00:00
|
|
|
strcpy(sl->d, fname);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
sl = NULL;
|
2010-10-01 20:33:53 +00:00
|
|
|
if ((rc = sign_file (ctrl, sl, detached_sig, locusr, 1, remusr, NULL)))
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("sign-encrypt", rc);
|
2006-04-19 11:26:11 +00:00
|
|
|
log_error("%s: sign+encrypt failed: %s\n",
|
2015-01-22 12:06:11 +01:00
|
|
|
print_fname_stdin(fname), gpg_strerror (rc) );
|
2015-08-25 09:03:31 +02:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case aSignEncrSym: /* sign and encrypt the given file */
|
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--symmetric --sign --encrypt [filename]");
|
2006-04-19 11:26:11 +00:00
|
|
|
else if(opt.s2k_mode==0)
|
|
|
|
log_error(_("you cannot use --symmetric --sign --encrypt"
|
|
|
|
" with --s2k-mode 0\n"));
|
2018-05-29 13:01:12 +02:00
|
|
|
else if (PGP7)
|
2006-04-19 11:26:11 +00:00
|
|
|
log_error(_("you cannot use --symmetric --sign --encrypt"
|
2017-07-28 17:46:43 +02:00
|
|
|
" in %s mode\n"),
|
2017-06-07 12:33:36 +02:00
|
|
|
gnupg_compliance_option_string (opt.compliance));
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if( argc )
|
|
|
|
{
|
|
|
|
sl = xmalloc_clear( sizeof *sl + strlen(fname));
|
|
|
|
strcpy(sl->d, fname);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
sl = NULL;
|
2010-10-01 20:33:53 +00:00
|
|
|
if ((rc = sign_file (ctrl, sl, detached_sig, locusr,
|
|
|
|
2, remusr, NULL)))
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("sign-encrypt", rc);
|
|
|
|
log_error("%s: symmetric+sign+encrypt failed: %s\n",
|
|
|
|
print_fname_stdin(fname), gpg_strerror (rc) );
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aSignSym: /* sign and conventionally encrypt the given file */
|
|
|
|
if (argc > 1)
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--sign --symmetric [filename]");
|
2015-11-03 23:15:27 +01:00
|
|
|
rc = sign_symencrypt_file (ctrl, fname, locusr);
|
2003-06-05 07:14:21 +00:00
|
|
|
if (rc)
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("sign-symencrypt", rc);
|
2003-06-05 07:14:21 +00:00
|
|
|
log_error("%s: sign+symmetric failed: %s\n",
|
2015-01-22 12:06:11 +01:00
|
|
|
print_fname_stdin(fname), gpg_strerror (rc) );
|
2015-08-25 09:03:31 +02:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aClearsign: /* make a clearsig */
|
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--clear-sign [filename]");
|
2015-11-03 23:15:27 +01:00
|
|
|
if( (rc = clearsign_file (ctrl, fname, locusr, NULL)) )
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("sign", rc);
|
2016-09-23 14:10:07 +02:00
|
|
|
log_error("%s: clear-sign failed: %s\n",
|
2015-01-22 12:06:11 +01:00
|
|
|
print_fname_stdin(fname), gpg_strerror (rc) );
|
2015-08-25 09:03:31 +02:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aVerify:
|
2010-10-01 20:33:53 +00:00
|
|
|
if (multifile)
|
2003-09-23 17:48:33 +00:00
|
|
|
{
|
2010-10-01 20:33:53 +00:00
|
|
|
if ((rc = verify_files (ctrl, argc, argv)))
|
2015-01-22 12:06:11 +01:00
|
|
|
log_error("verify files failed: %s\n", gpg_strerror (rc) );
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-10-01 20:33:53 +00:00
|
|
|
if ((rc = verify_signatures (ctrl, argc, argv)))
|
2015-01-22 12:06:11 +01:00
|
|
|
log_error("verify signatures failed: %s\n", gpg_strerror (rc) );
|
2003-09-23 17:48:33 +00:00
|
|
|
}
|
2015-08-25 09:03:31 +02:00
|
|
|
if (rc)
|
|
|
|
write_status_failure ("verify", rc);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aDecrypt:
|
2010-10-01 20:33:53 +00:00
|
|
|
if (multifile)
|
|
|
|
decrypt_messages (ctrl, argc, argv);
|
2003-09-23 17:48:33 +00:00
|
|
|
else
|
2006-04-19 11:26:11 +00:00
|
|
|
{
|
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--decrypt [filename]");
|
2010-10-01 20:33:53 +00:00
|
|
|
if( (rc = decrypt_message (ctrl, fname) ))
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("decrypt", rc);
|
|
|
|
log_error("decrypt_message failed: %s\n", gpg_strerror (rc) );
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2014-03-27 16:33:40 +01:00
|
|
|
case aQuickSignKey:
|
|
|
|
case aQuickLSignKey:
|
|
|
|
{
|
|
|
|
const char *fpr;
|
|
|
|
|
|
|
|
if (argc < 1)
|
|
|
|
wrong_args ("--quick-[l]sign-key fingerprint [userids]");
|
|
|
|
fpr = *argv++; argc--;
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++)
|
|
|
|
append_to_strlist2 (&sl, *argv, utf8_strings);
|
|
|
|
keyedit_quick_sign (ctrl, fpr, sl, locusr, (cmd == aQuickLSignKey));
|
|
|
|
free_strlist (sl);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2020-10-28 17:06:27 +01:00
|
|
|
case aQuickRevSig:
|
|
|
|
{
|
|
|
|
const char *userid, *siguserid;
|
|
|
|
|
|
|
|
if (argc < 2)
|
|
|
|
wrong_args ("--quick-revoke-sig USER-ID SIG-USER-ID [userids]");
|
|
|
|
userid = *argv++; argc--;
|
|
|
|
siguserid = *argv++; argc--;
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++)
|
|
|
|
append_to_strlist2 (&sl, *argv, utf8_strings);
|
|
|
|
keyedit_quick_revsig (ctrl, userid, siguserid, sl);
|
|
|
|
free_strlist (sl);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case aSignKey:
|
2003-06-05 07:14:21 +00:00
|
|
|
if( argc != 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--sign-key user-id");
|
2006-04-19 11:26:11 +00:00
|
|
|
/* fall through */
|
2003-06-05 07:14:21 +00:00
|
|
|
case aLSignKey:
|
|
|
|
if( argc != 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--lsign-key user-id");
|
2006-04-19 11:26:11 +00:00
|
|
|
/* fall through */
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
sl=NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if(cmd==aSignKey)
|
|
|
|
append_to_strlist(&sl,"sign");
|
|
|
|
else if(cmd==aLSignKey)
|
|
|
|
append_to_strlist(&sl,"lsign");
|
|
|
|
else
|
|
|
|
BUG();
|
|
|
|
|
|
|
|
append_to_strlist( &sl, "save" );
|
2003-06-05 07:14:21 +00:00
|
|
|
username = make_username( fname );
|
2010-10-01 20:33:53 +00:00
|
|
|
keyedit_menu (ctrl, username, locusr, sl, 0, 0 );
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(username);
|
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
case aEditKey: /* Edit a key signature */
|
|
|
|
if( !argc )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--edit-key user-id [commands]");
|
2003-06-05 07:14:21 +00:00
|
|
|
username = make_username( fname );
|
|
|
|
if( argc > 1 ) {
|
|
|
|
sl = NULL;
|
|
|
|
for( argc--, argv++ ; argc; argc--, argv++ )
|
|
|
|
append_to_strlist( &sl, *argv );
|
2010-10-01 20:33:53 +00:00
|
|
|
keyedit_menu (ctrl, username, locusr, sl, 0, 1 );
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
}
|
|
|
|
else
|
2010-10-01 20:33:53 +00:00
|
|
|
keyedit_menu (ctrl, username, locusr, NULL, 0, 1 );
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(username);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
2010-01-08 19:18:49 +00:00
|
|
|
case aPasswd:
|
|
|
|
if (argc != 1)
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("--change-passphrase <user-id>");
|
2010-01-08 19:18:49 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
username = make_username (fname);
|
2010-10-26 09:10:29 +00:00
|
|
|
keyedit_passwd (ctrl, username);
|
2010-01-08 19:18:49 +00:00
|
|
|
xfree (username);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aDeleteKeys:
|
|
|
|
case aDeleteSecretKeys:
|
|
|
|
case aDeleteSecretAndPublicKeys:
|
|
|
|
sl = NULL;
|
2020-07-09 11:24:54 +02:00
|
|
|
/* Print a note if the user did not specify any key. */
|
|
|
|
if (!argc && !opt.quiet)
|
|
|
|
log_info (_("Note: %s\n"), gpg_strerror (GPG_ERR_NO_KEY));
|
|
|
|
/* I'm adding these in reverse order as add_to_strlist2
|
2003-06-05 07:14:21 +00:00
|
|
|
reverses them again, and it's easier to understand in the
|
|
|
|
proper order :) */
|
|
|
|
for( ; argc; argc-- )
|
|
|
|
add_to_strlist2( &sl, argv[argc-1], utf8_strings );
|
2017-03-31 20:03:52 +02:00
|
|
|
delete_keys (ctrl, sl,
|
|
|
|
cmd==aDeleteSecretKeys, cmd==aDeleteSecretAndPublicKeys);
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aCheckKeys:
|
2017-05-10 11:01:15 +09:00
|
|
|
opt.check_sigs = 1; /* fall through */
|
2003-06-05 07:14:21 +00:00
|
|
|
case aListSigs:
|
2017-05-10 11:01:15 +09:00
|
|
|
opt.list_sigs = 1; /* fall through */
|
2003-06-05 07:14:21 +00:00
|
|
|
case aListKeys:
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++ )
|
|
|
|
add_to_strlist2( &sl, *argv, utf8_strings );
|
2019-07-04 15:13:26 +02:00
|
|
|
public_key_list (ctrl, sl, 0, 0);
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
case aListSecretKeys:
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++ )
|
|
|
|
add_to_strlist2( &sl, *argv, utf8_strings );
|
2010-10-01 20:33:53 +00:00
|
|
|
secret_key_list (ctrl, sl);
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
2008-05-07 15:40:36 +00:00
|
|
|
case aLocateKeys:
|
2019-07-04 15:13:26 +02:00
|
|
|
case aLocateExtKeys:
|
2008-05-07 15:40:36 +00:00
|
|
|
sl = NULL;
|
|
|
|
for (; argc; argc--, argv++)
|
|
|
|
add_to_strlist2( &sl, *argv, utf8_strings );
|
2019-08-23 13:22:15 +02:00
|
|
|
if (cmd == aLocateExtKeys && akl_empty_or_only_local ())
|
|
|
|
{
|
|
|
|
/* This is a kludge to let --locate-external-keys even
|
|
|
|
* work if the config file has --no-auto-key-locate. This
|
|
|
|
* better matches the expectations of the user. */
|
|
|
|
release_akl ();
|
|
|
|
parse_auto_key_locate (DEFAULT_AKL_LIST);
|
|
|
|
}
|
2019-07-04 15:13:26 +02:00
|
|
|
public_key_list (ctrl, sl, 1, cmd == aLocateExtKeys);
|
2019-08-23 13:22:15 +02:00
|
|
|
|
|
|
|
|
2008-05-07 15:40:36 +00:00
|
|
|
free_strlist (sl);
|
|
|
|
break;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2014-07-23 15:12:43 +02:00
|
|
|
case aQuickKeygen:
|
2016-06-02 18:38:10 +02:00
|
|
|
{
|
|
|
|
const char *x_algo, *x_usage, *x_expire;
|
|
|
|
|
|
|
|
if (argc < 1 || argc > 4)
|
2016-12-15 15:32:51 +01:00
|
|
|
wrong_args("--quick-generate-key USER-ID [ALGO [USAGE [EXPIRE]]]");
|
2016-06-02 18:38:10 +02:00
|
|
|
username = make_username (fname);
|
|
|
|
argv++, argc--;
|
|
|
|
x_algo = "";
|
|
|
|
x_usage = "";
|
|
|
|
x_expire = "";
|
|
|
|
if (argc)
|
|
|
|
{
|
|
|
|
x_algo = *argv++; argc--;
|
|
|
|
if (argc)
|
|
|
|
{
|
|
|
|
x_usage = *argv++; argc--;
|
|
|
|
if (argc)
|
2016-06-07 14:16:32 +09:00
|
|
|
{
|
|
|
|
x_expire = *argv++; argc--;
|
|
|
|
}
|
2016-06-02 18:38:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
quick_generate_keypair (ctrl, username, x_algo, x_usage, x_expire);
|
|
|
|
xfree (username);
|
|
|
|
}
|
2014-07-23 15:12:43 +02:00
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aKeygen: /* generate a key */
|
|
|
|
if( opt.batch ) {
|
|
|
|
if( argc > 1 )
|
2016-11-14 16:59:23 +01:00
|
|
|
wrong_args("--generate-key [parameterfile]");
|
2014-09-27 15:14:13 +02:00
|
|
|
generate_keypair (ctrl, 0, argc? *argv : NULL, NULL, 0);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else {
|
2015-04-14 18:48:57 -04:00
|
|
|
if (opt.command_fd != -1 && argc)
|
|
|
|
{
|
|
|
|
if( argc > 1 )
|
2016-11-14 16:59:23 +01:00
|
|
|
wrong_args("--generate-key [parameterfile]");
|
2015-04-14 18:48:57 -04:00
|
|
|
|
|
|
|
opt.batch = 1;
|
|
|
|
generate_keypair (ctrl, 0, argc? *argv : NULL, NULL, 0);
|
|
|
|
}
|
|
|
|
else if (argc)
|
2016-11-14 16:59:23 +01:00
|
|
|
wrong_args ("--generate-key");
|
2015-04-14 18:48:57 -04:00
|
|
|
else
|
|
|
|
generate_keypair (ctrl, 0, NULL, NULL, 0);
|
2014-09-27 15:14:13 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aFullKeygen: /* Generate a key with all options. */
|
|
|
|
if (opt.batch)
|
|
|
|
{
|
|
|
|
if (argc > 1)
|
2016-12-09 15:10:39 +01:00
|
|
|
wrong_args ("--full-generate-key [parameterfile]");
|
2014-09-27 15:14:13 +02:00
|
|
|
generate_keypair (ctrl, 1, argc? *argv : NULL, NULL, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (argc)
|
2016-12-09 15:10:39 +01:00
|
|
|
wrong_args("--full-generate-key");
|
2014-09-27 15:14:13 +02:00
|
|
|
generate_keypair (ctrl, 1, NULL, NULL, 0);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2015-05-08 16:08:57 +02:00
|
|
|
case aQuickAddUid:
|
|
|
|
{
|
|
|
|
const char *uid, *newuid;
|
|
|
|
|
|
|
|
if (argc != 2)
|
2016-12-15 15:32:51 +01:00
|
|
|
wrong_args ("--quick-add-uid USER-ID NEW-USER-ID");
|
2015-05-08 16:08:57 +02:00
|
|
|
uid = *argv++; argc--;
|
|
|
|
newuid = *argv++; argc--;
|
|
|
|
keyedit_quick_adduid (ctrl, uid, newuid);
|
|
|
|
}
|
2016-06-02 15:54:48 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aQuickAddKey:
|
|
|
|
{
|
|
|
|
const char *x_fpr, *x_algo, *x_usage, *x_expire;
|
|
|
|
|
|
|
|
if (argc < 1 || argc > 4)
|
2016-12-15 15:32:51 +01:00
|
|
|
wrong_args ("--quick-add-key FINGERPRINT [ALGO [USAGE [EXPIRE]]]");
|
2016-06-02 15:54:48 +02:00
|
|
|
x_fpr = *argv++; argc--;
|
|
|
|
x_algo = "";
|
|
|
|
x_usage = "";
|
|
|
|
x_expire = "";
|
|
|
|
if (argc)
|
|
|
|
{
|
|
|
|
x_algo = *argv++; argc--;
|
|
|
|
if (argc)
|
|
|
|
{
|
|
|
|
x_usage = *argv++; argc--;
|
|
|
|
if (argc)
|
2016-06-07 14:16:32 +09:00
|
|
|
{
|
|
|
|
x_expire = *argv++; argc--;
|
|
|
|
}
|
2016-06-02 15:54:48 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
keyedit_quick_addkey (ctrl, x_fpr, x_algo, x_usage, x_expire);
|
|
|
|
}
|
2015-05-08 16:08:57 +02:00
|
|
|
break;
|
|
|
|
|
2016-06-16 18:05:57 -04:00
|
|
|
case aQuickRevUid:
|
|
|
|
{
|
|
|
|
const char *uid, *uidtorev;
|
|
|
|
|
|
|
|
if (argc != 2)
|
2016-12-15 15:32:51 +01:00
|
|
|
wrong_args ("--quick-revoke-uid USER-ID USER-ID-TO-REVOKE");
|
2016-06-16 18:05:57 -04:00
|
|
|
uid = *argv++; argc--;
|
|
|
|
uidtorev = *argv++; argc--;
|
|
|
|
keyedit_quick_revuid (ctrl, uid, uidtorev);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2016-12-05 10:58:39 +01:00
|
|
|
case aQuickSetExpire:
|
|
|
|
{
|
|
|
|
const char *x_fpr, *x_expire;
|
|
|
|
|
2017-07-21 14:12:55 +02:00
|
|
|
if (argc < 2)
|
|
|
|
wrong_args ("--quick-set-exipre FINGERPRINT EXPIRE [SUBKEY-FPRS]");
|
2016-12-05 10:58:39 +01:00
|
|
|
x_fpr = *argv++; argc--;
|
|
|
|
x_expire = *argv++; argc--;
|
2017-07-21 14:12:55 +02:00
|
|
|
keyedit_quick_set_expire (ctrl, x_fpr, x_expire, argv);
|
2016-12-05 10:58:39 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2017-03-21 14:47:21 +01:00
|
|
|
case aQuickSetPrimaryUid:
|
|
|
|
{
|
|
|
|
const char *uid, *primaryuid;
|
|
|
|
|
|
|
|
if (argc != 2)
|
|
|
|
wrong_args ("--quick-set-primary-uid USER-ID PRIMARY-USER-ID");
|
|
|
|
uid = *argv++; argc--;
|
|
|
|
primaryuid = *argv++; argc--;
|
|
|
|
keyedit_quick_set_primary (ctrl, uid, primaryuid);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aFastImport:
|
2017-05-10 11:01:15 +09:00
|
|
|
opt.import_options |= IMPORT_FAST; /* fall through */
|
2003-06-05 07:14:21 +00:00
|
|
|
case aImport:
|
2018-06-06 11:50:58 +02:00
|
|
|
case aShowKeys:
|
2017-07-13 18:22:36 +02:00
|
|
|
import_keys (ctrl, argc? argv:NULL, argc, NULL,
|
2017-07-24 21:07:03 +02:00
|
|
|
opt.import_options, opt.key_origin, opt.key_origin_url);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
2006-04-28 14:31:29 +00:00
|
|
|
/* TODO: There are a number of command that use this same
|
|
|
|
"make strlist, call function, report error, free strlist"
|
|
|
|
pattern. Join them together here and avoid all that
|
|
|
|
duplicated code. */
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aExport:
|
|
|
|
case aSendKeys:
|
|
|
|
case aRecvKeys:
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++ )
|
2006-04-28 14:31:29 +00:00
|
|
|
append_to_strlist2( &sl, *argv, utf8_strings );
|
2003-06-05 07:14:21 +00:00
|
|
|
if( cmd == aSendKeys )
|
2010-10-01 20:33:53 +00:00
|
|
|
rc = keyserver_export (ctrl, sl );
|
2003-06-05 07:14:21 +00:00
|
|
|
else if( cmd == aRecvKeys )
|
2010-10-01 20:33:53 +00:00
|
|
|
rc = keyserver_import (ctrl, sl );
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
2015-11-12 16:02:35 +01:00
|
|
|
{
|
|
|
|
export_stats_t stats = export_new_stats ();
|
|
|
|
rc = export_pubkeys (ctrl, sl, opt.export_options, stats);
|
|
|
|
export_print_stats (stats);
|
|
|
|
export_release_stats (stats);
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
if(rc)
|
|
|
|
{
|
|
|
|
if(cmd==aSendKeys)
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("send-keys", rc);
|
|
|
|
log_error(_("keyserver send failed: %s\n"),gpg_strerror (rc));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
else if(cmd==aRecvKeys)
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("recv-keys", rc);
|
|
|
|
log_error (_("keyserver receive failed: %s\n"),
|
|
|
|
gpg_strerror (rc));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("export", rc);
|
|
|
|
log_error (_("key export failed: %s\n"), gpg_strerror (rc));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
|
2016-01-08 17:22:32 +01:00
|
|
|
case aExportSshKey:
|
|
|
|
if (argc != 1)
|
|
|
|
wrong_args ("--export-ssh-key <user-id>");
|
|
|
|
rc = export_ssh_key (ctrl, argv[0]);
|
|
|
|
if (rc)
|
|
|
|
{
|
|
|
|
write_status_failure ("export-ssh-key", rc);
|
|
|
|
log_error (_("export as ssh key failed: %s\n"), gpg_strerror (rc));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aSearchKeys:
|
|
|
|
sl = NULL;
|
2011-01-18 12:51:16 +01:00
|
|
|
for (; argc; argc--, argv++)
|
|
|
|
append_to_strlist2 (&sl, *argv, utf8_strings);
|
2010-10-01 20:33:53 +00:00
|
|
|
rc = keyserver_search (ctrl, sl);
|
2011-01-18 12:51:16 +01:00
|
|
|
if (rc)
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("search-keys", rc);
|
|
|
|
log_error (_("keyserver search failed: %s\n"), gpg_strerror (rc));
|
|
|
|
}
|
2011-01-18 12:51:16 +01:00
|
|
|
free_strlist (sl);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aRefreshKeys:
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++ )
|
2006-04-28 14:31:29 +00:00
|
|
|
append_to_strlist2( &sl, *argv, utf8_strings );
|
2010-10-01 20:33:53 +00:00
|
|
|
rc = keyserver_refresh (ctrl, sl);
|
2003-06-05 07:14:21 +00:00
|
|
|
if(rc)
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("refresh-keys", rc);
|
|
|
|
log_error (_("keyserver refresh failed: %s\n"),gpg_strerror (rc));
|
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aFetchKeys:
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++ )
|
2006-04-28 14:31:29 +00:00
|
|
|
append_to_strlist2( &sl, *argv, utf8_strings );
|
2017-07-13 18:22:36 +02:00
|
|
|
rc = keyserver_fetch (ctrl, sl, opt.key_origin);
|
2006-04-19 11:26:11 +00:00
|
|
|
if(rc)
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("fetch-keys", rc);
|
|
|
|
log_error ("key fetch failed: %s\n",gpg_strerror (rc));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aExportSecret:
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++ )
|
|
|
|
add_to_strlist2( &sl, *argv, utf8_strings );
|
2015-11-12 16:02:35 +01:00
|
|
|
{
|
|
|
|
export_stats_t stats = export_new_stats ();
|
2017-03-01 14:41:47 +01:00
|
|
|
export_seckeys (ctrl, sl, opt.export_options, stats);
|
2015-11-12 16:02:35 +01:00
|
|
|
export_print_stats (stats);
|
|
|
|
export_release_stats (stats);
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aExportSecretSub:
|
|
|
|
sl = NULL;
|
|
|
|
for( ; argc; argc--, argv++ )
|
|
|
|
add_to_strlist2( &sl, *argv, utf8_strings );
|
2015-11-12 16:02:35 +01:00
|
|
|
{
|
|
|
|
export_stats_t stats = export_new_stats ();
|
2017-03-01 14:41:47 +01:00
|
|
|
export_secsubkeys (ctrl, sl, opt.export_options, stats);
|
2015-11-12 16:02:35 +01:00
|
|
|
export_print_stats (stats);
|
|
|
|
export_release_stats (stats);
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aGenRevoke:
|
|
|
|
if( argc != 1 )
|
2016-12-15 13:01:03 +01:00
|
|
|
wrong_args("--generate-revocation user-id");
|
2003-06-05 07:14:21 +00:00
|
|
|
username = make_username(*argv);
|
2017-03-31 20:03:52 +02:00
|
|
|
gen_revoke (ctrl, username );
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree( username );
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aDesigRevoke:
|
2015-10-19 15:04:45 +02:00
|
|
|
if (argc != 1)
|
2016-12-15 13:59:48 +01:00
|
|
|
wrong_args ("--generate-designated-revocation user-id");
|
2015-10-19 15:04:45 +02:00
|
|
|
username = make_username (*argv);
|
|
|
|
gen_desig_revoke (ctrl, username, locusr);
|
|
|
|
xfree (username);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aDeArmor:
|
|
|
|
if( argc > 1 )
|
|
|
|
wrong_args("--dearmor [file]");
|
2016-04-06 11:34:11 +02:00
|
|
|
rc = dearmor_file( argc? *argv: NULL );
|
2003-06-05 07:14:21 +00:00
|
|
|
if( rc )
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("dearmor", rc);
|
|
|
|
log_error (_("dearmoring failed: %s\n"), gpg_strerror (rc));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aEnArmor:
|
|
|
|
if( argc > 1 )
|
|
|
|
wrong_args("--enarmor [file]");
|
|
|
|
rc = enarmor_file( argc? *argv: NULL );
|
|
|
|
if( rc )
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("enarmor", rc);
|
|
|
|
log_error (_("enarmoring failed: %s\n"), gpg_strerror (rc));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case aPrimegen:
|
2006-04-19 11:26:11 +00:00
|
|
|
#if 0 /*FIXME*/
|
2003-06-05 07:14:21 +00:00
|
|
|
{ int mode = argc < 2 ? 0 : atoi(*argv);
|
|
|
|
|
|
|
|
if( mode == 1 && argc == 2 ) {
|
2010-03-15 11:15:45 +00:00
|
|
|
mpi_print (es_stdout,
|
|
|
|
generate_public_prime( atoi(argv[1]) ), 1);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else if( mode == 2 && argc == 3 ) {
|
2010-03-15 11:15:45 +00:00
|
|
|
mpi_print (es_stdout, generate_elg_prime(
|
2003-06-05 07:14:21 +00:00
|
|
|
0, atoi(argv[1]),
|
|
|
|
atoi(argv[2]), NULL,NULL ), 1);
|
|
|
|
}
|
|
|
|
else if( mode == 3 && argc == 3 ) {
|
2006-04-19 11:26:11 +00:00
|
|
|
MPI *factors;
|
2010-03-15 11:15:45 +00:00
|
|
|
mpi_print (es_stdout, generate_elg_prime(
|
2003-06-05 07:14:21 +00:00
|
|
|
1, atoi(argv[1]),
|
|
|
|
atoi(argv[2]), NULL,&factors ), 1);
|
2015-02-19 17:22:27 +01:00
|
|
|
es_putc ('\n', es_stdout);
|
2010-03-15 11:15:45 +00:00
|
|
|
mpi_print (es_stdout, factors[0], 1 ); /* print q */
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else if( mode == 4 && argc == 3 ) {
|
2006-04-19 11:26:11 +00:00
|
|
|
MPI g = mpi_alloc(1);
|
2010-03-15 11:15:45 +00:00
|
|
|
mpi_print (es_stdout, generate_elg_prime(
|
2003-06-05 07:14:21 +00:00
|
|
|
0, atoi(argv[1]),
|
|
|
|
atoi(argv[2]), g, NULL ), 1);
|
2015-02-19 17:22:27 +01:00
|
|
|
es_putc ('\n', es_stdout);
|
2010-03-15 11:15:45 +00:00
|
|
|
mpi_print (es_stdout, g, 1 );
|
|
|
|
mpi_free (g);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
wrong_args("--gen-prime mode bits [qbits] ");
|
2015-02-19 17:22:27 +01:00
|
|
|
es_putc ('\n', es_stdout);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2003-06-18 19:56:13 +00:00
|
|
|
#endif
|
2006-04-19 11:26:11 +00:00
|
|
|
wrong_args("--gen-prime not yet supported ");
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aGenRandom:
|
|
|
|
{
|
2020-08-04 11:03:49 +02:00
|
|
|
int level = argc ? atoi(*argv):0;
|
|
|
|
int count = argc > 1 ? atoi(argv[1]): 0;
|
|
|
|
int endless = !count;
|
|
|
|
int hexhack = (level == 16);
|
|
|
|
|
|
|
|
if (hexhack)
|
|
|
|
level = 1;
|
|
|
|
|
|
|
|
if (argc < 1 || argc > 2 || level < 0 || level > 2 || count < 0)
|
|
|
|
wrong_args ("--gen-random 0|1|2 [count]");
|
|
|
|
|
|
|
|
while (endless || count)
|
|
|
|
{
|
|
|
|
byte *p;
|
|
|
|
/* We need a multiple of 3, so that in case of armored
|
|
|
|
* output we get a correct string. No linefolding is
|
|
|
|
* done, as it is best to leave this to other tools */
|
|
|
|
size_t n = !endless && count < 99? count : 99;
|
|
|
|
size_t nn;
|
|
|
|
|
|
|
|
p = gcry_random_bytes (n, level);
|
2003-06-05 07:14:21 +00:00
|
|
|
#ifdef HAVE_DOSISH_SYSTEM
|
2020-08-04 11:03:49 +02:00
|
|
|
setmode ( fileno(stdout), O_BINARY );
|
2003-06-05 07:14:21 +00:00
|
|
|
#endif
|
2020-08-04 11:03:49 +02:00
|
|
|
if (hexhack)
|
|
|
|
{
|
|
|
|
for (nn = 0; nn < n; nn++)
|
|
|
|
es_fprintf (es_stdout, "%02x", p[nn]);
|
|
|
|
}
|
|
|
|
else if (opt.armor)
|
|
|
|
{
|
|
|
|
char *tmp = make_radix64_string (p, n);
|
|
|
|
es_fputs (tmp, es_stdout);
|
|
|
|
xfree (tmp);
|
|
|
|
if (n%3 == 1)
|
|
|
|
es_putc ('=', es_stdout);
|
|
|
|
if (n%3)
|
|
|
|
es_putc ('=', es_stdout);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
es_fwrite( p, n, 1, es_stdout );
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2020-08-04 11:03:49 +02:00
|
|
|
xfree(p);
|
|
|
|
if (!endless)
|
|
|
|
count -= n;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2020-08-04 11:03:49 +02:00
|
|
|
if (opt.armor || hexhack)
|
|
|
|
es_putc ('\n', es_stdout);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aPrintMD:
|
|
|
|
if( argc < 1)
|
|
|
|
wrong_args("--print-md algo [files]");
|
|
|
|
{
|
|
|
|
int all_algos = (**argv=='*' && !(*argv)[1]);
|
2003-06-18 19:56:13 +00:00
|
|
|
int algo = all_algos? 0 : gcry_md_map_name (*argv);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
if( !algo && !all_algos )
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("invalid hash algorithm '%s'\n"), *argv );
|
2003-06-05 07:14:21 +00:00
|
|
|
else {
|
|
|
|
argc--; argv++;
|
|
|
|
if( !argc )
|
|
|
|
print_mds(NULL, algo);
|
|
|
|
else {
|
|
|
|
for(; argc; argc--, argv++ )
|
|
|
|
print_mds(*argv, algo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aPrintMDs: /* old option */
|
|
|
|
if( !argc )
|
|
|
|
print_mds(NULL,0);
|
|
|
|
else {
|
|
|
|
for(; argc; argc--, argv++ )
|
|
|
|
print_mds(*argv,0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#ifndef NO_TRUST_MODELS
|
2003-06-05 07:14:21 +00:00
|
|
|
case aListTrustDB:
|
|
|
|
if( !argc )
|
2017-03-31 20:03:52 +02:00
|
|
|
list_trustdb (ctrl, es_stdout, NULL);
|
2003-06-05 07:14:21 +00:00
|
|
|
else {
|
|
|
|
for( ; argc; argc--, argv++ )
|
2017-03-31 20:03:52 +02:00
|
|
|
list_trustdb (ctrl, es_stdout, *argv );
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aUpdateTrustDB:
|
|
|
|
if( argc )
|
|
|
|
wrong_args("--update-trustdb");
|
2016-05-21 11:41:49 +02:00
|
|
|
update_trustdb (ctrl);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aCheckTrustDB:
|
|
|
|
/* Old versions allowed for arguments - ignore them */
|
2016-05-21 11:41:49 +02:00
|
|
|
check_trustdb (ctrl);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aFixTrustDB:
|
2009-07-22 09:43:10 +00:00
|
|
|
how_to_fix_the_trustdb ();
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aListTrustPath:
|
|
|
|
if( !argc )
|
|
|
|
wrong_args("--list-trust-path <user-ids>");
|
|
|
|
for( ; argc; argc--, argv++ ) {
|
|
|
|
username = make_username( *argv );
|
|
|
|
list_trust_path( username );
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(username);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case aExportOwnerTrust:
|
|
|
|
if( argc )
|
|
|
|
wrong_args("--export-ownertrust");
|
2017-03-31 20:03:52 +02:00
|
|
|
export_ownertrust (ctrl);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case aImportOwnerTrust:
|
|
|
|
if( argc > 1 )
|
|
|
|
wrong_args("--import-ownertrust [file]");
|
2017-03-31 20:03:52 +02:00
|
|
|
import_ownertrust (ctrl, argc? *argv:NULL );
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
gpg: Allow building without any trust model support.
* configure.ac: Add option --disable-trust-models
(NO_TRUST_MODELS): New ac_define and am_conditional.
* g10/Makefile.am (trust_source): New.
(gpg2_SOURCES): Factor some files out to above. Add trust.c.
* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
--list-trustdb, --trustdb-name, --auto-check-trustdb,
--no-auto-check-trustdb, and --force-ownertrust.
(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
trustdb related option code.
* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
"enable", and "disable".
* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
"tru" record.
* g10/trust.c: New.
* g10/trustdb.c (struct key_item): Move to trustdb.h.
(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
(register_trusted_key): Rename to tdb_register_trusted_key.
(trust_letter, uid_trust_string_fixed, trust_value_to_string)
(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
(get_ownertrust_string, get_validity_info, get_validity_string)
(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
(mark_usable_uid_certs): Move to trust.c and make global.
(is_in_klist): Move as inline to trustdb.h.
(trustdb_check_or_update): Rename to tdb_check_or_update
(revalidation_mark): Rename to tdb_revalidation_mark.
(get_ownertrust): Rename to tdb_get_ownertrust.
(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
(update_ownertrust): Rename to tdb_update_ownertrust.
(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
(cache_disabled_value): Rename to tdb_cache_disabled_value.
(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
factor some code out to ...
* trust.c (get_validity): ...new.
(check_or_update_trustdb): New wrapper.
(revalidation_mark): New wrapper.
(get_ownertrust): New wrapper.
(get_ownertrust_with_min): New wrapper.
(update_ownertrust): New wrapper.
(clear_ownertrusts): New wrapper.
(cache_disabled_value): New wrapper.
(check_trustdb_stale): New wrapper.
* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
of --always-trust.
2014-02-10 17:05:54 +01:00
|
|
|
#endif /*!NO_TRUST_MODELS*/
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
case aRebuildKeydbCaches:
|
|
|
|
if (argc)
|
|
|
|
wrong_args ("--rebuild-keydb-caches");
|
2017-03-31 20:03:52 +02:00
|
|
|
keydb_rebuild_caches (ctrl, 1);
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
#ifdef ENABLE_CARD_SUPPORT
|
|
|
|
case aCardStatus:
|
2017-03-27 14:02:01 +09:00
|
|
|
if (argc == 0)
|
2017-03-31 20:03:52 +02:00
|
|
|
card_status (ctrl, es_stdout, NULL);
|
2017-03-27 14:02:01 +09:00
|
|
|
else if (argc == 1)
|
2017-03-31 20:03:52 +02:00
|
|
|
card_status (ctrl, es_stdout, *argv);
|
2017-03-27 14:02:01 +09:00
|
|
|
else
|
|
|
|
wrong_args ("--card-status [serialno]");
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
2003-07-24 09:06:43 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case aCardEdit:
|
|
|
|
if (argc) {
|
|
|
|
sl = NULL;
|
|
|
|
for (argc--, argv++ ; argc; argc--, argv++)
|
|
|
|
append_to_strlist (&sl, *argv);
|
2010-10-01 20:33:53 +00:00
|
|
|
card_edit (ctrl, sl);
|
2006-04-19 11:26:11 +00:00
|
|
|
free_strlist (sl);
|
2003-09-18 15:51:18 +00:00
|
|
|
}
|
2006-04-19 11:26:11 +00:00
|
|
|
else
|
2010-10-01 20:33:53 +00:00
|
|
|
card_edit (ctrl, NULL);
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
2003-09-18 15:51:18 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case aChangePIN:
|
|
|
|
if (!argc)
|
|
|
|
change_pin (0,1);
|
|
|
|
else if (argc == 1)
|
|
|
|
change_pin (atoi (*argv),1);
|
|
|
|
else
|
2015-08-25 09:03:31 +02:00
|
|
|
wrong_args ("--change-pin [no]");
|
2006-04-19 11:26:11 +00:00
|
|
|
break;
|
|
|
|
#endif /* ENABLE_CARD_SUPPORT*/
|
2004-03-23 13:03:09 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
case aListConfig:
|
|
|
|
{
|
|
|
|
char *str=collapse_args(argc,argv);
|
|
|
|
list_config(str);
|
|
|
|
xfree(str);
|
|
|
|
}
|
|
|
|
break;
|
2004-03-23 13:03:09 +00:00
|
|
|
|
2015-03-10 15:26:02 +01:00
|
|
|
case aListGcryptConfig:
|
|
|
|
/* Fixme: It would be nice to integrate that with
|
|
|
|
--list-config but unfortunately there is no way yet to have
|
|
|
|
libgcrypt print it to an estream for further parsing. */
|
|
|
|
gcry_control (GCRYCTL_PRINT_CONFIG, stdout);
|
|
|
|
break;
|
|
|
|
|
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
|
|
|
case aTOFUPolicy:
|
2015-10-20 17:32:23 +02:00
|
|
|
#ifdef USE_TOFU
|
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
|
|
|
{
|
|
|
|
int policy;
|
|
|
|
int i;
|
|
|
|
KEYDB_HANDLE hd;
|
|
|
|
|
|
|
|
if (argc < 2)
|
2015-12-03 16:19:35 +01:00
|
|
|
wrong_args ("--tofu-policy POLICY KEYID [KEYID...]");
|
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
|
|
|
|
|
|
|
policy = parse_tofu_policy (argv[0]);
|
|
|
|
|
2019-09-09 14:34:09 +02:00
|
|
|
hd = keydb_new (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
|
|
|
if (! hd)
|
2018-04-06 17:32:08 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("tofu-driver", gpg_error(GPG_ERR_GENERAL));
|
|
|
|
g10_exit (1);
|
|
|
|
}
|
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-31 11:40:33 +02:00
|
|
|
tofu_begin_batch_update (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
|
|
|
for (i = 1; i < argc; i ++)
|
|
|
|
{
|
|
|
|
KEYDB_SEARCH_DESC desc;
|
|
|
|
kbnode_t kb;
|
|
|
|
|
|
|
|
rc = classify_user_id (argv[i], &desc, 0);
|
|
|
|
if (rc)
|
|
|
|
{
|
2015-12-03 10:39:29 +01:00
|
|
|
log_error (_("error parsing key specification '%s': %s\n"),
|
|
|
|
argv[i], gpg_strerror (rc));
|
2018-04-06 17:32:08 +02:00
|
|
|
write_status_failure ("tofu-driver", rc);
|
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
|
|
|
g10_exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! (desc.mode == KEYDB_SEARCH_MODE_SHORT_KID
|
|
|
|
|| desc.mode == KEYDB_SEARCH_MODE_LONG_KID
|
|
|
|
|| desc.mode == KEYDB_SEARCH_MODE_FPR
|
|
|
|
|| desc.mode == KEYDB_SEARCH_MODE_KEYGRIP))
|
|
|
|
{
|
|
|
|
log_error (_("'%s' does not appear to be a valid"
|
2015-12-03 10:39:29 +01:00
|
|
|
" key ID, fingerprint or keygrip\n"),
|
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
|
|
|
argv[i]);
|
2018-04-06 17:32:08 +02:00
|
|
|
write_status_failure ("tofu-driver",
|
|
|
|
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
|
|
|
g10_exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = keydb_search_reset (hd);
|
|
|
|
if (rc)
|
|
|
|
{
|
2015-12-03 10:39:29 +01:00
|
|
|
/* This should not happen, thus no need to tranalate
|
|
|
|
the string. */
|
|
|
|
log_error ("keydb_search_reset failed: %s\n",
|
|
|
|
gpg_strerror (rc));
|
2018-04-06 17:32:08 +02:00
|
|
|
write_status_failure ("tofu-driver", rc);
|
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
|
|
|
g10_exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = keydb_search (hd, &desc, 1, NULL);
|
2015-12-03 10:39:29 +01:00
|
|
|
if (rc)
|
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
|
|
|
{
|
2015-12-03 10:39:29 +01:00
|
|
|
log_error (_("key \"%s\" not found: %s\n"), argv[i],
|
|
|
|
gpg_strerror (rc));
|
2018-04-06 17:32:08 +02:00
|
|
|
write_status_failure ("tofu-driver", rc);
|
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
|
|
|
g10_exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = keydb_get_keyblock (hd, &kb);
|
|
|
|
if (rc)
|
|
|
|
{
|
2015-12-03 10:39:29 +01:00
|
|
|
log_error (_("error reading keyblock: %s\n"),
|
|
|
|
gpg_strerror (rc));
|
2018-04-06 17:32:08 +02:00
|
|
|
write_status_failure ("tofu-driver", rc);
|
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
|
|
|
g10_exit (1);
|
|
|
|
}
|
|
|
|
|
2017-03-31 20:03:52 +02:00
|
|
|
merge_keys_and_selfsig (ctrl, kb);
|
2016-05-21 12:26:44 +02:00
|
|
|
if (tofu_set_policy (ctrl, kb, policy))
|
2018-04-06 17:32:08 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("tofu-driver", rc);
|
|
|
|
g10_exit (1);
|
|
|
|
}
|
2016-12-06 12:14:49 +01:00
|
|
|
|
|
|
|
release_kbnode (kb);
|
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-31 11:40:33 +02:00
|
|
|
tofu_end_batch_update (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
|
|
|
|
2016-08-31 11:40:33 +02:00
|
|
|
keydb_release (hd);
|
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
|
|
|
}
|
2015-10-20 17:32:23 +02:00
|
|
|
#endif /*USE_TOFU*/
|
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
|
|
|
break;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
default:
|
2017-02-13 13:09:51 +01:00
|
|
|
if (!opt.quiet)
|
|
|
|
log_info (_("WARNING: no command supplied."
|
|
|
|
" Trying to guess what you mean ...\n"));
|
2017-05-10 11:01:15 +09:00
|
|
|
/*FALLTHRU*/
|
2017-02-13 13:09:51 +01:00
|
|
|
case aListPackets:
|
2003-06-05 07:14:21 +00:00
|
|
|
if( argc > 1 )
|
2016-12-15 16:06:49 +01:00
|
|
|
wrong_args("[filename]");
|
2003-06-05 07:14:21 +00:00
|
|
|
/* Issue some output for the unix newbie */
|
2010-04-14 14:39:16 +00:00
|
|
|
if (!fname && !opt.outfile
|
|
|
|
&& gnupg_isatty (fileno (stdin))
|
|
|
|
&& gnupg_isatty (fileno (stdout))
|
|
|
|
&& gnupg_isatty (fileno (stderr)))
|
2003-06-05 07:14:21 +00:00
|
|
|
log_info(_("Go ahead and type your message ...\n"));
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
a = iobuf_open(fname);
|
|
|
|
if (a && is_secured_file (iobuf_get_fd (a)))
|
|
|
|
{
|
|
|
|
iobuf_close (a);
|
|
|
|
a = NULL;
|
2010-04-01 13:24:55 +00:00
|
|
|
gpg_err_set_errno (EPERM);
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
|
|
|
if( !a )
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("can't open '%s'\n"), print_fname_stdin(fname));
|
2003-06-05 07:14:21 +00:00
|
|
|
else {
|
|
|
|
|
|
|
|
if( !opt.no_armor ) {
|
|
|
|
if( use_armor_filter( a ) ) {
|
2006-12-06 10:16:50 +00:00
|
|
|
afx = new_armor_context ();
|
|
|
|
push_armor_filter (afx, a);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if( cmd == aListPackets ) {
|
|
|
|
opt.list_packets=1;
|
2016-06-28 15:56:48 +09:00
|
|
|
set_packet_list_mode(1);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2010-10-01 20:33:53 +00:00
|
|
|
rc = proc_packets (ctrl, NULL, a );
|
2003-06-05 07:14:21 +00:00
|
|
|
if( rc )
|
2015-08-25 09:03:31 +02:00
|
|
|
{
|
|
|
|
write_status_failure ("-", rc);
|
|
|
|
log_error ("processing message failed: %s\n",
|
|
|
|
gpg_strerror (rc));
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
iobuf_close(a);
|
|
|
|
}
|
|
|
|
break;
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
/* cleanup */
|
2010-08-31 15:58:39 +00:00
|
|
|
gpg_deinit_default_ctrl (ctrl);
|
|
|
|
xfree (ctrl);
|
2006-12-06 10:16:50 +00:00
|
|
|
release_armor_context (afx);
|
2003-06-05 07:14:21 +00:00
|
|
|
FREE_STRLIST(remusr);
|
|
|
|
FREE_STRLIST(locusr);
|
|
|
|
g10_exit(0);
|
|
|
|
return 8; /*NEVER REACHED*/
|
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2003-06-27 20:53:09 +00:00
|
|
|
/* Note: This function is used by signal handlers!. */
|
|
|
|
static void
|
|
|
|
emergency_cleanup (void)
|
|
|
|
{
|
|
|
|
gcry_control (GCRYCTL_TERM_SECMEM );
|
|
|
|
}
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
g10_exit( int rc )
|
|
|
|
{
|
2018-04-06 17:32:08 +02:00
|
|
|
/* If we had an error but not printed an error message, do it now.
|
|
|
|
* Note that write_status_failure will never print a second failure
|
|
|
|
* status line. */
|
2018-04-12 11:49:36 +02:00
|
|
|
if (rc)
|
2018-04-06 17:32:08 +02:00
|
|
|
write_status_failure ("gpg-exit", gpg_error (GPG_ERR_GENERAL));
|
|
|
|
|
2003-07-29 08:53:19 +00:00
|
|
|
gcry_control (GCRYCTL_UPDATE_RANDOM_SEED_FILE);
|
2013-01-07 16:51:24 +01:00
|
|
|
if (DBG_CLOCK)
|
|
|
|
log_clock ("stop");
|
2015-06-20 15:03:32 +02:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if ( (opt.debug & DBG_MEMSTAT_VALUE) )
|
2003-07-29 08:53:19 +00:00
|
|
|
{
|
2015-06-20 15:03:32 +02:00
|
|
|
keydb_dump_stats ();
|
2017-03-31 20:03:43 +02:00
|
|
|
sig_check_dump_stats ();
|
2019-04-13 11:48:58 +02:00
|
|
|
objcache_dump_stats ();
|
2006-04-19 11:26:11 +00:00
|
|
|
gcry_control (GCRYCTL_DUMP_MEMORY_STATS);
|
|
|
|
gcry_control (GCRYCTL_DUMP_RANDOM_STATS);
|
2003-07-29 08:53:19 +00:00
|
|
|
}
|
|
|
|
if (opt.debug)
|
|
|
|
gcry_control (GCRYCTL_DUMP_SECMEM_STATS );
|
2006-04-19 11:26:11 +00:00
|
|
|
|
2019-06-04 13:39:46 +09:00
|
|
|
gnupg_block_all_signals ();
|
2003-07-29 08:53:19 +00:00
|
|
|
emergency_cleanup ();
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
rc = rc? rc : log_get_errorcount(0)? 2 : g10_errors_seen? 1 : 0;
|
|
|
|
exit (rc);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Pretty-print hex hashes. This assumes at least an 80-character
|
|
|
|
display, but there are a few other similar assumptions in the
|
|
|
|
display code. */
|
|
|
|
static void
|
2010-08-18 19:25:15 +00:00
|
|
|
print_hex (gcry_md_hd_t md, int algo, const char *fname)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
int i,n,count,indent=0;
|
|
|
|
const byte *p;
|
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
if (fname)
|
|
|
|
indent = es_printf("%s: ",fname);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
if (indent>40)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2015-02-19 17:22:27 +01:00
|
|
|
es_printf ("\n");
|
2003-06-05 07:14:21 +00:00
|
|
|
indent=0;
|
|
|
|
}
|
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
if (algo==DIGEST_ALGO_RMD160)
|
|
|
|
indent += es_printf("RMD160 = ");
|
|
|
|
else if (algo>0)
|
|
|
|
indent += es_printf("%6s = ", gcry_md_algo_name (algo));
|
2003-06-05 07:14:21 +00:00
|
|
|
else
|
2010-08-18 19:25:15 +00:00
|
|
|
algo = abs(algo);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
count = indent;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2003-06-18 19:56:13 +00:00
|
|
|
p = gcry_md_read (md, algo);
|
|
|
|
n = gcry_md_get_algo_dlen (algo);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
count += es_printf ("%02X",*p++);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
for(i=1;i<n;i++,p++)
|
|
|
|
{
|
|
|
|
if(n==16)
|
|
|
|
{
|
|
|
|
if(count+2>79)
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n%*s",indent," ");
|
|
|
|
count = indent;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else
|
2010-08-18 19:25:15 +00:00
|
|
|
count += es_printf(" ");
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
if (!(i%8))
|
|
|
|
count += es_printf(" ");
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else if (n==20)
|
|
|
|
{
|
|
|
|
if(!(i%2))
|
|
|
|
{
|
|
|
|
if(count+4>79)
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n%*s",indent," ");
|
2003-06-05 07:14:21 +00:00
|
|
|
count=indent;
|
|
|
|
}
|
|
|
|
else
|
2010-08-18 19:25:15 +00:00
|
|
|
count += es_printf(" ");
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
if (!(i%10))
|
|
|
|
count += es_printf(" ");
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(!(i%4))
|
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
if (count+8>79)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n%*s",indent," ");
|
2003-06-05 07:14:21 +00:00
|
|
|
count=indent;
|
|
|
|
}
|
|
|
|
else
|
2010-08-18 19:25:15 +00:00
|
|
|
count += es_printf(" ");
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
count += es_printf("%02X",*p);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("\n");
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2006-04-19 11:26:11 +00:00
|
|
|
print_hashline( gcry_md_hd_t md, int algo, const char *fname )
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2010-08-18 19:25:15 +00:00
|
|
|
int i, n;
|
|
|
|
const byte *p;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-18 19:25:15 +00:00
|
|
|
if ( fname )
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
for (p = fname; *p; p++ )
|
2010-08-18 19:25:15 +00:00
|
|
|
{
|
|
|
|
if ( *p <= 32 || *p > 127 || *p == ':' || *p == '%' )
|
|
|
|
es_printf ("%%%02X", *p );
|
2011-02-04 12:57:53 +01:00
|
|
|
else
|
2010-08-18 19:25:15 +00:00
|
|
|
es_putc (*p, es_stdout);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
}
|
2010-08-18 19:25:15 +00:00
|
|
|
es_putc (':', es_stdout);
|
|
|
|
es_printf ("%d:", algo);
|
|
|
|
p = gcry_md_read (md, algo);
|
|
|
|
n = gcry_md_get_algo_dlen (algo);
|
2011-02-04 12:57:53 +01:00
|
|
|
for(i=0; i < n ; i++, p++ )
|
2010-08-18 19:25:15 +00:00
|
|
|
es_printf ("%02X", *p);
|
|
|
|
es_fputs (":\n", es_stdout);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
2014-09-18 14:50:02 +02:00
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
static void
|
|
|
|
print_mds( const char *fname, int algo )
|
|
|
|
{
|
2015-02-19 17:22:27 +01:00
|
|
|
estream_t fp;
|
2014-09-18 14:50:02 +02:00
|
|
|
char buf[1024];
|
|
|
|
size_t n;
|
|
|
|
gcry_md_hd_t md;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2014-09-18 14:50:02 +02:00
|
|
|
if (!fname)
|
|
|
|
{
|
2015-02-19 17:22:27 +01:00
|
|
|
fp = es_stdin;
|
|
|
|
es_set_binary (fp);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2014-09-18 14:50:02 +02:00
|
|
|
else
|
|
|
|
{
|
2015-02-19 17:22:27 +01:00
|
|
|
fp = es_fopen (fname, "rb" );
|
|
|
|
if (fp && is_secured_file (es_fileno (fp)))
|
2014-09-18 14:50:02 +02:00
|
|
|
{
|
2015-02-19 17:22:27 +01:00
|
|
|
es_fclose (fp);
|
2014-09-18 14:50:02 +02:00
|
|
|
fp = NULL;
|
|
|
|
gpg_err_set_errno (EPERM);
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2014-09-18 14:50:02 +02:00
|
|
|
if (!fp)
|
|
|
|
{
|
|
|
|
log_error("%s: %s\n", fname?fname:"[stdin]", strerror(errno) );
|
|
|
|
return;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_open (&md, 0, 0);
|
|
|
|
if (algo)
|
|
|
|
gcry_md_enable (md, algo);
|
|
|
|
else
|
|
|
|
{
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_MD5))
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_enable (md, GCRY_MD_MD5);
|
|
|
|
gcry_md_enable (md, GCRY_MD_SHA1);
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_RMD160))
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_enable (md, GCRY_MD_RMD160);
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA224))
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_enable (md, GCRY_MD_SHA224);
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA256))
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_enable (md, GCRY_MD_SHA256);
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA384))
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_enable (md, GCRY_MD_SHA384);
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA512))
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_enable (md, GCRY_MD_SHA512);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
2015-02-19 17:22:27 +01:00
|
|
|
while ((n=es_fread (buf, 1, DIM(buf), fp)))
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_write (md, buf, n);
|
|
|
|
|
2015-02-19 17:22:27 +01:00
|
|
|
if (es_ferror(fp))
|
2014-09-18 14:50:02 +02:00
|
|
|
log_error ("%s: %s\n", fname?fname:"[stdin]", strerror(errno));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gcry_md_final (md);
|
|
|
|
if (opt.with_colons)
|
|
|
|
{
|
|
|
|
if ( algo )
|
|
|
|
print_hashline (md, algo, fname);
|
|
|
|
else
|
|
|
|
{
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_MD5))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hashline( md, GCRY_MD_MD5, fname );
|
|
|
|
print_hashline( md, GCRY_MD_SHA1, fname );
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_RMD160))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hashline( md, GCRY_MD_RMD160, fname );
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA224))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hashline (md, GCRY_MD_SHA224, fname);
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA256))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hashline( md, GCRY_MD_SHA256, fname );
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA384))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hashline ( md, GCRY_MD_SHA384, fname );
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA512))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hashline ( md, GCRY_MD_SHA512, fname );
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
}
|
2014-09-18 14:50:02 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (algo)
|
|
|
|
print_hex (md, -algo, fname);
|
|
|
|
else
|
|
|
|
{
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_MD5))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hex (md, GCRY_MD_MD5, fname);
|
|
|
|
print_hex (md, GCRY_MD_SHA1, fname );
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_RMD160))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hex (md, GCRY_MD_RMD160, fname );
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA224))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hex (md, GCRY_MD_SHA224, fname);
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA256))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hex (md, GCRY_MD_SHA256, fname );
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA384))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hex (md, GCRY_MD_SHA384, fname );
|
2014-09-18 14:56:39 +02:00
|
|
|
if (!gcry_md_test_algo (GCRY_MD_SHA512))
|
2014-09-18 14:50:02 +02:00
|
|
|
print_hex (md, GCRY_MD_SHA512, fname );
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-09-18 14:50:02 +02:00
|
|
|
gcry_md_close (md);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2015-02-19 17:22:27 +01:00
|
|
|
if (fp != es_stdin)
|
|
|
|
es_fclose (fp);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Check the supplied name,value string and add it to the notation
|
|
|
|
* data to be used for signatures. which==0 for sig notations, and 1
|
|
|
|
* for cert notations.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
add_notation_data( const char *string, int which )
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
struct notation *notation;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
notation=string_to_notation(string,utf8_strings);
|
|
|
|
if(notation)
|
|
|
|
{
|
|
|
|
if(which)
|
|
|
|
{
|
|
|
|
notation->next=opt.cert_notations;
|
|
|
|
opt.cert_notations=notation;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
notation->next=opt.sig_notations;
|
|
|
|
opt.sig_notations=notation;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
add_policy_url( const char *string, int which )
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
unsigned int i,critical=0;
|
2006-10-02 11:54:35 +00:00
|
|
|
strlist_t sl;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
if(*string=='!')
|
|
|
|
{
|
|
|
|
string++;
|
|
|
|
critical=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i=0;i<strlen(string);i++)
|
2006-04-19 11:26:11 +00:00
|
|
|
if( !isascii (string[i]) || iscntrl(string[i]))
|
2003-06-05 07:14:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
if(i==0 || i<strlen(string))
|
|
|
|
{
|
|
|
|
if(which)
|
|
|
|
log_error(_("the given certification policy URL is invalid\n"));
|
|
|
|
else
|
|
|
|
log_error(_("the given signature policy URL is invalid\n"));
|
|
|
|
}
|
|
|
|
|
|
|
|
if(which)
|
|
|
|
sl=add_to_strlist( &opt.cert_policy_url, string );
|
|
|
|
else
|
|
|
|
sl=add_to_strlist( &opt.sig_policy_url, string );
|
|
|
|
|
|
|
|
if(critical)
|
2011-02-04 12:57:53 +01:00
|
|
|
sl->flags |= 1;
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
2003-09-23 17:48:33 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
add_keyserver_url( const char *string, int which )
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
unsigned int i,critical=0;
|
2006-10-02 11:54:35 +00:00
|
|
|
strlist_t sl;
|
2003-09-23 17:48:33 +00:00
|
|
|
|
|
|
|
if(*string=='!')
|
|
|
|
{
|
|
|
|
string++;
|
|
|
|
critical=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i=0;i<strlen(string);i++)
|
2006-04-19 11:26:11 +00:00
|
|
|
if( !isascii (string[i]) || iscntrl(string[i]))
|
2003-09-23 17:48:33 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
if(i==0 || i<strlen(string))
|
|
|
|
{
|
|
|
|
if(which)
|
|
|
|
BUG();
|
|
|
|
else
|
2006-04-19 11:26:11 +00:00
|
|
|
log_error(_("the given preferred keyserver URL is invalid\n"));
|
2003-09-23 17:48:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if(which)
|
|
|
|
BUG();
|
|
|
|
else
|
|
|
|
sl=add_to_strlist( &opt.sig_keyserver_url, string );
|
|
|
|
|
|
|
|
if(critical)
|
2011-02-04 12:57:53 +01:00
|
|
|
sl->flags |= 1;
|
2003-09-23 17:48:33 +00:00
|
|
|
}
|
2016-11-16 09:02:53 +01:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
read_sessionkey_from_fd (int fd)
|
|
|
|
{
|
|
|
|
int i, len;
|
|
|
|
char *line;
|
|
|
|
|
2017-02-08 13:49:41 +01:00
|
|
|
if (! gnupg_fd_valid (fd))
|
|
|
|
log_fatal ("override-session-key-fd is invalid: %s\n", strerror (errno));
|
|
|
|
|
2016-11-16 09:02:53 +01:00
|
|
|
for (line = NULL, i = len = 100; ; i++ )
|
|
|
|
{
|
|
|
|
if (i >= len-1 )
|
|
|
|
{
|
|
|
|
char *tmp = line;
|
|
|
|
len += 100;
|
|
|
|
line = xmalloc_secure (len);
|
|
|
|
if (tmp)
|
|
|
|
{
|
|
|
|
memcpy (line, tmp, i);
|
|
|
|
xfree (tmp);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
i=0;
|
|
|
|
}
|
|
|
|
if (read (fd, line + i, 1) != 1 || line[i] == '\n')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
line[i] = 0;
|
|
|
|
log_debug ("seskey: %s\n", line);
|
|
|
|
gpgrt_annotate_leaked_object (line);
|
|
|
|
opt.override_session_key = line;
|
|
|
|
}
|