security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-04 20:38:50 +01:00
Code Activity
5b34e0264e
gnupg/g10/gpg.c

4207 lines
120 KiB
C
Raw Normal View History

Renamed g10.c to gpg.c Filelength fixes for W32.
2005-10-05 18:58:50 +02:00
/* gpg.c - The GnuPG utility (main for gpg)
* keydb.h, getkey.c (release_akl), gpg.c (main): Add --no-auto-key-locate. * options.h, gpg.c (main): Keep track of each keyserver registered so we can match on them later. * keyserver-internal.h, keyserver.c (cmp_keyserver_spec, keyserver_match), gpgv.c: New. Find a keyserver that matches ours and return its spec. * getkey.c (get_pubkey_byname): Use it here to get the per-keyserver options from an earlier keyserver.
2006-02-24 15:27:22 +01:00
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
* 2006 Free Software Foundation, Inc.
initially checkin
1997-11-18 15:06:00 +01:00
*
See ChangeLog: Wed Dec 23 13:34:22 CET 1998 Werner Koch
1998-12-23 13:41:40 +01:00
* This file is part of GnuPG.
initially checkin
1997-11-18 15:06:00 +01:00
*
See ChangeLog: Wed Dec 23 13:34:22 CET 1998 Werner Koch
1998-12-23 13:41:40 +01:00
* GnuPG is free software; you can redistribute it and/or modify
initially checkin
1997-11-18 15:06:00 +01:00
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
See ChangeLog: Wed Dec 23 13:34:22 CET 1998 Werner Koch
1998-12-23 13:41:40 +01:00
* GnuPG is distributed in the hope that it will be useful,
initially checkin
1997-11-18 15:06:00 +01:00
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
Updated FSF street address and preparations for a release candidate.
2005-05-31 10:39:18 +02:00
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA.
initially checkin
1997-11-18 15:06:00 +01:00
*/
#include <config.h>
added option file handling
1997-12-12 13:03:58 +01:00
#include <errno.h>
initially checkin
1997-11-18 15:06:00 +01:00
#include <stdio.h>
#include <stdlib.h>
added some trust model stuff
1998-01-16 22:15:24 +01:00
#include <string.h>
See ChangeLog: Tue Dec 8 13:15:16 CET 1998 Werner Koch
1998-12-08 13:20:53 +01:00
#include <ctype.h>
List and check sigs works
1997-12-01 11:33:23 +01:00
#include <unistd.h>
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
#include <assert.h>
See ChangeLog: Fri Jul 28 18:19:11 CEST 2000 Werner Koch
2000-07-28 18:19:07 +02:00
#ifdef HAVE_DOSISH_SYSTEM
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#include <fcntl.h> /* for setmode() */
See ChangeLog: Fri Jul 28 18:19:11 CEST 2000 Werner Koch
2000-07-28 18:19:07 +02:00
#endif
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
#ifdef HAVE_STAT
#include <sys/stat.h> /* for stat() */
#endif
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
#include <fcntl.h>
Finished PKA feature
2005-12-20 21:19:16 +01:00
#ifdef HAVE_W32_SYSTEM
#include <windows.h>
#endif
initially checkin
1997-11-18 15:06:00 +01:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#define INCLUDED_BY_MAIN_MODULE 1
initially checkin
1997-11-18 15:06:00 +01:00
#include "packet.h"
#include "iobuf.h"
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#include "memory.h"
initially checkin
1997-11-18 15:06:00 +01:00
#include "util.h"
#include "main.h"
#include "options.h"
#include "keydb.h"
See ChangeLog: Thu Mar 11 16:39:46 CET 1999 Werner Koch
1999-03-11 16:42:06 +01:00
#include "trustdb.h"
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#include "mpi.h"
#include "cipher.h"
Armor works now
1997-11-21 15:53:57 +01:00
#include "filter.h"
added some trust model stuff
1998-01-16 22:15:24 +01:00
#include "ttyio.h"
added initial i18n stuff
1998-01-26 23:09:01 +01:00
#include "i18n.h"
*** empty log message ***
1998-01-30 17:23:16 +01:00
#include "status.h"
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#include "keyserver-internal.h"
* exec.h, exec.c (set_exec_path, exec_write), g10.c (main): If USE_EXEC_PATH is defined at compile time, use it to lock the exec-path and not allow the user to change it.
2002-07-03 06:01:21 +02:00
#include "exec.h"
* cardglue.c (pin_cb): Detect whether an admin or regular PIN is requested. (genkey_status_cb): New. (agent_scd_genkey): Implemented. * keygen.c (generate_keypair): New arg CARD_SERIALNO and prepare parameters for on card key generation. Changed all callers. (do_generate_keypair): Add new arg card and merged casrd specific changes from 1.9. (proc_parameter_file): New arg card, apss it down to do_generate_keypair and changed all callers. (gen_card_key): New. * g10.c: Include cardclue.h. (main): s/app_set_default_reader_port/card_set_reader_port/. * cardglue.c (card_set_reader_port): New to address include file issues.
2003-10-08 17:21:20 +02:00
#include "cardglue.h"
* g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver. * ccid-driver.c (read_device_info): Removed. (make_reader_id, scan_or_find_devices): New. (ccid_open_reader): Simplified by make use of the new functions. (ccid_set_debug_level): New. Changed the macros to make use of it. It has turned out that it is often useful to enable debugging at runtime so I added this option.
2004-09-15 17:26:38 +02:00
#ifdef ENABLE_CARD_SUPPORT
#include "ccid-driver.h"
#endif
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
#if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__)
#define MY_O_BINARY O_BINARY
(S_IRGRP) [HAVE_DOSISH_SYSTEM]: Define to 0.
2004-11-18 17:01:08 +01:00
#ifndef S_IRGRP
# define S_IRGRP 0
# define S_IWGRP 0
#endif
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
#else
#define MY_O_BINARY 0
#endif
* g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver. * ccid-driver.c (read_device_info): Removed. (make_reader_id, scan_or_find_devices): New. (ccid_open_reader): Simplified by make use of the new functions. (ccid_set_debug_level): New. Changed the macros to make use of it. It has turned out that it is often useful to enable debugging at runtime so I added this option.
2004-09-15 17:26:38 +02:00
* g10.c (main): Add --no-groups to zero --group list. * encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically encrypted session key. Use --s2k-cipher-algo to choose cipher, rather than the default cipher. * parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically encrypted session key is seen without salt. Show in --list-packets if a symetrically encrypted session key is present. * pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless --quiet is set. Use text name of cipher in warning.
2003-10-01 17:15:58 +02:00
enum cmd_and_opt_values
{
aNull = 0,
bug fix release
1998-08-11 19:29:34 +02:00
oArmor = 'a',
aDetachedSign = 'b',
aSym = 'c',
aDecrypt = 'd',
aEncr = 'e',
See ChangeLog: Wed May 19 16:04:30 CEST 1999 Werner Koch
1999-05-19 16:12:26 +02:00
oInteractive = 'i',
bug fix release
1998-08-11 19:29:34 +02:00
oKOption = 'k',
oDryRun = 'n',
oOutput = 'o',
some random changes
1998-10-25 20:00:01 +01:00
oQuiet = 'q',
See ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch
1999-01-24 18:16:40 +01:00
oRecipient = 'r',
* g10.c (main): Add --no-throw-keyid. * keydb.h, encode.c (write_pubkey_enc_from_list), g10.c (main), pkclist.c (build_pk_list): Add --hidden-recipient (-R) and --hidden-encrypt-to, which do a single-user variation on --throw-keyid. The "hide this key" flag is carried in bit 0 of the pk_list flags field. * keyserver.c (parse_keyrec): Fix shadowing warning.
2002-11-01 17:15:45 +01:00
oHiddenRecipient = 'R',
bug fix release
1998-08-11 19:29:34 +02:00
aSign = 's',
(Does not compile yet)
1998-11-03 20:38:58 +01:00
oTextmodeShort= 't',
* g10.c (main): Add aliases sign-with->local-user and user->recipient to make switching from PGP command line to GPG easier.
2005-08-20 21:38:45 +02:00
oLocalUser = 'u',
bug fix release
1998-08-11 19:29:34 +02:00
oVerbose = 'v',
oCompress = 'z',
* options.skel: Use new hkp://subkeys.pgp.net as sample keyserver since they at least handle subkeys correctly. * options.h, g10.c (main), main.h, keylist.c (show_keyserver_url), mainproc.c (check_sig_and_print), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt, can_handle_critical): Add read-only support for preferred keyserver subpackets. They're basically policy URLs with a different name. Add a verify-option "show-preferred-keyserver" to turn them on and off (on by default, as per stable branch). * g10.c (main): Add "--set-notation" as alias to "--notation-data" this is to make things consistent with --set-policy-url meaning both sigs and certs.
2003-06-05 04:06:12 +02:00
oSetNotation = 'N',
* gpg.sgml: Document -K. * g10.c: Make -K an alias for --list-secret-keys. * keylist.c (print_card_serialno): New. Taken from gnupg 1.9.11. (list_keyblock_print): Make use of it. * keyedit.c (show_key_with_all_names): Print the card S/N. * keyedit.c (keyedit_menu): New command ADDCARDKEY. * card-util.c (card_generate_subkey): New. * keygen.c (generate_card_subkeypair): New. (gen_card_key): New arg IS_PRIMARY; changed all callers. * cardglue.c (open_card): Use shutdown code if possible. (check_card_serialno): Ditto.
2004-09-20 20:38:39 +02:00
aListSecretKeys = 'K',
bug fix release
1998-08-11 19:29:34 +02:00
oBatch = 500,
* options.h, g10.c (main), plaintext.c (handle_plaintext): Add --max-output option to help people deal with decompression bombs.
2004-02-19 00:09:27 +01:00
oMaxOutput,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oSigNotation,
oCertNotation,
oShowNotation,
oNoShowNotation,
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
aEncrFiles,
* g10.c (main): Add --symmetric --encrypt command. This generates a message that can be decrypted via a passphrase or public key system. * main.h, encode.c (encode_seskey): Allow passing in an already-created session key dek. (encode_simple): Use the actual symmetric cipher when encrypting a session key for a symmetric message. (encode_crypt): Add a flag to trigger a hybrid mode that can be decrypted via a passphrase or a pk. Change all callers. * mainproc.c (symkey_decrypt_sesskey): There is no way to tell the difference here between a bad passphrase and a cipher algorithm that we don't have, so use a error message that makes that clear. Use the actual list of ciphers when checking whether a cipher is invalid. Return error if the decrypted cipher algorithm is invalid. (proc_symkey_enc): In a mixed passphrase/pk message, if a valid dek already exists from decrypting via pk, do not try to process the passphrase. (proc_symkey_enc): Indicate when we're decrypting a session key as opposed to decrypting data. If a passphrase is invalid, discard the dek so we'll keep trying.
2003-10-26 04:26:14 +01:00
aEncrSym,
aDecryptFiles,
*** empty log message ***
1998-09-11 07:47:32 +02:00
aClearsign,
bug fix release
1998-08-11 19:29:34 +02:00
aStore,
aKeygen,
aSignEncr,
* g10.c (main): Add --symmetric --sign --encrypt. * main.h, encode.c (setup_symkey): New. Prompt for a passphrase and create a DEK for symmetric encryption. (write_symkey_enc): New. Write out symmetrically encrypted session keys. (encode_crypt, encrypt_filter): Use them here here when creating a message that can be decrypted with a passphrase or a pk. * sign.c (sign_file): Call setup_symkey if we are doing a --symmetric --sign --encrypt.
2003-11-13 03:54:12 +01:00
aSignEncrSym,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
aSignSym,
bug fix release
1998-08-11 19:29:34 +02:00
aSignKey,
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
aLSignKey,
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
aListConfig,
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
aGPGConfList,
New command --gpgconf-test.
2006-10-23 16:21:41 +02:00
aGPGConfTest,
bug fix release
1998-08-11 19:29:34 +02:00
aListPackets,
aEditKey,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
aDeleteKeys,
aDeleteSecretKeys,
aDeleteSecretAndPublicKeys,
bug fix release
1998-08-11 19:29:34 +02:00
aKMode,
aKModeC,
aImport,
some random changes
1998-10-25 20:00:01 +01:00
aFastImport,
bug fix release
1998-08-11 19:29:34 +02:00
aVerify,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
aVerifyFiles,
bug fix release
1998-08-11 19:29:34 +02:00
aListKeys,
aListSigs,
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 19:37:41 +01:00
aSendKeys,
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
1999-03-20 11:53:39 +01:00
aRecvKeys,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
aSearchKeys,
* keyserver.c (keyserver_spawn): Don't print "searching for key 00000000" when fetching a URI. * keyserver-internal.h, keyserver.c (keyserver_fetch): New. Fetch an arbitrary URI using the keyserver helpers. * gpg.c (main): Call it from here for --fetch-keys.
2005-12-07 23:34:11 +01:00
aRefreshKeys,
aFetchKeys,
bug fix release
1998-08-11 19:29:34 +02:00
aExport,
aExportSecret,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
aExportSecretSub,
bug fix release
1998-08-11 19:29:34 +02:00
aCheckKeys,
aGenRevoke,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
aDesigRevoke,
bug fix release
1998-08-11 19:29:34 +02:00
aPrimegen,
aPrintMD,
aPrintMDs,
aCheckTrustDB,
last local commit
1998-10-16 18:00:17 +02:00
aUpdateTrustDB,
a new release
1998-10-07 15:30:43 +02:00
aFixTrustDB,
bug fix release
1998-08-11 19:29:34 +02:00
aListTrustDB,
aListTrustPath,
aExportOwnerTrust,
* keydb.h: Err on the side of making an unknown signature a SIG rather than a CERT. * import.c (delete_inv_parts): Discard any key signatures that aren't key types (i.e. 0x00, 0x01, etc.) * g10.c (main): Add deprecated option warning for --list-ownertrust. Add --compression-algo alias for --compress-algo. Change --version output strings to match "showpref" strings, and make translatable. * status.c (do_get_from_fd): Accept 'y' as well as 'Y' for --command-fd boolean input. * trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX) * keyedit.c (show_key_with_all_names_colon): Show no-ks-modify flag.
2003-03-24 21:05:53 +01:00
aListOwnerTrust,
bug fix release
1998-08-11 19:29:34 +02:00
aImportOwnerTrust,
aDeArmor,
aEnArmor,
aGenRandom,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
aPipeMode,
aRebuildKeydbCaches,
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
aCardStatus,
aCardEdit,
aChangePIN,
*** empty log message ***
1998-09-11 07:47:32 +02:00
(Does not compile yet)
1998-11-03 20:38:58 +01:00
oTextmode,
* g10.c (main): Add --no-textmode. * export.c (do_export_stream), keyedit.c (show_key_with_all_names, menu_addrevoker), mainproc.c (check_sig_and_print), photoid.c (show_photos), sign.c (mk_notation_and_policy), trustdb.c (get_validity, reset_trust_records, validate_keys): Make some strings translatable. * mainproc.c (check_sig_and_print): Show digest algorithm and sig class when verifying a sig with --verbose on, and add version, pk and hash algorithms and sig class to VALIDSIG. * parse-packet.c (enum_sig_subpkt): Make a warning message a --verbose warning message since we don't need to warn every time we see an unknown critical (we only need to invalidate the signature). * trustdb.c (init_trustdb): Check the trustdb options even with TM_AUTO since the auto may become TM_CLASSIC or TM_OPENPGP.
2003-04-27 22:22:09 +02:00
oNoTextmode,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oExpert,
oNoExpert,
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
oDefSigExpire,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oAskSigExpire,
oNoAskSigExpire,
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
oDefCertExpire,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oAskCertExpire,
oNoAskCertExpire,
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
oDefCertLevel,
oMinCertLevel,
* plaintext.c: Copyright. * encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
2004-02-25 00:37:18 +01:00
oAskCertLevel,
oNoAskCertLevel,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oFingerprint,
See ChangeLog: Thu Jul 8 16:21:27 CEST 1999 Werner Koch
1999-07-08 16:24:35 +02:00
oWithFingerprint,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oAnswerYes,
oAnswerNo,
oKeyring,
* g10.c (main), keydb.c (keydb_add_resource, keydb_locate_writable): Rename --default-keyring as --primary-keyring. Stefan wins the naming contest.
2002-11-25 04:18:48 +01:00
oPrimaryKeyring,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oSecretKeyring,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oShowKeyring,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oDefaultKey,
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
oDefRecipient,
oDefRecipientSelf,
oNoDefRecipient,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oOptions,
oDebug,
oDebugAll,
* g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver. * ccid-driver.c (read_device_info): Removed. (make_reader_id, scan_or_find_devices): New. (ccid_open_reader): Simplified by make use of the new functions. (ccid_set_debug_level): New. Changed the macros to make use of it. It has turned out that it is often useful to enable debugging at runtime so I added this option.
2004-09-15 17:26:38 +02:00
oDebugCCIDDriver,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oStatusFD,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oStatusFile,
oAttributeFD,
oAttributeFile,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
oEmitVersion,
* main.h, g10.c (main), import.c (parse_import_options, fix_pks_corruption): It's really PKS corruption, not HKP corruption. Keep the old repair-hkp-subkey-bug command as an alias. * g10.c (main): Rename --no-version to --no-emit-version for consistency. Keep --no-version as an alias.
2003-04-09 03:57:46 +02:00
oNoEmitVersion,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oCompletesNeeded,
oMarginalsNeeded,
See ChangeLog ;-). Key validation should now be faster
1998-11-13 20:41:41 +01:00
oMaxCertDepth,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oLoadExtension,
* trustdb.h, trustdb.c (is_disabled), gpgv.c (is_disabled): Rename is_disabled to cache_disabled_value, which now takes a pk and not just the keyid. This is for speed since there is no need to re-fetch a key when we already have that key handy. Cache the result of the check so we don't need to hit the trustdb more than once. * getkey.c (skip_disabled): New function to get a pk and call is_disabled on it. (key_byname): Use it here. * packet.h, getkey.c (skip_disabled), keylist.c (print_capabilities): New "pk_is_disabled" macro to retrieve the cached disabled value if available, and fill it in via cache_disabled_value if not available. * trustdb.c (get_validity): Cache the disabled value since we have it handy and it might be useful later. * parse-packet.c (parse_key): Clear disabled flag when parsing a new key. Just in case someone forgets to clear the whole key. * getkey.c (merge_selfsigs_main): Add an "if all else fails" path for setting a single user ID primary when there are multiple set primaries all at the same second, or no primaries set and the most recent user IDs are at the same second, or no signed user IDs at all. This is arbitrary, but deterministic. * exec.h, photoid.h: Add copyright message. * keylist.c (list_keyblock_print): Don't dump attribs for revoked/expired/etc uids for non-colon key listings. This is for consistency with --show-photos. * main.h, keylist.c (dump_attribs), mainproc.c (check_sig_and_print): Dump attribs if --attrib-fd is set when verifying signatures. * g10.c (main): New --gnupg option to disable the various --openpgp, --pgpX, etc. options. This is the same as --no-XXXX for those options. * revoke.c (ask_revocation_reason): Clear old reason if user elects to repeat question. This is bug 153. * keyedit.c (sign_uids): Show keyid of the key making the signature.
2003-05-21 18:42:22 +02:00
oGnuPG,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oRFC1991,
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the unhashed signature cache any longer. * misc.c (pct_expando): Add two new expandos - signer's fingerprint (%g), and signer's primary fingerprint (%p). * Makefile.am: Include W32LIBS where appropriate. * g10.c (main): Add --rfc2440 alias for --openpgp since in a few months, they won't be the same thing. * keyserver.c (parse_keyserver_uri): Accept "http" as an alias for "hkp", since it is occasionally written that way. (keyserver_spawn): Use ascii_isspace to avoid locale issues. * keygen.c (ask_user_id): Make --allow-freeform-uid apply to the email field as well as the name field, and allow mixing fields when it is set. * options.skel: Use subkeys.pgp.net as the default keyserver. * trustdb.c (validate_one_keyblock): Certifications on revoked or expired uids do not count in the web of trust. * signal.c (init_one_signal, pause_on_sigusr, do_block): Only use sigprocmask() if we have sigset_t, and only use sigaction() if we have struct sigaction. This is for Forte c89 on Solaris which seems to define only the function call half of the two pairs by default. (pause_on_sigusr): Typo. (do_block): If we can't use sigprocmask() and sigset_t, try to get the number of signals from NSIG as well as MAXSIG, and if we can't, fail with an explanation. * signal.c, tdbio.c: Comment out the transaction code. It was not used in this version, and was causing some build problems on quasi-posix platforms (Solaris and Forte c89). * keylist.c (list_keyblock_colon): Don't include validity values when listing secret keys since they can be incorrect and/or misleading. This is a temporary kludge, and will be handled properly in 1.9/2.0. * mainproc.c (check_sig_and_print): Only show the "key available from" preferred keyserver line if the key is not currently present. * keyedit.c (sign_uids): Do not sign expired uids without --expert (same behavior as revoked uids). Do not allow signing a user ID without a self-signature. --expert overrides. Add additional prompt to the signature level question. (menu_expire): When changing expiration dates, don't replace selfsigs on revoked uids since this would effectively unrevoke them. There is also no point in replacing expired selfsigs. This is bug #181 * g10.c (add_notation_data): Make sure that only ascii is passed to iscntrl. Noted by Christian Biere. * getkey.c (classify_user_id2): Replaced isspace by spacep * keygen.c (ask_user_id): Ditto. (get_parameter_algo): Ditto. * keyedit.c (keyedit_menu): Ditto. * tdbdump.c (import_ownertrust): Ditto. s/isxdigit/hexdigitp/. * revoke.c (ask_revocation_reason): * keyserver.c (keyserver_spawn): Dito.
2003-07-10 16:30:07 +02:00
oRFC2440,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
oOpenPGP,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oPGP2,
oPGP6,
oPGP7,
* options.h, g10.c (main), encode.c (write_pubkey_enc_from_list), pkclist.c (algo_available), revoke.c (gen_revoke): Add --pgp8 mode. This is basically identical to --pgp7 in all ways except that signing subkeys, v4 data sigs (including expiration), and SK comments are allowed. * getkey.c (finish_lookup): Comment. * main.h, keylist.c (reorder_keyblock), keyedit.c (keyedit_menu): Reorder user ID display in the --edit-key menu to match that of the --list-keys display. * g10.c (add_notation_data): Fix initialization.
2002-12-04 00:31:48 +01:00
oPGP8,
* keyedit.c (keyedit_menu): Invisible alias "passwd" as "password". * passphrase.c: Don't check for __CYGWIN__, so it is treated as a unix-like system. * options.h, g10.c (main), textfilter.c (standard): Use new option --rfc2440-text to determine whether to filter "<space>\t\r\n" or just "\r\n" before canonicalizing text line endings. Default to "<space>\t\r\n".
2004-12-20 06:19:09 +01:00
oRFC2440Text,
oNoRFC2440Text,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oCipherAlgo,
oDigestAlgo,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oCertDigestAlgo,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oCompressAlgo,
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
oCompressLevel,
oBZ2CompressLevel,
* options.h, g10.c (main), compress-bz2.c (init_uncompress): Rename --bzip2-compress-lowmem to --bzip2-decompress-lowmem since it applies to decompression, not compression.
2004-03-25 23:43:51 +01:00
oBZ2DecompressLowmem,
* g10.c (main), passphrase.c (set_passphrase_from_string): New --passphrase command line option. Only useful in very special circumstances.
2005-08-05 21:54:06 +02:00
oPasswd,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oPasswdFD,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oPasswdFile,
* options.h, gpg.c (main), passphrase.c (passphrase_to_dek): Add --passphrase-repeat option to control how many times gpg will re-prompt for a passphrase to ensure the user has typed it correctly. Defaults to 1.
2006-12-03 05:38:53 +01:00
oPasswdRepeat,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
oCommandFD,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oCommandFile,
oQuickRandom,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oNoVerbose,
oTrustDBName,
oNoSecmemWarn,
* g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg to exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock.
2004-12-16 06:16:09 +01:00
oRequireSecmem,
oNoRequireSecmem,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oNoPermissionWarn,
* options.h, g10.c (main), mainproc.c (proc_encrypted): Return a decryption failed error if a MDC does not verify. Warn if a MDC is not present (can disable via --no-mdc-warning). * exec.c (exec_write), g10.c (main), keyserver.c (keyserver_spawn): Use new DISABLE_KEYSERVER_PATH rather than FIXED_EXEC_PATH.
2002-07-30 18:48:21 +02:00
oNoMDCWarn,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oNoArmor,
oNoDefKeyring,
oNoGreeting,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
oNoTTY,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oNoOptions,
oNoBatch,
oHomedir,
oWithColons,
See ChangeLog: Tue Jun 8 13:36:25 CEST 1999 Werner Koch
1999-06-08 13:41:46 +02:00
oWithKeyData,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oSkipVerify,
oCompressKeys,
oCompressSigs,
oAlwaysTrust,
* options.h, g10.c (main): Add --trust-model option. Current models are "openpgp" which is classic+trustsigs, "classic" which is classic only, and "always" which is the same as the current option --always-trust (which still works). Default is "openpgp". * trustdb.c (validate_one_keyblock): Use "openpgp" trust model to enable trust sigs. * gpgv.c (main), mainproc.c (check_sig_and_print), pkclist.c (do_we_trust, do_we_trust_pre, check_signatures_trust): Use new --trust-model option in place of --always-trust.
2002-11-03 21:18:56 +01:00
oTrustModel,
* options.h, g10.c (main), trustdb.c (ask_ownertrust): Add --force-ownertrust option for debugging purposes. This allows setting a whole keyring to a given trust during an --update-trustdb. Not for normal use - it's just easier than hitting "4" all the time to test a large trustdb.
2002-11-07 05:37:27 +01:00
oForceOwnertrust,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oRunAsShmCP,
oSetFilename,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oForYourEyesOnly,
oNoForYourEyesOnly,
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 14:41:46 +02:00
oSetPolicyURL,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oSigPolicyURL,
oCertPolicyURL,
oShowPolicyURL,
oNoShowPolicyURL,
* options.h, g10.c (main, add_keyserver_url): Add --sig-preferred-keyserver to implant a "where to get my key" subpacket into a signature. * sign.c (mk_notation_and_policy): Rename to mk_notation_policy_etc and add preferred keyserver support for signatures.
2003-07-24 21:28:12 +02:00
oSigKeyserverURL,
See ChangeLog: Tue Jun 1 16:01:46 CEST 1999 Werner Koch
1999-06-01 16:08:57 +02:00
oUseEmbeddedFilename,
* plaintext.c (handle_plaintext): Accept 'u' as a plaintext mode that requires end of line conversion. This is being considered for a UTF8 text packet. If this doesn't take place, no major harm done. If it does take place, we'll get a jump on starting the changeover. * g10.c (main): --no-use-embedded-filename. * build-packet.c (calc_plaintext, do_plaintext): Do not create illegal (packet header indicates a size larger than the actual packet) encrypted data packets when not compressing and using a filename longer than 255 characters. * keyedit.c (no_primary_warning): Cleanup. (menu_expire): Don't give primary warning for subkey expiration changes. These cannot reorder primaries.
2004-04-16 18:31:19 +02:00
oNoUseEmbeddedFilename,
*** empty log message ***
1998-09-11 07:47:32 +02:00
oComment,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
oDefaultComment,
* g10.c (main): Deprecate --default-comment in favor of --no-comments. * options.h, g10.c (main), armor.c (armor_filter): Allow using --comment multiple times to get multiple Comment: header lines. --no-comments resets list.
2003-09-23 05:52:55 +02:00
oNoComments,
* plaintext.c (handle_plaintext): Bigger buffer for extra safety. * g10.c (main): New alias --throw-keyid for --throw-keyids, so that it continues to work in old configuration files. Noted by Jens Adam. * pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2. * status.c (do_get_from_fd): Flush stdout if status isn't flushing it for us. This guarantees that any menus that were displayed before the prompt don't get stuck in a buffer. Noted by Peter Palfrader. This is Debian bug #254072. * sign.c (update_keysig_packet): Revert change of 2004-05-18. It is not appropriate to strip policy and notations when remaking a sig. That should only happen when specifically requested by the user.
2004-08-08 15:28:04 +02:00
oThrowKeyids,
oNoThrowKeyids,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oShowPhotos,
oNoShowPhotos,
oPhotoViewer,
Snapshot release 0.4.2
1998-10-18 17:21:22 +02:00
oForceV3Sigs,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oNoForceV3Sigs,
oForceV4Certs,
oNoForceV4Certs,
See ChangeLog: Mon Apr 26 17:48:15 CEST 1999 Werner Koch
1999-04-26 17:53:01 +02:00
oForceMDC,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oNoForceMDC,
oDisableMDC,
oNoDisableMDC,
*** empty log message ***
1998-09-28 21:25:31 +02:00
oS2KMode,
oS2KDigest,
oS2KCipher,
* parse-packet.c (parse_symkeyenc): Show the unpacked as well as the packed s2k iteration count. * main.h, options.h, gpg.c (encode_s2k_iterations, main), passphrase.c (hash_passphrase): Add --s2k-count option to specify the number of s2k hash iterations.
2006-10-13 05:44:34 +02:00
oS2KCount,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oSimpleSKChecksum,
* g10.c (main): Alias --charset as --display-charset to help avoid the continuing confusion and make room for possible changes in devel. * parse-packet.c (parse_plaintext): Show the hex value for the literal packet mode since it may not be printable. * keygen.c (make_backsig): Make sure that the backsig was built successfully before we try and use it. * status.h, status.c (get_status_string), plaintext.c (handle_plaintext): New status tags PLAINTEXT and PLAINTEXT_LENGTH.
2004-07-15 23:00:35 +02:00
oDisplayCharset,
Expiration time works (I hope so)
1998-11-20 18:42:18 +01:00
oNotDashEscaped,
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 18:36:05 +01:00
oEscapeFrom,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oNoEscapeFrom,
See ChangeLog: Fri Nov 27 21:37:41 CET 1998 Werner Koch
1998-11-27 21:40:56 +01:00
oLockOnce,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
oLockMultiple,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
oLockNever,
See ChangeLog: Sat Jan 16 09:27:30 CET 1999 Werner Koch
1999-01-16 09:29:29 +01:00
oKeyServer,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oKeyServerOptions,
* options.h, main.h, g10.c (main), import.c (parse_import_options, delete_inv_parts), keyserver.c (parse_keyserver_options): add new --import-options option. The only current flag is "allow-local-sigs". * g10.c (main): Don't disable MDC in pgp7 mode. * options.h, g10.c (main), keyserver.c (parse_keyserver_options): Remove old keyserver-option include-attributes now that there is an export-option for the same thing.
2002-07-23 00:26:14 +02:00
oImportOptions,
* options.h, main.h, export.c (parse_export_options, do_export_stream), g10.c (main): add new --export-options option. Current flags are "include-non-rfc", "include-local-sigs", "include-attributes", and "include-sensitive-revkeys". * options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options, keyserver_spawn): try passing unknown keyserver options to export options, and if successful, use them when doing a keyserver --send-key. * build-packet.c (build_sig_subpkt): We do not generate SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
oExportOptions,
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
oListOptions,
oVerifyOptions,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oTempDir,
oExecPath,
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 14:16:33 +01:00
oEncryptTo,
* g10.c (main): Add --no-throw-keyid. * keydb.h, encode.c (write_pubkey_enc_from_list), g10.c (main), pkclist.c (build_pk_list): Add --hidden-recipient (-R) and --hidden-encrypt-to, which do a single-user variation on --throw-keyid. The "hide this key" flag is carried in bit 0 of the pk_list flags field. * keyserver.c (parse_keyrec): Fix shadowing warning.
2002-11-01 17:15:45 +01:00
oHiddenEncryptTo,
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
1999-02-19 15:54:00 +01:00
oNoEncryptTo,
See ChangeLog: Sat May 22 22:47:26 CEST 1999 Werner Koch
1999-05-22 22:54:54 +02:00
oLoggerFD,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oLoggerFile,
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 12:53:35 +02:00
oUtf8Strings,
oNoUtf8Strings,
See ChangeLog: Thu Jul 15 10:15:35 CEST 1999 Werner Koch
1999-07-15 10:16:46 +02:00
oDisableCipherAlgo,
oDisablePubkeyAlgo,
See ChangeLog: Thu Jul 22 20:03:03 CEST 1999 Werner Koch
1999-07-22 20:11:55 +02:00
oAllowNonSelfsignedUID,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oNoAllowNonSelfsignedUID,
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
oAllowFreeformUID,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oNoAllowFreeformUID,
oAllowSecretKeyImport,
oEnableSpecialFilenames,
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 09:44:46 +02:00
oNoLiteral,
oSetFilesize,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
oHonorHttpProxy,
oFastListMode,
oListOnly,
oIgnoreTimeConflict,
* encode.c (encode_crypt), g10.c (main), sign.c (sign_file, clearsign_file): Use the same --pgpX warning string everywhere to ease translations. * encode.c (write_pubkey_enc_from_list): Warn when using --throw-keyid with --pgpX. Noted by Vedaal Nistar.
2002-08-06 19:38:04 +02:00
oIgnoreValidFrom,
oIgnoreCrcError,
* options.h, g10.c (main), mainproc.c (proc_encrypted): --ignore-mdc-error option to turn a MDC check error into a warning.
2002-08-06 19:57:53 +02:00
oIgnoreMDCError,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oShowSessionKey,
oOverrideSessionKey,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
oNoRandomSeedFile,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oAutoKeyRetrieve,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
oNoAutoKeyRetrieve,
See ChangeLog: Mon Aug 21 17:59:17 CEST 2000 Werner Koch
2000-08-21 17:54:37 +02:00
oUseAgent,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oNoUseAgent,
oGpgAgentInfo,
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
oMergeOnly,
oTryAllSecrets,
oTrustedKey,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oNoExpensiveTrustChecks,
oFixedListMode,
oNoSigCache,
oNoSigCreateCheck,
oAutoCheckTrustDB,
oNoAutoCheckTrustDB,
oPreservePermissions,
oDefaultPreferenceList,
* options.h, gpg.c (main), keygen.c (keygen_upd_std_prefs, keygen_add_std_prefs, proc_parameter_file): Add --default-keyserver-url to specify a keyserver URL at key generation time, and "Keyserver:" keyword for doing the same through a batch file.
2006-06-23 00:56:54 +02:00
oDefaultKeyserverURL,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
oPersonalCipherPreferences,
oPersonalDigestPreferences,
oPersonalCompressPreferences,
oDisplay,
oTTYname,
oTTYtype,
oLCctype,
oLCmessages,
oGroup,
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
oUnGroup,
* g10.c (main): Add --no-groups to zero --group list. * encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically encrypted session key. Use --s2k-cipher-algo to choose cipher, rather than the default cipher. * parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically encrypted session key is seen without salt. Show in --list-packets if a symetrically encrypted session key is present. * pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless --quiet is set. Use text name of cipher in warning.
2003-10-01 17:15:58 +02:00
oNoGroups,
* options.h, g10.c (main): Add --strict and --no-strict to switch the log_warning severity level from info to error.
2002-10-04 00:13:04 +02:00
oStrict,
oNoStrict,
* g10.c: New options --[no-]mangle-dos-filenames. * options.h (opt): Added mangle-dos-filenames. * openfile.c (open_outfile) [USE_ONLY_8DOT3]: Truncate the filename only when this option is set; this is the default.
2002-12-05 16:25:16 +01:00
oMangleDosFilenames,
oNoMangleDosFilenames,
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
oEnableProgressFilter,
oMultifile,
* options.h, g10.c (main): Add a more flexible --keyid-format option to replace the list-option (and eventually verify-option) show-long-keyids. The format can be short, long, 0xshort, and 0xlong. * keydb.h, keyid.c (keystr, keystrlen): New functions to generate a printable keyid. * keyedit.c (print_and_check_one_sig, show_key_with_all_names), keylist.c (list_keyblock_print): Use new keystr() function here to print keyids.
2004-03-03 06:47:51 +01:00
oKeyidFormat,
* gpg.sgml (http): * g10.c, options.h: New option --exit-on-status-write-error. * status.c (write_status_text): Make use of this option.
2005-07-22 18:28:40 +02:00
oExitOnStatusWriteError,
* g10.c, options.h: New option --limit-card-insert-tries. * cardglue.c (open_card): Use it.
2005-07-19 14:14:39 +02:00
oLimitCardInsertTries,
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
oReaderPort,
octapiDriver,
opcscDriver,
oDisableCCID,
* options.h, mainproc.c (check_sig_and_print), gpg.c (main): pka-lookups, not pka-lookup. * options.h, gpg.c (main), keyedit.c [cmds], sig-check.c (signature_check2): Rename "backsign" to "cross-certify" as a more accurate name.
2006-03-08 03:40:42 +01:00
oRequireCrossCert,
oNoRequireCrossCert,
* options.h, keydb.h, g10.c (main), getkey.c (parse_auto_key_locate): Parse a list of key access methods. (get_pubkey_byname): Walk the list here to try and retrieve keys we don't have locally.
2006-02-22 20:06:23 +01:00
oAutoKeyLocate,
* keydb.h, getkey.c (release_akl), gpg.c (main): Add --no-auto-key-locate. * options.h, gpg.c (main): Keep track of each keyserver registered so we can match on them later. * keyserver-internal.h, keyserver.c (cmp_keyserver_spec, keyserver_match), gpgv.c: New. Find a keyserver that matches ours and return its spec. * getkey.c (get_pubkey_byname): Use it here to get the per-keyserver options from an earlier keyserver.
2006-02-24 15:27:22 +01:00
oNoAutoKeyLocate,
More tests added; make distcheck works
2006-03-07 12:05:41 +01:00
oAllowMultisigVerification,
* options.h, gpg.c (main): Add --enable-dsa2 and --disable-dsa2. Defaults to disable. * pkclist.c (algo_available): If --enable-dsa2 is set, we're allowed to truncate hashes to fit DSA keys. * sign.c (match_dsa_hash): New. Return the best match hash for a given q size. (do_sign, hash_for, sign_file): When signing with a DSA key, if it has q==160, assume it is an old DSA key and don't allow truncation unless --enable-dsa2 is also set. q!=160 always allows truncation since they must be DSA2 keys. (make_keysig_packet): If the user doesn't specify a --cert-digest-algo, use match_dsa_hash to pick the best hash for key signatures.
2006-04-20 23:32:42 +02:00
oEnableDSA2,
oDisableDSA2,
* options.h, getkey.c (merge_selfsigs_subkey), gpg.c (main), sig-check.c (signature_check2): Add --require-backsigs and --no-require-backsigs. Currently defaults to --no-require-backsigs.
2005-10-12 22:44:24 +02:00
* gpg.sgml: Document smartcard related options. * g10.c, options.h: New option --no-interactive-selection. * keyedit.c (keyedit_menu): Use it.
2005-06-20 19:03:27 +02:00
oNoop
* g10.c (main): Add --no-groups to zero --group list. * encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically encrypted session key. Use --s2k-cipher-algo to choose cipher, rather than the default cipher. * parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically encrypted session key is seen without salt. Show in --list-packets if a symetrically encrypted session key is present. * pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless --quiet is set. Use text name of cipher in warning.
2003-10-01 17:15:58 +02:00
};
bug fix release
1998-08-11 19:29:34 +02:00
added option export
1998-02-13 21:58:50 +01:00
static ARGPARSE_OPTS opts[] = {
new release
1998-05-15 20:49:19 +02:00
{ 300, NULL, 0, N_("@Commands:\n ") },
added option export
1998-02-13 21:58:50 +01:00
bug fix release
1998-08-11 19:29:34 +02:00
{ aSign, "sign", 256, N_("|[file]|make a signature")},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ aClearsign, "clearsign", 256, N_("|[file]|make a clear text signature")},
bug fix release
1998-08-11 19:29:34 +02:00
{ aDetachedSign, "detach-sign", 256, N_("make a detached signature")},
{ aEncr, "encrypt", 256, N_("encrypt data")},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ aEncrFiles, "encrypt-files", 256, "@"},
bug fix release
1998-08-11 19:29:34 +02:00
{ aSym, "symmetric", 256, N_("encryption only with symmetric cipher")},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ aStore, "store", 256, "@"},
bug fix release
1998-08-11 19:29:34 +02:00
{ aDecrypt, "decrypt", 256, N_("decrypt data (default)")},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ aDecryptFiles, "decrypt-files", 256, "@"},
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aVerify, "verify" , 256, N_("verify a signature")},
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ aVerifyFiles, "verify-files" , 256, "@" },
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aListKeys, "list-keys", 256, N_("list keys")},
See ChangeLog: Wed Apr 7 20:51:39 CEST 1999 Werner Koch
1999-04-07 20:58:34 +02:00
{ aListKeys, "list-public-keys", 256, "@" },
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aListSigs, "list-sigs", 256, N_("list keys and signatures")},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ aCheckKeys, "check-sigs",256, N_("list and check key signatures")},
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ oFingerprint, "fingerprint", 256, N_("list keys and fingerprints")},
{ aListSecretKeys, "list-secret-keys", 256, N_("list secret keys")},
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
{ aKeygen, "gen-key", 256, N_("generate a new key pair")},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ aDeleteKeys,"delete-keys",256,N_("remove keys from the public keyring")},
{ aDeleteSecretKeys, "delete-secret-keys",256,
N_("remove keys from the secret keyring")},
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
{ aSignKey, "sign-key" ,256, N_("sign a key")},
{ aLSignKey, "lsign-key" ,256, N_("sign a key locally")},
{ aEditKey, "edit-key" ,256, N_("sign or edit a key")},
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aGenRevoke, "gen-revoke",256, N_("generate a revocation certificate")},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ aDesigRevoke, "desig-revoke",256, "@" },
See ChangeLog: Thu Dec 10 20:15:36 CET 1998 Werner Koch
1998-12-10 20:20:47 +01:00
{ aExport, "export" , 256, N_("export keys") },
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 19:37:41 +01:00
{ aSendKeys, "send-keys" , 256, N_("export keys to a key server") },
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
1999-03-20 11:53:39 +01:00
{ aRecvKeys, "recv-keys" , 256, N_("import keys from a key server") },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ aSearchKeys, "search-keys" , 256,
N_("search for keys on a key server") },
{ aRefreshKeys, "refresh-keys", 256,
N_("update all keys from a keyserver")},
* keyserver.c (keyserver_spawn): Don't print "searching for key 00000000" when fetching a URI. * keyserver-internal.h, keyserver.c (keyserver_fetch): New. Fetch an arbitrary URI using the keyserver helpers. * gpg.c (main): Call it from here for --fetch-keys.
2005-12-07 23:34:11 +01:00
{ aFetchKeys, "fetch-keys" , 256, "@" },
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aExportSecret, "export-secret-keys" , 256, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ aExportSecretSub, "export-secret-subkeys" , 256, "@" },
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aImport, "import", 256 , N_("import/merge keys")},
some random changes
1998-10-25 20:00:01 +01:00
{ aFastImport, "fast-import", 256 , "@"},
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
#ifdef ENABLE_CARD_SUPPORT
{ aCardStatus, "card-status", 256, N_("print the card status")},
{ aCardEdit, "card-edit", 256, N_("change data on a card")},
{ aChangePIN, "change-pin", 256, N_("change a card's PIN")},
#endif
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
{ aListConfig, "list-config", 256, "@"},
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
{ aGPGConfList, "gpgconf-list", 256, "@" },
New command --gpgconf-test.
2006-10-23 16:21:41 +02:00
{ aGPGConfTest, "gpgconf-test", 256, "@" },
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ aListPackets, "list-packets",256, "@"},
{ aExportOwnerTrust, "export-ownertrust", 256, "@"},
{ aImportOwnerTrust, "import-ownertrust", 256, "@"},
last local commit
1998-10-16 18:00:17 +02:00
{ aUpdateTrustDB,
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 19:47:23 +02:00
"update-trustdb",0 , N_("update the trust database")},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ aCheckTrustDB, "check-trustdb", 0, "@"},
{ aFixTrustDB, "fix-trustdb", 0, "@"},
{ aDeArmor, "dearmor", 256, "@"},
{ aDeArmor, "dearmour", 256, "@"},
{ aEnArmor, "enarmor", 256, "@"},
{ aEnArmor, "enarmour", 256, "@"},
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aPrintMD, "print-md" , 256, N_("|algo [files]|print message digests")},
{ aPrimegen, "gen-prime" , 256, "@" },
{ aGenRandom, "gen-random" , 256, "@" },
added option export
1998-02-13 21:58:50 +01:00
new release
1998-05-15 20:49:19 +02:00
{ 301, NULL, 0, N_("@\nOptions:\n ") },
added option export
1998-02-13 21:58:50 +01:00
bug fix release
1998-08-11 19:29:34 +02:00
{ oArmor, "armor", 0, N_("create ascii armored output")},
See ChangeLog: Fri Sep 17 12:56:42 CEST 1999 Werner Koch
1999-09-17 12:58:20 +02:00
{ oArmor, "armour", 0, "@" },
See ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch
1999-01-24 18:16:40 +01:00
{ oRecipient, "recipient", 2, N_("|NAME|encrypt for NAME")},
* g10.c (main): Add --no-throw-keyid. * keydb.h, encode.c (write_pubkey_enc_from_list), g10.c (main), pkclist.c (build_pk_list): Add --hidden-recipient (-R) and --hidden-encrypt-to, which do a single-user variation on --throw-keyid. The "hide this key" flag is carried in bit 0 of the pk_list flags field. * keyserver.c (parse_keyrec): Fix shadowing warning.
2002-11-01 17:15:45 +01:00
{ oHiddenRecipient, "hidden-recipient", 2, "@" },
See ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch
1999-01-24 18:16:40 +01:00
{ oRecipient, "remote-user", 2, "@"}, /* old option name */
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oDefRecipient, "default-recipient", 2, "@"},
{ oDefRecipientSelf, "default-recipient-self", 0, "@"},
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
{ oNoDefRecipient, "no-default-recipient", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oTempDir, "temp-directory", 2, "@" },
{ oExecPath, "exec-path", 2, "@" },
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 14:16:33 +01:00
{ oEncryptTo, "encrypt-to", 2, "@" },
* g10.c (main): Add --no-throw-keyid. * keydb.h, encode.c (write_pubkey_enc_from_list), g10.c (main), pkclist.c (build_pk_list): Add --hidden-recipient (-R) and --hidden-encrypt-to, which do a single-user variation on --throw-keyid. The "hide this key" flag is carried in bit 0 of the pk_list flags field. * keyserver.c (parse_keyrec): Fix shadowing warning.
2002-11-01 17:15:45 +01:00
{ oHiddenEncryptTo, "hidden-encrypt-to", 2, "@" },
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
1999-02-19 15:54:00 +01:00
{ oNoEncryptTo, "no-encrypt-to", 0, "@" },
* g10.c (main): Add aliases sign-with->local-user and user->recipient to make switching from PGP command line to GPG easier.
2005-08-20 21:38:45 +02:00
{ oLocalUser, "local-user",2, N_("use this user-id to sign or decrypt")},
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
{ oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") },
{ oCompressLevel, "compress-level", 1, "@" },
* compress.c (init_compress): Remove compress level 10 trick, since it is no longer needed. * g10.c: Fix typoed option name. * compress-bz2.c (init_compress): Compression level 0 is not meaningful for bzip2.
2003-11-16 00:54:14 +01:00
{ oBZ2CompressLevel, "bzip2-compress-level", 1, "@" },
* options.h, g10.c (main), compress-bz2.c (init_uncompress): Rename --bzip2-compress-lowmem to --bzip2-decompress-lowmem since it applies to decompression, not compression.
2004-03-25 23:43:51 +01:00
{ oBZ2DecompressLowmem, "bzip2-decompress-lowmem", 0, "@" },
(Does not compile yet)
1998-11-03 20:38:58 +01:00
{ oTextmodeShort, NULL, 0, "@"},
bug fix release
1998-08-11 19:29:34 +02:00
{ oTextmode, "textmode", 0, N_("use canonical text mode")},
* g10.c (main): Add --no-textmode. * export.c (do_export_stream), keyedit.c (show_key_with_all_names, menu_addrevoker), mainproc.c (check_sig_and_print), photoid.c (show_photos), sign.c (mk_notation_and_policy), trustdb.c (get_validity, reset_trust_records, validate_keys): Make some strings translatable. * mainproc.c (check_sig_and_print): Show digest algorithm and sig class when verifying a sig with --verbose on, and add version, pk and hash algorithms and sig class to VALIDSIG. * parse-packet.c (enum_sig_subpkt): Make a warning message a --verbose warning message since we don't need to warn every time we see an unknown critical (we only need to invalidate the signature). * trustdb.c (init_trustdb): Check the trustdb options even with TM_AUTO since the auto may become TM_CLASSIC or TM_OPENPGP.
2003-04-27 22:22:09 +02:00
{ oNoTextmode, "no-textmode", 0, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oExpert, "expert", 0, "@"},
{ oNoExpert, "no-expert", 0, "@"},
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
{ oDefSigExpire, "default-sig-expire", 2, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oAskSigExpire, "ask-sig-expire", 0, "@"},
{ oNoAskSigExpire, "no-ask-sig-expire", 0, "@"},
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
{ oDefCertExpire, "default-cert-expire", 2, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oAskCertExpire, "ask-cert-expire", 0, "@"},
{ oNoAskCertExpire, "no-ask-cert-expire", 0, "@"},
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
{ oDefCertLevel, "default-cert-level", 1, "@"},
{ oMinCertLevel, "min-cert-level", 1, "@"},
* plaintext.c: Copyright. * encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
2004-02-25 00:37:18 +01:00
{ oAskCertLevel, "ask-cert-level", 0, "@"},
{ oNoAskCertLevel, "no-ask-cert-level", 0, "@"},
bug fix release
1998-08-11 19:29:34 +02:00
{ oOutput, "output", 2, N_("use as output file")},
* options.h, g10.c (main), plaintext.c (handle_plaintext): Add --max-output option to help people deal with decompression bombs.
2004-02-19 00:09:27 +01:00
{ oMaxOutput, "max-output", 16|4, "@" },
bug fix release
1998-08-11 19:29:34 +02:00
{ oVerbose, "verbose", 0, N_("verbose") },
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oQuiet, "quiet", 0, "@"},
{ oNoTTY, "no-tty", 0, "@"},
{ oForceV3Sigs, "force-v3-sigs", 0, "@"},
{ oNoForceV3Sigs, "no-force-v3-sigs", 0, "@"},
{ oForceV4Certs, "force-v4-certs", 0, "@"},
{ oNoForceV4Certs, "no-force-v4-certs", 0, "@"},
{ oForceMDC, "force-mdc", 0, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oNoForceMDC, "no-force-mdc", 0, "@" },
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oDisableMDC, "disable-mdc", 0, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oNoDisableMDC, "no-disable-mdc", 0, "@" },
See ChangeLog: Thu Feb 25 18:47:39 CET 1999 Werner Koch
1999-02-25 18:51:55 +01:00
{ oDryRun, "dry-run", 0, N_("do not make any changes") },
2002-08-16 Timo Schulz <ts@winpt.org> * g10.c (main): enable opt.interactive. * import.c (import_one): Ask the user if the key shall be imported when the interactive mode is used. Useful to extract selected keys from a file.
2002-08-18 19:24:21 +02:00
{ oInteractive, "interactive", 0, N_("prompt before overwriting") },
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oUseAgent, "use-agent",0, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oNoUseAgent, "no-use-agent",0, "@"},
{ oGpgAgentInfo, "gpg-agent-info",2, "@"},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oBatch, "batch", 0, "@"},
{ oAnswerYes, "yes", 0, "@"},
{ oAnswerNo, "no", 0, "@"},
{ oKeyring, "keyring", 2, "@"},
* g10.c (main), keydb.c (keydb_add_resource, keydb_locate_writable): Rename --default-keyring as --primary-keyring. Stefan wins the naming contest.
2002-11-25 04:18:48 +01:00
{ oPrimaryKeyring, "primary-keyring",2, "@" },
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oSecretKeyring, "secret-keyring", 2, "@"},
* mainproc.c (check_sig_and_print): Get the uid validity before printing any sig results to avoid munging the output with trustdb warnings. * g10.c (main): Don't include --show-keyring in --help as it is deprecated.
2003-08-25 01:01:26 +02:00
{ oShowKeyring, "show-keyring", 0, "@"},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oDefaultKey, "default-key", 2, "@"},
{ oKeyServer, "keyserver", 2, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oKeyServerOptions, "keyserver-options",2,"@"},
* options.h, main.h, g10.c (main), import.c (parse_import_options, delete_inv_parts), keyserver.c (parse_keyserver_options): add new --import-options option. The only current flag is "allow-local-sigs". * g10.c (main): Don't disable MDC in pgp7 mode. * options.h, g10.c (main), keyserver.c (parse_keyserver_options): Remove old keyserver-option include-attributes now that there is an export-option for the same thing.
2002-07-23 00:26:14 +02:00
{ oImportOptions, "import-options",2,"@"},
* options.h, main.h, export.c (parse_export_options, do_export_stream), g10.c (main): add new --export-options option. Current flags are "include-non-rfc", "include-local-sigs", "include-attributes", and "include-sensitive-revkeys". * options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options, keyserver_spawn): try passing unknown keyserver options to export options, and if successful, use them when doing a keyserver --send-key. * build-packet.c (build_sig_subpkt): We do not generate SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
{ oExportOptions, "export-options",2,"@"},
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
{ oListOptions, "list-options",2,"@"},
Inadvertently left out of the 2003-06-01 checkin
2003-06-04 23:21:23 +02:00
{ oVerifyOptions, "verify-options",2,"@"},
* g10.c (main): Alias --charset as --display-charset to help avoid the continuing confusion and make room for possible changes in devel. * parse-packet.c (parse_plaintext): Show the hex value for the literal packet mode since it may not be printable. * keygen.c (make_backsig): Make sure that the backsig was built successfully before we try and use it. * status.h, status.c (get_status_string), plaintext.c (handle_plaintext): New status tags PLAINTEXT and PLAINTEXT_LENGTH.
2004-07-15 23:00:35 +02:00
{ oDisplayCharset, "display-charset", 2, "@"},
{ oDisplayCharset, "charset", 2, "@"},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oOptions, "options", 2, "@"},
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ oDebug, "debug" ,4|16, "@"},
{ oDebugAll, "debug-all" ,0, "@"},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oStatusFD, "status-fd" ,1, "@"},
{ oStatusFile, "status-file" ,2, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oAttributeFD, "attribute-fd" ,1, "@" },
{ oAttributeFile, "attribute-file" ,2, "@" },
* build-packet.c (do_comment): Removed. (build_packet): Ignore comment packets. * export.c (do_export_stream): Don't export comment packets any longer. * options.h, g10.c (main): Remove --sk-comments and --no-sk-comments options, and replace with no-op.
2005-05-14 04:38:31 +02:00
{ oNoop, "sk-comments", 0, "@"},
{ oNoop, "no-sk-comments", 0, "@"},
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ oCompletesNeeded, "completes-needed", 1, "@"},
{ oMarginalsNeeded, "marginals-needed", 1, "@"},
See ChangeLog ;-). Key validation should now be faster
1998-11-13 20:41:41 +01:00
{ oMaxCertDepth, "max-cert-depth", 1, "@" },
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oTrustedKey, "trusted-key", 2, "@"},
{ oLoadExtension, "load-extension", 2, "@"},
* trustdb.h, trustdb.c (is_disabled), gpgv.c (is_disabled): Rename is_disabled to cache_disabled_value, which now takes a pk and not just the keyid. This is for speed since there is no need to re-fetch a key when we already have that key handy. Cache the result of the check so we don't need to hit the trustdb more than once. * getkey.c (skip_disabled): New function to get a pk and call is_disabled on it. (key_byname): Use it here. * packet.h, getkey.c (skip_disabled), keylist.c (print_capabilities): New "pk_is_disabled" macro to retrieve the cached disabled value if available, and fill it in via cache_disabled_value if not available. * trustdb.c (get_validity): Cache the disabled value since we have it handy and it might be useful later. * parse-packet.c (parse_key): Clear disabled flag when parsing a new key. Just in case someone forgets to clear the whole key. * getkey.c (merge_selfsigs_main): Add an "if all else fails" path for setting a single user ID primary when there are multiple set primaries all at the same second, or no primaries set and the most recent user IDs are at the same second, or no signed user IDs at all. This is arbitrary, but deterministic. * exec.h, photoid.h: Add copyright message. * keylist.c (list_keyblock_print): Don't dump attribs for revoked/expired/etc uids for non-colon key listings. This is for consistency with --show-photos. * main.h, keylist.c (dump_attribs), mainproc.c (check_sig_and_print): Dump attribs if --attrib-fd is set when verifying signatures. * g10.c (main): New --gnupg option to disable the various --openpgp, --pgpX, etc. options. This is the same as --no-XXXX for those options. * revoke.c (ask_revocation_reason): Clear old reason if user elects to repeat question. This is bug 153. * keyedit.c (sign_uids): Show keyid of the key making the signature.
2003-05-21 18:42:22 +02:00
{ oGnuPG, "gnupg", 0, "@"},
{ oGnuPG, "no-pgp2", 0, "@"},
{ oGnuPG, "no-pgp6", 0, "@"},
{ oGnuPG, "no-pgp7", 0, "@"},
{ oGnuPG, "no-pgp8", 0, "@"},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oRFC1991, "rfc1991", 0, "@"},
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the unhashed signature cache any longer. * misc.c (pct_expando): Add two new expandos - signer's fingerprint (%g), and signer's primary fingerprint (%p). * Makefile.am: Include W32LIBS where appropriate. * g10.c (main): Add --rfc2440 alias for --openpgp since in a few months, they won't be the same thing. * keyserver.c (parse_keyserver_uri): Accept "http" as an alias for "hkp", since it is occasionally written that way. (keyserver_spawn): Use ascii_isspace to avoid locale issues. * keygen.c (ask_user_id): Make --allow-freeform-uid apply to the email field as well as the name field, and allow mixing fields when it is set. * options.skel: Use subkeys.pgp.net as the default keyserver. * trustdb.c (validate_one_keyblock): Certifications on revoked or expired uids do not count in the web of trust. * signal.c (init_one_signal, pause_on_sigusr, do_block): Only use sigprocmask() if we have sigset_t, and only use sigaction() if we have struct sigaction. This is for Forte c89 on Solaris which seems to define only the function call half of the two pairs by default. (pause_on_sigusr): Typo. (do_block): If we can't use sigprocmask() and sigset_t, try to get the number of signals from NSIG as well as MAXSIG, and if we can't, fail with an explanation. * signal.c, tdbio.c: Comment out the transaction code. It was not used in this version, and was causing some build problems on quasi-posix platforms (Solaris and Forte c89). * keylist.c (list_keyblock_colon): Don't include validity values when listing secret keys since they can be incorrect and/or misleading. This is a temporary kludge, and will be handled properly in 1.9/2.0. * mainproc.c (check_sig_and_print): Only show the "key available from" preferred keyserver line if the key is not currently present. * keyedit.c (sign_uids): Do not sign expired uids without --expert (same behavior as revoked uids). Do not allow signing a user ID without a self-signature. --expert overrides. Add additional prompt to the signature level question. (menu_expire): When changing expiration dates, don't replace selfsigs on revoked uids since this would effectively unrevoke them. There is also no point in replacing expired selfsigs. This is bug #181 * g10.c (add_notation_data): Make sure that only ascii is passed to iscntrl. Noted by Christian Biere. * getkey.c (classify_user_id2): Replaced isspace by spacep * keygen.c (ask_user_id): Ditto. (get_parameter_algo): Ditto. * keyedit.c (keyedit_menu): Ditto. * tdbdump.c (import_ownertrust): Ditto. s/isxdigit/hexdigitp/. * revoke.c (ask_revocation_reason): * keyserver.c (keyserver_spawn): Dito.
2003-07-10 16:30:07 +02:00
{ oRFC2440, "rfc2440", 0, "@" },
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oOpenPGP, "openpgp", 0, N_("use strict OpenPGP behavior")},
{ oPGP2, "pgp2", 0, N_("generate PGP 2.x compatible messages")},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oPGP6, "pgp6", 0, "@"},
{ oPGP7, "pgp7", 0, "@"},
* options.h, g10.c (main), encode.c (write_pubkey_enc_from_list), pkclist.c (algo_available), revoke.c (gen_revoke): Add --pgp8 mode. This is basically identical to --pgp7 in all ways except that signing subkeys, v4 data sigs (including expiration), and SK comments are allowed. * getkey.c (finish_lookup): Comment. * main.h, keylist.c (reorder_keyblock), keyedit.c (keyedit_menu): Reorder user ID display in the --edit-key menu to match that of the --list-keys display. * g10.c (add_notation_data): Fix initialization.
2002-12-04 00:31:48 +01:00
{ oPGP8, "pgp8", 0, "@"},
* keyedit.c (keyedit_menu): Invisible alias "passwd" as "password". * passphrase.c: Don't check for __CYGWIN__, so it is treated as a unix-like system. * options.h, g10.c (main), textfilter.c (standard): Use new option --rfc2440-text to determine whether to filter "<space>\t\r\n" or just "\r\n" before canonicalizing text line endings. Default to "<space>\t\r\n".
2004-12-20 06:19:09 +01:00
{ oRFC2440Text, "rfc2440-text", 0, "@"},
{ oNoRFC2440Text, "no-rfc2440-text", 0, "@"},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oS2KMode, "s2k-mode", 1, "@"},
{ oS2KDigest, "s2k-digest-algo", 2, "@"},
{ oS2KCipher, "s2k-cipher-algo", 2, "@"},
* parse-packet.c (parse_symkeyenc): Show the unpacked as well as the packed s2k iteration count. * main.h, options.h, gpg.c (encode_s2k_iterations, main), passphrase.c (hash_passphrase): Add --s2k-count option to specify the number of s2k hash iterations.
2006-10-13 05:44:34 +02:00
{ oS2KCount, "s2k-count", 1, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oSimpleSKChecksum, "simple-sk-checksum", 0, "@"},
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oCipherAlgo, "cipher-algo", 2, "@"},
{ oDigestAlgo, "digest-algo", 2, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oCertDigestAlgo, "cert-digest-algo", 2 , "@" },
* g10.c (main): Trim --help to commonly used options. Remove -f.
2003-09-12 05:29:00 +02:00
{ oCompressAlgo,"compress-algo", 2, "@"},
* apdu.c (apdu_send_le, apdu_send_direct), keylist.c (status_one_subpacket, print_one_subpacket): Fix some compiler warnings. * g10.c (main): Fix --compression-algo to take a string argument like --compress-algo. * trustdb.c (uid_trust_string_fixed): For safety, check for a pk.
2004-12-15 06:16:53 +01:00
{ oCompressAlgo, "compression-algo", 2, "@"}, /* Alias */
* plaintext.c (handle_plaintext): Bigger buffer for extra safety. * g10.c (main): New alias --throw-keyid for --throw-keyids, so that it continues to work in old configuration files. Noted by Jens Adam. * pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2. * status.c (do_get_from_fd): Flush stdout if status isn't flushing it for us. This guarantees that any menus that were displayed before the prompt don't get stuck in a buffer. Noted by Peter Palfrader. This is Debian bug #254072. * sign.c (update_keysig_packet): Revert change of 2004-05-18. It is not appropriate to strip policy and notations when remaking a sig. That should only happen when specifically requested by the user.
2004-08-08 15:28:04 +02:00
{ oThrowKeyids, "throw-keyid", 0, "@"},
{ oThrowKeyids, "throw-keyids", 0, "@"},
{ oNoThrowKeyids, "no-throw-keyid", 0, "@" },
{ oNoThrowKeyids, "no-throw-keyids", 0, "@" },
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
{ oShowPhotos, "show-photos", 0, "@" },
{ oNoShowPhotos, "no-show-photos", 0, "@" },
{ oPhotoViewer, "photo-viewer", 2, "@" },
* options.skel: Use new hkp://subkeys.pgp.net as sample keyserver since they at least handle subkeys correctly. * options.h, g10.c (main), main.h, keylist.c (show_keyserver_url), mainproc.c (check_sig_and_print), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt, can_handle_critical): Add read-only support for preferred keyserver subpackets. They're basically policy URLs with a different name. Add a verify-option "show-preferred-keyserver" to turn them on and off (on by default, as per stable branch). * g10.c (main): Add "--set-notation" as alias to "--notation-data" this is to make things consistent with --set-policy-url meaning both sigs and certs.
2003-06-05 04:06:12 +02:00
{ oSetNotation, "set-notation", 2, "@" },
{ oSetNotation, "notation-data", 2, "@" }, /* Alias */
{ oSigNotation, "sig-notation", 2, "@" },
{ oCertNotation, "cert-notation", 2, "@" },
added option export
1998-02-13 21:58:50 +01:00
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ 302, NULL, 0, N_(
"@\n(See the man page for a complete listing of all commands and options)\n"
)},
{ 303, NULL, 0, N_("@\nExamples:\n\n"
added option export
1998-02-13 21:58:50 +01:00
" -se -r Bob [file] sign and encrypt for user Bob\n"
*** empty log message ***
1998-09-28 21:25:31 +02:00
" --clearsign [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" ) },
added option export
1998-02-13 21:58:50 +01:00
/* hidden options */
* keydb.h: Err on the side of making an unknown signature a SIG rather than a CERT. * import.c (delete_inv_parts): Discard any key signatures that aren't key types (i.e. 0x00, 0x01, etc.) * g10.c (main): Add deprecated option warning for --list-ownertrust. Add --compression-algo alias for --compress-algo. Change --version output strings to match "showpref" strings, and make translatable. * status.c (do_get_from_fd): Accept 'y' as well as 'Y' for --command-fd boolean input. * trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX) * keyedit.c (show_key_with_all_names_colon): Show no-ks-modify flag.
2003-03-24 21:05:53 +01:00
{ aListOwnerTrust, "list-ownertrust", 256, "@"}, /* deprecated */
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
{ aPrintMDs, "print-mds" , 256, "@"}, /* old */
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aListTrustDB, "list-trustdb",0 , "@"},
* tdbio.c (tdbio_read_record, tdbio_write_record): Compact the RECTYPE_TRUST records a bit. * g10.c (main): Comment out --list-trust-path until it can be implemented. * import.c (import_one): Warn when importing an Elgamal primary that this may take some time (to verify self-sigs). (chk_self_sigs): Try and cache all self-sigs so the keyblock is written to the keyring with a good rich cache. * keygen.c (ask_algo): Make the Elgamal sign+encrypt warning stronger, and remove the RSA sign+encrypt warning.
2002-12-11 18:50:38 +01:00
/* Not yet used */
/* { aListTrustPath, "list-trust-path",0, "@"}, */
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ aPipeMode, "pipemode", 0, "@" },
bug fix release
1998-08-11 19:29:34 +02:00
{ oKOption, NULL, 0, "@"},
* g10.c (main), passphrase.c (set_passphrase_from_string): New --passphrase command line option. Only useful in very special circumstances.
2005-08-05 21:54:06 +02:00
{ oPasswd, "passphrase",2, "@" },
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ oPasswdFD, "passphrase-fd",1, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oPasswdFile, "passphrase-file",2, "@" },
* options.h, gpg.c (main), passphrase.c (passphrase_to_dek): Add --passphrase-repeat option to control how many times gpg will re-prompt for a passphrase to ensure the user has typed it correctly. Defaults to 1.
2006-12-03 05:38:53 +01:00
{ oPasswdRepeat, "passphrase-repeat", 1, "@"},
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ oCommandFD, "command-fd",1, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oCommandFile, "command-file",2, "@" },
{ oQuickRandom, "quick-random", 0, "@"},
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ oNoVerbose, "no-verbose", 0, "@"},
{ oTrustDBName, "trustdb-name", 2, "@" },
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
{ oNoSecmemWarn, "no-secmem-warning", 0, "@" },
* g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg to exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock.
2004-12-16 06:16:09 +01:00
{ oRequireSecmem,"require-secmem", 0, "@" },
{ oNoRequireSecmem,"no-require-secmem", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oNoPermissionWarn, "no-permission-warning", 0, "@" },
* options.h, g10.c (main), mainproc.c (proc_encrypted): Return a decryption failed error if a MDC does not verify. Warn if a MDC is not present (can disable via --no-mdc-warning). * exec.c (exec_write), g10.c (main), keyserver.c (keyserver_spawn): Use new DISABLE_KEYSERVER_PATH rather than FIXED_EXEC_PATH.
2002-07-30 18:48:21 +02:00
{ oNoMDCWarn, "no-mdc-warning", 0, "@" },
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ oNoArmor, "no-armor", 0, "@"},
See ChangeLog: Fri Sep 17 12:56:42 CEST 1999 Werner Koch
1999-09-17 12:58:20 +02:00
{ oNoArmor, "no-armour", 0, "@"},
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ oNoDefKeyring, "no-default-keyring", 0, "@" },
{ oNoGreeting, "no-greeting", 0, "@" },
{ oNoOptions, "no-options", 0, "@" }, /* shortcut for --options /dev/null */
{ oHomedir, "homedir", 2, "@" }, /* defaults to "~/.gnupg" */
{ oNoBatch, "no-batch", 0, "@" },
{ oWithColons, "with-colons", 0, "@"},
See ChangeLog: Tue Jun 8 13:36:25 CEST 1999 Werner Koch
1999-06-08 13:41:46 +02:00
{ oWithKeyData,"with-key-data", 0, "@"},
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ aListKeys, "list-key", 0, "@" }, /* alias */
{ aListSigs, "list-sig", 0, "@" }, /* alias */
{ aCheckKeys, "check-sig",0, "@" }, /* alias */
{ oSkipVerify, "skip-verify",0, "@" },
{ oCompressKeys, "compress-keys",0, "@"},
{ oCompressSigs, "compress-sigs",0, "@"},
* plaintext.c: Copyright. * encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
2004-02-25 00:37:18 +01:00
{ oDefCertLevel, "default-cert-check-level", 1, "@"}, /* Old option */
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ oAlwaysTrust, "always-trust", 0, "@"},
* options.h, g10.c (main): Add --trust-model option. Current models are "openpgp" which is classic+trustsigs, "classic" which is classic only, and "always" which is the same as the current option --always-trust (which still works). Default is "openpgp". * trustdb.c (validate_one_keyblock): Use "openpgp" trust model to enable trust sigs. * gpgv.c (main), mainproc.c (check_sig_and_print), pkclist.c (do_we_trust, do_we_trust_pre, check_signatures_trust): Use new --trust-model option in place of --always-trust.
2002-11-03 21:18:56 +01:00
{ oTrustModel, "trust-model", 2, "@"},
* tdbio.c (create_version_record): Only create new trustdbs with TM_CLASSIC or TM_PGP. * trustdb.h, trustdb.c (trust_string, get_ownertrust_string, get_validity_string, ask_ownertrust, validate_keys), pkclist.c (do_edit_ownertrust): Rename trust_string to trust_value_to_string for naming consistency. * trustdb.h, trustdb.c (string_to_trust_value): New function to translate a string to a trust value. * g10.c (main): Use string_to_trust_value here for --force-ownertrust. * options.h, g10.c (main), trustdb.c (trust_model_string, init_trustdb, check_trustdb, update_trustdb, get_validity, validate_one_keyblock): An "OpenPGP" trust model is misleading since there is no official OpenPGP trust model. Use "PGP" instead.
2003-05-01 23:37:08 +02:00
{ oForceOwnertrust, "force-ownertrust", 2, "@"},
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ oRunAsShmCP, "run-as-shm-coprocess", 4, "@" },
{ oSetFilename, "set-filename", 2, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oForYourEyesOnly, "for-your-eyes-only", 0, "@" },
{ oNoForYourEyesOnly, "no-for-your-eyes-only", 0, "@" },
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 14:41:46 +02:00
{ oSetPolicyURL, "set-policy-url", 2, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oSigPolicyURL, "sig-policy-url", 2, "@" },
{ oCertPolicyURL, "cert-policy-url", 2, "@" },
{ oShowPolicyURL, "show-policy-url", 0, "@" },
{ oNoShowPolicyURL, "no-show-policy-url", 0, "@" },
* g10.c (add_keyserver_url), keyedit.c (keyedit_menu), sign.c (mk_notation_policy_etc): Clarify a few strings. It's a "preferred keyserver URL". * g10.c (main): Use "keyserver-url" instead of "preferred-keyserver" for the sake of short and simple commands.
2003-09-01 01:49:07 +02:00
{ oSigKeyserverURL, "sig-keyserver-url", 2, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oShowNotation, "show-notation", 0, "@" },
{ oNoShowNotation, "no-show-notation", 0, "@" },
*** empty log message ***
1998-09-11 07:47:32 +02:00
{ oComment, "comment", 2, "@" },
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
{ oDefaultComment, "default-comment", 0, "@" },
* g10.c (main): Deprecate --default-comment in favor of --no-comments. * options.h, g10.c (main), armor.c (armor_filter): Allow using --comment multiple times to get multiple Comment: header lines. --no-comments resets list.
2003-09-23 05:52:55 +02:00
{ oNoComments, "no-comments", 0, "@" },
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
{ oEmitVersion, "emit-version", 0, "@"},
* main.h, g10.c (main), import.c (parse_import_options, fix_pks_corruption): It's really PKS corruption, not HKP corruption. Keep the old repair-hkp-subkey-bug command as an alias. * g10.c (main): Rename --no-version to --no-emit-version for consistency. Keep --no-version as an alias.
2003-04-09 03:57:46 +02:00
{ oNoEmitVersion, "no-emit-version", 0, "@"},
{ oNoEmitVersion, "no-version", 0, "@"}, /* alias */
Expiration time works (I hope so)
1998-11-20 18:42:18 +01:00
{ oNotDashEscaped, "not-dash-escaped", 0, "@" },
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 18:36:05 +01:00
{ oEscapeFrom, "escape-from-lines", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oNoEscapeFrom, "no-escape-from-lines", 0, "@" },
See ChangeLog: Fri Nov 27 21:37:41 CET 1998 Werner Koch
1998-11-27 21:40:56 +01:00
{ oLockOnce, "lock-once", 0, "@" },
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
{ oLockMultiple, "lock-multiple", 0, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ oLockNever, "lock-never", 0, "@" },
See ChangeLog: Sat May 22 22:47:26 CEST 1999 Werner Koch
1999-05-22 22:54:54 +02:00
{ oLoggerFD, "logger-fd",1, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oLoggerFile, "logger-file",2, "@" },
See ChangeLog: Tue Jun 1 16:01:46 CEST 1999 Werner Koch
1999-06-01 16:08:57 +02:00
{ oUseEmbeddedFilename, "use-embedded-filename", 0, "@" },
* plaintext.c (handle_plaintext): Accept 'u' as a plaintext mode that requires end of line conversion. This is being considered for a UTF8 text packet. If this doesn't take place, no major harm done. If it does take place, we'll get a jump on starting the changeover. * g10.c (main): --no-use-embedded-filename. * build-packet.c (calc_plaintext, do_plaintext): Do not create illegal (packet header indicates a size larger than the actual packet) encrypted data packets when not compressing and using a filename longer than 255 characters. * keyedit.c (no_primary_warning): Cleanup. (menu_expire): Don't give primary warning for subkey expiration changes. These cannot reorder primaries.
2004-04-16 18:31:19 +02:00
{ oNoUseEmbeddedFilename, "no-use-embedded-filename", 0, "@" },
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 12:53:35 +02:00
{ oUtf8Strings, "utf8-strings", 0, "@" },
{ oNoUtf8Strings, "no-utf8-strings", 0, "@" },
See ChangeLog: Thu Jul 8 16:21:27 CEST 1999 Werner Koch
1999-07-08 16:24:35 +02:00
{ oWithFingerprint, "with-fingerprint", 0, "@" },
See ChangeLog: Thu Jul 15 10:15:35 CEST 1999 Werner Koch
1999-07-15 10:16:46 +02:00
{ oDisableCipherAlgo, "disable-cipher-algo", 2, "@" },
{ oDisablePubkeyAlgo, "disable-pubkey-algo", 2, "@" },
See ChangeLog: Thu Jul 22 20:03:03 CEST 1999 Werner Koch
1999-07-22 20:11:55 +02:00
{ oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oNoAllowNonSelfsignedUID, "no-allow-non-selfsigned-uid", 0, "@" },
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
{ oAllowFreeformUID, "allow-freeform-uid", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oNoAllowFreeformUID, "no-allow-freeform-uid", 0, "@" },
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 09:44:46 +02:00
{ oNoLiteral, "no-literal", 0, "@" },
{ oSetFilesize, "set-filesize", 20, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ oHonorHttpProxy,"honor-http-proxy", 0, "@" },
{ oFastListMode,"fast-list-mode", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oFixedListMode,"fixed-list-mode", 0, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ oListOnly, "list-only", 0, "@"},
{ oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oIgnoreValidFrom, "ignore-valid-from", 0, "@" },
{ oIgnoreCrcError, "ignore-crc-error", 0,"@" },
* options.h, g10.c (main), mainproc.c (proc_encrypted): --ignore-mdc-error option to turn a MDC check error into a warning.
2002-08-06 19:57:53 +02:00
{ oIgnoreMDCError, "ignore-mdc-error", 0,"@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oShowSessionKey, "show-session-key", 0, "@" },
{ oOverrideSessionKey, "override-session-key", 2, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ oNoRandomSeedFile, "no-random-seed-file", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oAutoKeyRetrieve, "auto-key-retrieve", 0, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
{ oNoAutoKeyRetrieve, "no-auto-key-retrieve", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oNoSigCache, "no-sig-cache", 0, "@" },
{ oNoSigCreateCheck, "no-sig-create-check", 0, "@" },
{ oAutoCheckTrustDB, "auto-check-trustdb", 0, "@"},
{ oNoAutoCheckTrustDB, "no-auto-check-trustdb", 0, "@"},
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
{ oMergeOnly, "merge-only", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oAllowSecretKeyImport, "allow-secret-key-import", 0, "@" },
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
{ oTryAllSecrets, "try-all-secrets", 0, "@" },
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oEnableSpecialFilenames, "enable-special-filenames", 0, "@" },
{ oNoExpensiveTrustChecks, "no-expensive-trust-checks", 0, "@" },
{ aDeleteSecretAndPublicKeys, "delete-secret-and-public-keys",256, "@" },
{ aRebuildKeydbCaches, "rebuild-keydb-caches", 256, "@"},
{ oPreservePermissions, "preserve-permissions", 0, "@"},
{ oDefaultPreferenceList, "default-preference-list", 2, "@"},
* options.h, gpg.c (main), keygen.c (keygen_upd_std_prefs, keygen_add_std_prefs, proc_parameter_file): Add --default-keyserver-url to specify a keyserver URL at key generation time, and "Keyserver:" keyword for doing the same through a batch file.
2006-06-23 00:56:54 +02:00
{ oDefaultKeyserverURL, "default-keyserver-url", 2, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oPersonalCipherPreferences, "personal-cipher-preferences", 2, "@"},
{ oPersonalDigestPreferences, "personal-digest-preferences", 2, "@"},
{ oPersonalCompressPreferences, "personal-compress-preferences", 2, "@"},
* mainproc.c (proc_symkey_enc): Don't show algorithm information when --quiet is set. Suggested by Duncan Harris. Also don't fail with BUG() when processing a --symmetric message with a cipher we don't have. * g10.c: Alias --personal-xxx-prefs to --personal-xxx-preferences.
2003-11-10 05:33:13 +01:00
/* Aliases. I constantly mistype these, and assume other people
do as well. */
{ oPersonalCipherPreferences, "personal-cipher-prefs", 2, "@"},
{ oPersonalDigestPreferences, "personal-digest-prefs", 2, "@"},
{ oPersonalCompressPreferences, "personal-compress-prefs", 2, "@"},
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ oDisplay, "display", 2, "@" },
{ oTTYname, "ttyname", 2, "@" },
{ oTTYtype, "ttytype", 2, "@" },
{ oLCctype, "lc-ctype", 2, "@" },
{ oLCmessages, "lc-messages", 2, "@" },
{ oGroup, "group", 2, "@" },
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
{ oUnGroup, "ungroup", 2, "@" },
* g10.c (main): Add --no-groups to zero --group list. * encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically encrypted session key. Use --s2k-cipher-algo to choose cipher, rather than the default cipher. * parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically encrypted session key is seen without salt. Show in --list-packets if a symetrically encrypted session key is present. * pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless --quiet is set. Use text name of cipher in warning.
2003-10-01 17:15:58 +02:00
{ oNoGroups, "no-groups", 0, "@" },
* options.h, g10.c (main): Add --strict and --no-strict to switch the log_warning severity level from info to error.
2002-10-04 00:13:04 +02:00
{ oStrict, "strict", 0, "@" },
{ oNoStrict, "no-strict", 0, "@" },
* g10.c: New options --[no-]mangle-dos-filenames. * options.h (opt): Added mangle-dos-filenames. * openfile.c (open_outfile) [USE_ONLY_8DOT3]: Truncate the filename only when this option is set; this is the default.
2002-12-05 16:25:16 +01:00
{ oMangleDosFilenames, "mangle-dos-filenames", 0, "@" },
{ oNoMangleDosFilenames, "no-mangle-dos-filenames", 0, "@" },
* Makefile.am (AM_CFLAGS): Make use of AM_CFLAGS and AM_LDFLAGS. * g10.c, options.h: New option --enable-progress-filter. * progress.c (handle_progress): Make use of it.
2003-04-15 17:46:13 +02:00
{ oEnableProgressFilter, "enable-progress-filter", 0, "@" },
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
{ oMultifile, "multifile", 0, "@" },
* options.h, g10.c (main): Add a more flexible --keyid-format option to replace the list-option (and eventually verify-option) show-long-keyids. The format can be short, long, 0xshort, and 0xlong. * keydb.h, keyid.c (keystr, keystrlen): New functions to generate a printable keyid. * keyedit.c (print_and_check_one_sig, show_key_with_all_names), keylist.c (list_keyblock_print): Use new keystr() function here to print keyids.
2004-03-03 06:47:51 +01:00
{ oKeyidFormat, "keyid-format", 2, "@" },
* gpg.sgml (http): * g10.c, options.h: New option --exit-on-status-write-error. * status.c (write_status_text): Make use of this option.
2005-07-22 18:28:40 +02:00
{ oExitOnStatusWriteError, "exit-on-status-write-error", 0, "@" },
* g10.c, options.h: New option --limit-card-insert-tries. * cardglue.c (open_card): Use it.
2005-07-19 14:14:39 +02:00
{ oLimitCardInsertTries, "limit-card-insert-tries", 1, "@"},
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
{ oReaderPort, "reader-port", 2, "@"},
{ octapiDriver, "ctapi-driver", 2, "@"},
{ opcscDriver, "pcsc-driver", 2, "@"},
* primegen.c (gen_prime): Bail out if we try to generate a prime with less than 16 bits. Include i18n.h. * POTFILES.in (cipher/primegen.c): Added.
2003-10-10 11:28:26 +02:00
{ oDisableCCID, "disable-ccid", 0, "@"},
* g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver. * ccid-driver.c (read_device_info): Removed. (make_reader_id, scan_or_find_devices): New. (ccid_open_reader): Simplified by make use of the new functions. (ccid_set_debug_level): New. Changed the macros to make use of it. It has turned out that it is often useful to enable debugging at runtime so I added this option.
2004-09-15 17:26:38 +02:00
#if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB)
{ oDebugCCIDDriver, "debug-ccid-driver", 0, "@"},
#endif
More tests added; make distcheck works
2006-03-07 12:05:41 +01:00
{ oAllowMultisigVerification, "allow-multisig-verification", 0, "@"},
* options.h, gpg.c (main): Add --enable-dsa2 and --disable-dsa2. Defaults to disable. * pkclist.c (algo_available): If --enable-dsa2 is set, we're allowed to truncate hashes to fit DSA keys. * sign.c (match_dsa_hash): New. Return the best match hash for a given q size. (do_sign, hash_for, sign_file): When signing with a DSA key, if it has q==160, assume it is an old DSA key and don't allow truncation unless --enable-dsa2 is also set. q!=160 always allows truncation since they must be DSA2 keys. (make_keysig_packet): If the user doesn't specify a --cert-digest-algo, use match_dsa_hash to pick the best hash for key signatures.
2006-04-20 23:32:42 +02:00
{ oEnableDSA2, "enable-dsa2", 0, "@"},
{ oDisableDSA2, "disable-dsa2", 0, "@"},
More tests added; make distcheck works
2006-03-07 12:05:41 +01:00
* keydb.h, getkey.c (release_akl), gpg.c (main): Add --no-auto-key-locate. * options.h, gpg.c (main): Keep track of each keyserver registered so we can match on them later. * keyserver-internal.h, keyserver.c (cmp_keyserver_spec, keyserver_match), gpgv.c: New. Find a keyserver that matches ours and return its spec. * getkey.c (get_pubkey_byname): Use it here to get the per-keyserver options from an earlier keyserver.
2006-02-24 15:27:22 +01: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. */
* g10.c (main): Add aliases sign-with->local-user and user->recipient to make switching from PGP command line to GPG easier.
2005-08-20 21:38:45 +02:00
{ oLocalUser, "sign-with", 2, "@" },
{ oRecipient, "user", 2, "@" },
* options.h, mainproc.c (check_sig_and_print), gpg.c (main): pka-lookups, not pka-lookup. * options.h, gpg.c (main), keyedit.c [cmds], sig-check.c (signature_check2): Rename "backsign" to "cross-certify" as a more accurate name.
2006-03-08 03:40:42 +01:00
{ oRequireCrossCert, "require-backsigs", 0, "@"},
{ oRequireCrossCert, "require-cross-certification", 0, "@"},
{ oNoRequireCrossCert, "no-require-backsigs", 0, "@"},
{ oNoRequireCrossCert, "no-require-cross-certification", 0, "@"},
* options.h, keydb.h, g10.c (main), getkey.c (parse_auto_key_locate): Parse a list of key access methods. (get_pubkey_byname): Walk the list here to try and retrieve keys we don't have locally.
2006-02-22 20:06:23 +01:00
{ oAutoKeyLocate, "auto-key-locate", 2, "@"},
* keydb.h, getkey.c (release_akl), gpg.c (main): Add --no-auto-key-locate. * options.h, gpg.c (main): Keep track of each keyserver registered so we can match on them later. * keyserver-internal.h, keyserver.c (cmp_keyserver_spec, keyserver_match), gpgv.c: New. Find a keyserver that matches ours and return its spec. * getkey.c (get_pubkey_byname): Use it here to get the per-keyserver options from an earlier keyserver.
2006-02-24 15:27:22 +01:00
{ oNoAutoKeyLocate, "no-auto-key-locate", 0, "@"},
* options.h, mainproc.c (symkey_decrypt_seskey), keyserver.c (struct keyrec, parse_keyrec, keyserver_search_prompt), keyedit.c (keyedit_menu), g10.c (add_keyserver_url, add_policy_url): Fix some compiler warnings.
2004-05-10 23:46:00 +02:00
{0,NULL,0,NULL}
};
added option export
1998-02-13 21:58:50 +01:00
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
#ifdef ENABLE_SELINUX_HACKS
#define ALWAYS_ADD_KEYRINGS 1
#else
#define ALWAYS_ADD_KEYRINGS 0
#endif
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
int g10_errors_seen = 0;
Some bug fixes of the last release
1998-11-10 13:59:59 +01:00
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 12:53:35 +02:00
static int utf8_strings = 0;
fixed severe exploit
1998-07-09 15:37:17 +02:00
static int maybe_setuid = 1;
NT version compiles
1998-01-05 20:13:15 +01:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
static char *build_list( const char *text, char letter,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
const char *(*mapf)(int), int (*chkf)(int) );
bug fix release
1998-08-11 19:29:34 +02:00
static void set_cmd( enum cmd_and_opt_values *ret_cmd,
enum cmd_and_opt_values new_cmd );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
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 );
* options.h, g10.c (main, add_keyserver_url): Add --sig-preferred-keyserver to implant a "where to get my key" subpacket into a signature. * sign.c (mk_notation_and_policy): Rename to mk_notation_policy_etc and add preferred keyserver support for signatures.
2003-07-24 21:28:12 +02:00
static void add_keyserver_url( const char *string, int which );
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
const char *
strusage( int level )
initially checkin
1997-11-18 15:06:00 +01:00
{
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
static char *digests, *pubkeys, *ciphers, *zips;
initially checkin
1997-11-18 15:06:00 +01:00
const char *p;
switch( level ) {
See ChangeLog: Sun Apr 18 10:11:28 CEST 1999 Werner Koch
1999-04-18 10:18:52 +02:00
case 11: p = "gpg (GnuPG)";
removed g10maint.c
1998-03-05 10:22:13 +01:00
break;
some import functionality
1998-02-16 21:05:02 +01:00
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
removed g10maint.c
1998-03-05 10:22:13 +01:00
case 19: p =
add-key works
1998-05-26 15:38:00 +02:00
_("Please report bugs to <gnupg-bugs@gnu.org>.\n");
removed g10maint.c
1998-03-05 10:22:13 +01:00
break;
* g10.c (strusage, main): Show development version warning in --version output. (main): Set --bzip2-compress-level to the default value at startup. Remove --emulate-checksum-bug noop.
2003-12-04 05:58:12 +01:00
#ifdef IS_DEVELOPMENT_VERSION
case 20:
p="NOTE: THIS IS A DEVELOPMENT VERSION!";
break;
case 21:
p="It is only intended for test purposes and should NOT be";
break;
case 22:
p="used in a production environment or with production keys!";
break;
#endif
initially checkin
1997-11-18 15:06:00 +01:00
case 1:
removed g10maint.c
1998-03-05 10:22:13 +01:00
case 40: p =
_("Usage: gpg [options] [files] (-h for help)");
break;
case 41: p =
_("Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n");
break;
some import functionality
1998-02-16 21:05:02 +01:00
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case 31: p = "\nHome: "; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#ifndef __riscos__
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case 32: p = opt.homedir; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#else /* __riscos__ */
case 32: p = make_filename(opt.homedir, NULL); break;
#endif /* __riscos__ */
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case 33: p = _("\nSupported algorithms:\n"); break;
case 34:
some import functionality
1998-02-16 21:05:02 +01:00
if( !pubkeys )
* keydb.h: Err on the side of making an unknown signature a SIG rather than a CERT. * import.c (delete_inv_parts): Discard any key signatures that aren't key types (i.e. 0x00, 0x01, etc.) * g10.c (main): Add deprecated option warning for --list-ownertrust. Add --compression-algo alias for --compress-algo. Change --version output strings to match "showpref" strings, and make translatable. * status.c (do_get_from_fd): Accept 'y' as well as 'Y' for --command-fd boolean input. * trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX) * keyedit.c (show_key_with_all_names_colon): Show no-ks-modify flag.
2003-03-24 21:05:53 +01:00
pubkeys = build_list(_("Pubkey: "), 0, pubkey_algo_to_string,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
check_pubkey_algo );
some import functionality
1998-02-16 21:05:02 +01:00
p = pubkeys;
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case 35:
if( !ciphers )
* keydb.h: Err on the side of making an unknown signature a SIG rather than a CERT. * import.c (delete_inv_parts): Discard any key signatures that aren't key types (i.e. 0x00, 0x01, etc.) * g10.c (main): Add deprecated option warning for --list-ownertrust. Add --compression-algo alias for --compress-algo. Change --version output strings to match "showpref" strings, and make translatable. * status.c (do_get_from_fd): Accept 'y' as well as 'Y' for --command-fd boolean input. * trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX) * keyedit.c (show_key_with_all_names_colon): Show no-ks-modify flag.
2003-03-24 21:05:53 +01:00
ciphers = build_list(_("Cipher: "), 'S', cipher_algo_to_string,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
check_cipher_algo );
p = ciphers;
break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case 36:
some import functionality
1998-02-16 21:05:02 +01:00
if( !digests )
* keydb.h: Err on the side of making an unknown signature a SIG rather than a CERT. * import.c (delete_inv_parts): Discard any key signatures that aren't key types (i.e. 0x00, 0x01, etc.) * g10.c (main): Add deprecated option warning for --list-ownertrust. Add --compression-algo alias for --compress-algo. Change --version output strings to match "showpref" strings, and make translatable. * status.c (do_get_from_fd): Accept 'y' as well as 'Y' for --command-fd boolean input. * trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX) * keyedit.c (show_key_with_all_names_colon): Show no-ks-modify flag.
2003-03-24 21:05:53 +01:00
digests = build_list(_("Hash: "), 'H', digest_algo_to_string,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
check_digest_algo );
some import functionality
1998-02-16 21:05:02 +01:00
p = digests;
initially checkin
1997-11-18 15:06:00 +01:00
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case 37:
if( !zips )
* keydb.h: Err on the side of making an unknown signature a SIG rather than a CERT. * import.c (delete_inv_parts): Discard any key signatures that aren't key types (i.e. 0x00, 0x01, etc.) * g10.c (main): Add deprecated option warning for --list-ownertrust. Add --compression-algo alias for --compress-algo. Change --version output strings to match "showpref" strings, and make translatable. * status.c (do_get_from_fd): Accept 'y' as well as 'Y' for --command-fd boolean input. * trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX) * keyedit.c (show_key_with_all_names_colon): Show no-ks-modify flag.
2003-03-24 21:05:53 +01:00
zips = build_list(_("Compression: "),'Z',compress_algo_to_string,
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
check_compress_algo);
p = zips;
break;
some import functionality
1998-02-16 21:05:02 +01:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
default: p = default_strusage(level);
initially checkin
1997-11-18 15:06:00 +01:00
}
return p;
}
some import functionality
1998-02-16 21:05:02 +01:00
static char *
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
build_list( const char *text, char letter,
const char * (*mapf)(int), int (*chkf)(int) )
some import functionality
1998-02-16 21:05:02 +01:00
{
int i;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
const char *s;
some import functionality
1998-02-16 21:05:02 +01:00
size_t n=strlen(text)+2;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
char *list, *p, *line=NULL;
if( maybe_setuid )
secmem_init( 0 ); /* drop setuid */
for(i=0; i <= 110; i++ )
if( !chkf(i) && (s=mapf(i)) )
n += strlen(s) + 7 + 2;
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
list = xmalloc( 21 + n ); *list = 0;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
for(p=NULL, i=0; i <= 110; i++ ) {
if( !chkf(i) && (s=mapf(i)) ) {
if( !p ) {
some import functionality
1998-02-16 21:05:02 +01:00
p = stpcpy( list, text );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
line=p;
}
some import functionality
1998-02-16 21:05:02 +01:00
else
p = stpcpy( p, ", ");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if(strlen(line)>60) {
int spaces=strlen(text);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
list=xrealloc(list,n+spaces+1);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
/* realloc could move the block, so find the end again */
p=list;
while(*p)
p++;
p=stpcpy(p, "\n");
line=p;
for(;spaces;spaces--)
p=stpcpy(p, " ");
}
p = stpcpy(p, s );
if(opt.verbose && letter)
{
char num[8];
sprintf(num," (%c%d)",letter,i);
p = stpcpy(p,num);
}
some import functionality
1998-02-16 21:05:02 +01:00
}
}
if( p )
p = stpcpy(p, "\n" );
return list;
}
added initial i18n stuff
1998-01-26 23:09:01 +01:00
static void
i18n_init(void)
{
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#ifdef USE_SIMPLE_GETTEXT
* g10.c (i18n_init) [W32]: Pass registry key to gettext initialization. * gpgv.c (i18n_init) [W32]: Ditto. * simple-gettext.c (set_gettext_file): Use MO files depending on the installation directory. Add new arg REGKEY.
2005-01-20 12:42:03 +01:00
set_gettext_file (PACKAGE, "Software\\GNU\\GnuPG");
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#else
#ifdef ENABLE_NLS
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
setlocale( LC_ALL, "" );
Removed the use of g10defs.h. This required some code cleanups and the introduction of a few accessor ducntions in mpi.
2006-12-11 20:54:53 +01:00
bindtextdomain (PACKAGE, LOCALEDIR);
added initial i18n stuff
1998-01-26 23:09:01 +01:00
textdomain( PACKAGE );
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#endif
#endif
added initial i18n stuff
1998-01-26 23:09:01 +01:00
}
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
static void
wrong_args( const char *text)
{
fputs(_("usage: gpg [options] "),stderr);
fputs(text,stderr);
putc('\n',stderr);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_exit(2);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
}
static char *
make_username( const char *string )
{
char *p;
if( utf8_strings )
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
p = xstrdup(string);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
else
p = native_to_utf8( string );
return p;
}
initially checkin
1997-11-18 15:06:00 +01:00
static void
set_debug(void)
{
if( opt.debug & DBG_MEMORY_VALUE )
memory_debug_mode = 1;
if( opt.debug & DBG_MEMSTAT_VALUE )
memory_stat_debug_mode = 1;
if( opt.debug & DBG_MPI_VALUE )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
mpi_debug_mode = 1;
initially checkin
1997-11-18 15:06:00 +01:00
if( opt.debug & DBG_CIPHER_VALUE )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10c_debug_mode = 1;
IDEA removed, signing works
1997-11-24 12:04:11 +01:00
if( opt.debug & DBG_IOBUF_VALUE )
iobuf_debug_mode = 1;
gnupg extension are now working
1998-06-13 19:00:02 +02:00
initially checkin
1997-11-18 15:06:00 +01:00
}
2002-09-28 David Shaw <dshaw@jabberwocky.com> * export.c (do_export_stream): Comment. * sig-check.c (check_key_signature2): Properly handle a non-designated revocation import. 2002-09-26 Werner Koch <wk@gnupg.org> * g10.c (set_homedir): New. Changed all direct assignments to use this. * gpgv.c (set_homedir): Ditto.
2002-09-28 19:49:38 +02:00
/* We need the home directory also in some other directories, so make
sure that both variables are always in sync. */
static void
set_homedir (char *dir)
{
if (!dir)
dir = "";
g10_opt_homedir = opt.homedir = dir;
}
* mainproc.c (list_node): Show sigs with --verbose. * options.h, g10.c (set_screen_dimensions): New function to look at COLUMNS and LINES. * keyserver.c (parse_keyrec, keyserver_search_prompt), keyedit.c (print_and_check_one_sig): Use new screen dimension variables.
2004-01-24 01:47:45 +01: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 _WIN32
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;
}
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
/* 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
error. On success the file descriptor is returned. */
static int
open_info_file (const char *fname, int for_write)
{
#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. */
return -1;
#else
int fd;
/* if (is_secured_filename (fname)) */
/* { */
/* fd = -1; */
/* errno = EPERM; */
/* } */
/* else */
/* { */
do
{
if (for_write)
fd = open (fname, O_CREAT | O_TRUNC | O_WRONLY,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
else
fd = open (fname, O_RDONLY | MY_O_BINARY);
}
while (fd == -1 && errno == EINTR);
/* } */
if ( fd == -1)
log_error ( for_write? _("can't create `%s': %s\n")
: _("can't open `%s': %s\n"), fname, strerror(errno));
return fd;
#endif
}
NT version compiles
1998-01-05 20:13:15 +01:00
static void
bug fix release
1998-08-11 19:29:34 +02:00
set_cmd( enum cmd_and_opt_values *ret_cmd, enum cmd_and_opt_values new_cmd )
NT version compiles
1998-01-05 20:13:15 +01:00
{
bug fix release
1998-08-11 19:29:34 +02:00
enum cmd_and_opt_values cmd = *ret_cmd;
NT version compiles
1998-01-05 20:13:15 +01:00
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;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
else if( cmd == aSign && new_cmd == aSym )
cmd = aSignSym;
else if( cmd == aSym && new_cmd == aSign )
cmd = aSignSym;
* g10.c (main): Add --symmetric --encrypt command. This generates a message that can be decrypted via a passphrase or public key system. * main.h, encode.c (encode_seskey): Allow passing in an already-created session key dek. (encode_simple): Use the actual symmetric cipher when encrypting a session key for a symmetric message. (encode_crypt): Add a flag to trigger a hybrid mode that can be decrypted via a passphrase or a pk. Change all callers. * mainproc.c (symkey_decrypt_sesskey): There is no way to tell the difference here between a bad passphrase and a cipher algorithm that we don't have, so use a error message that makes that clear. Use the actual list of ciphers when checking whether a cipher is invalid. Return error if the decrypted cipher algorithm is invalid. (proc_symkey_enc): In a mixed passphrase/pk message, if a valid dek already exists from decrypting via pk, do not try to process the passphrase. (proc_symkey_enc): Indicate when we're decrypting a session key as opposed to decrypting data. If a passphrase is invalid, discard the dek so we'll keep trying.
2003-10-26 04:26:14 +01:00
else if( cmd == aSym && new_cmd == aEncr )
cmd = aEncrSym;
else if( cmd == aEncr && new_cmd == aSym )
cmd = aEncrSym;
NT version compiles
1998-01-05 20:13:15 +01:00
else if( cmd == aKMode && new_cmd == aSym )
cmd = aKModeC;
* g10.c (main): Add --symmetric --sign --encrypt. * main.h, encode.c (setup_symkey): New. Prompt for a passphrase and create a DEK for symmetric encryption. (write_symkey_enc): New. Write out symmetrically encrypted session keys. (encode_crypt, encrypt_filter): Use them here here when creating a message that can be decrypted with a passphrase or a pk. * sign.c (sign_file): Call setup_symkey if we are doing a --symmetric --sign --encrypt.
2003-11-13 03:54:12 +01:00
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;
armor rewritten, but still buggy
1998-02-04 19:54:31 +01:00
else if( ( cmd == aSign && new_cmd == aClearsign )
|| ( cmd == aClearsign && new_cmd == aSign ) )
cmd = aClearsign;
NT version compiles
1998-01-05 20:13:15 +01:00
else {
added initial i18n stuff
1998-01-26 23:09:01 +01:00
log_error(_("conflicting commands\n"));
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_exit(2);
NT version compiles
1998-01-05 20:13:15 +01:00
}
*ret_cmd = cmd;
}
Armor works now
1997-11-21 15:53:57 +01:00
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
static void
add_group(char *string)
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{
char *name,*value;
struct groupitem *item;
/* Break off the group name */
* g10.c (add_group): Use '=' to separate group name from group members. Use a better error message for when no = is found. * hkp.c (hkp_export): Use CRLF in headers.
2002-09-09 21:21:58 +02:00
name=strsep(&string,"=");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if(string==NULL)
{
* pkclist.c (do_edit_ownertrust): Use the same translated string for showing the user ID as mainproc.c:print_pkenc_list. * mainproc.c (print_pkenc_list): Allow translating the quotes around the user ID. * card-util.c, g10.c, photoid.c, trustdb.c: The last of the \"%s\" -> `%s' quoting for things that aren't user IDs. * keyserver.c (keyserver_spawn): If there is no keyserver host, print the whole URI since it is self-contained.
2004-10-11 23:08:37 +02:00
log_error(_("no = sign found in group definition `%s'\n"),name);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
return;
}
* g10.c (add_group): Trim whitespace after a group name so it does not matter where the user puts the = sign. * options.skel: Comment out the first three lines in case someone manually copies the skel file to their homedir. * sign.c (clearsign_file): Only use pgp2mode with v3 keys and MD5. This matches what we do when decoding such messages and prevents creating a message (v3+RIPEMD/160) that we can't verify. * sig-check.c (signature_check2): Use G10ERR_GENERAL as the error for signature digest conflict. BAD_SIGN implies that a signature was checked and we may try and print out a user ID for a key that doesn't exist.
2003-01-16 20:20:10 +01:00
trim_trailing_ws(name,strlen(name));
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
/* Does this group already exist? */
for(item=opt.grouplist;item;item=item->next)
if(strcasecmp(item->name,name)==0)
break;
if(!item)
{
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
item=xmalloc(sizeof(struct groupitem));
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
item->name=name;
item->next=opt.grouplist;
item->values=NULL;
opt.grouplist=item;
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
/* Break apart the values */
* trustdb.c (init_trustdb, get_validity): Don't use a changed trust model to indicate a dirty trustdb, and never auto-rebuild a dirty trustdb with the "always" trust model. * g10.c (add_group): Last commit missed the \t ;)
2003-01-15 18:07:54 +01:00
while ((value= strsep(&string," \t")))
* g10.c (add_group): Fixed group parsing to allow more than one delimiter in a row and also allow tab as delimiter.
2003-01-14 10:35:31 +01:00
{
if (*value)
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
add_to_strlist2(&item->values,value,utf8_strings);
* g10.c (add_group): Fixed group parsing to allow more than one delimiter in a row and also allow tab as delimiter.
2003-01-14 10:35:31 +01:00
}
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
static void
rm_group(char *name)
{
struct groupitem *item,*last=NULL;
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;
free_strlist(item->values);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(item);
* keygen.c (keygen_set_std_prefs): Build the default preferences list at runtime as it properly handles algorithms disabled at build or run time. * getkey.c (merge_selfsigs_main): Properly handle expired user IDs when the expired self-sig is not the only self-sig. * misc.c (compress_algo_to_string): Return NULL on failure like all of the other xxxx_algo_to_string() functions. * mainproc.c (list_node): Minor spacing tweak to match --list-keys output. * keylist.c (list_keyblock_print), mainproc.c (list_node): Mark revoked subkeys as revoked. Requested by Matthew Wilcox. Revoked overrides expiration when both apply. * keyedit.c (show_prefs): Use compress algo constants. (show_basic_key_info): Make revoked and expired tags translatable. * g10.c (rm_group): Properly ungroup from a list of groups.
2004-02-10 23:42:34 +01:00
break;
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
}
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
}
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
/* We need to check three things.
0) The homedir. It must be x00, a directory, and owned by the
user.
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01: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.
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
2) Extensions. Same as #1.
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
Returns true if the item is unsafe. */
static int
check_permissions(const char *path,int item)
{
#if defined(HAVE_STAT) && !defined(HAVE_DOSISH_SYSTEM)
static int homedir_cache=-1;
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
char *tmppath,*dir;
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
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;
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
assert(item==0 || item==1 || item==2);
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
/* extensions may attach a path */
if(item==2 && path[0]!=DIRSEP_C)
{
if(strchr(path,DIRSEP_C))
tmppath=make_filename(path,NULL);
else
tmppath=make_filename(GNUPG_LIBDIR,path,NULL);
}
else
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
tmppath=xstrdup(path);
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02: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. */
Cleanups and minor fixes.
2002-09-10 10:40:12 +02:00
if(item!=0 && homedir_cache>-1
&& ascii_strncasecmp(opt.homedir,tmppath,strlen(opt.homedir))==0)
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
{
ret=homedir_cache;
goto end;
}
/* It's okay if the file or directory doesn't exist */
if(stat(tmppath,&statbuf)!=0)
{
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);
if(stat(dir,&dirbuf)!=0 || !S_ISDIR(dirbuf.st_mode))
{
/* Weird error */
ret=1;
goto end;
}
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(dir);
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02: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)
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
{
if(item==0)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe ownership on"
" homedir `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
else if(item==1)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe ownership on"
" configuration file `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
else
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe ownership on"
" extension `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
}
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
if(perm)
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
{
if(item==0)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe permissions on"
" homedir `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
else if(item==1)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe permissions on"
" configuration file `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
else
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe permissions on"
" extension `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
}
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
if(enc_dir_own)
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
{
if(item==0)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe enclosing directory ownership on"
" homedir `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
else if(item==1)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe enclosing directory ownership on"
" configuration file `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
else
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe enclosing directory ownership on"
" extension `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
}
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
if(enc_dir_perm)
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
{
if(item==0)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe enclosing directory permissions on"
" homedir `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
else if(item==1)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe enclosing directory permissions on"
" configuration file `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
else
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("WARNING: unsafe enclosing directory permissions on"
" extension `%s'\n"),tmppath);
From stable branch * keyedit.c (menu_addrevoker): The direct key signature for revocation keys must be at least v4 to carry the revocation key subpacket. Add a PGP 2.x warning for revocation keys. * g10.c (check_permissions): Rearrange strings to make translating easier (don't incorporate string parts). * keyedit.c (sign_uids): Make strings translatable. * sig-check.c (check_key_signature2): Make string translatable.
2002-09-17 05:21:13 +02:00
}
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
}
end:
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(tmppath);
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
if(homedir)
homedir_cache=ret;
return ret;
#endif /* HAVE_STAT && !HAVE_DOSISH_SYSTEM */
return 0;
}
added option export
1998-02-13 21:58:50 +01:00
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01: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
printf(";");
printf("%d",i);
}
}
}
/* 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)
{
int show_all=(items==NULL);
char *name=NULL;
if(!opt.with_colons)
return;
while(show_all || (name=strsep(&items," ")))
{
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
int any=0;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
if(show_all || ascii_strcasecmp(name,"group")==0)
{
struct groupitem *iter;
for(iter=opt.grouplist;iter;iter=iter->next)
{
STRLIST sl;
printf("cfg:group:");
print_string(stdout,iter->name,strlen(iter->name),':');
printf(":");
for(sl=iter->values;sl;sl=sl->next)
{
print_string2(stdout,sl->d,strlen(sl->d),':',';');
if(sl->next)
printf(";");
}
printf("\n");
}
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
any=1;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
if(show_all || ascii_strcasecmp(name,"version")==0)
{
printf("cfg:version:");
print_string(stdout,VERSION,strlen(VERSION),':');
printf("\n");
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
any=1;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
if(show_all || ascii_strcasecmp(name,"pubkey")==0)
{
printf("cfg:pubkey:");
print_algo_numbers(check_pubkey_algo);
printf("\n");
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
any=1;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
if(show_all || ascii_strcasecmp(name,"cipher")==0)
{
printf("cfg:cipher:");
print_algo_numbers(check_cipher_algo);
printf("\n");
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
any=1;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
if(show_all
|| ascii_strcasecmp(name,"digest")==0
|| ascii_strcasecmp(name,"hash")==0)
{
printf("cfg:digest:");
print_algo_numbers(check_digest_algo);
printf("\n");
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
any=1;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
if(show_all || ascii_strcasecmp(name,"compress")==0)
{
printf("cfg:compress:");
print_algo_numbers(check_compress_algo);
printf("\n");
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
any=1;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
* configure.ac: Don't check for usb_create_match or use_get_string_simple anymore. * g10.c (list_config): New config option ccid-reader-id. (gpgconf_list): Add "reader-port". * apdu.c (open_ccid_reader): New arg PORTSTR. Pass it to ccid_open_reader. (apdu_open_reader): Pass portstr to open_ccid_reader. * ccid-driver.c (ccid_get_reader_list): New. (ccid_open_reader): Changed API to take a string for the reader. Removed al the cruft for the libusb development vesion which seems not to be maintained anymore and there are no packages anyway. The stable library works just fine. (struct ccid_reader_id_s): Deleted and replaced everywhere by a simple string. (usb_get_string_simple): Removed. (bulk_in): Do valgrind hack here and not just everywhere.
2004-09-17 15:57:29 +02:00
if(show_all || ascii_strcasecmp(name,"ccid-reader-id")==0)
{
#if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB)
char *p, *p2, *list = ccid_get_reader_list ();
for (p=list; p && (p2 = strchr (p, '\n')); p = p2+1)
{
*p2 = 0;
printf("cfg:ccid-reader-id:%s\n", p);
}
free (list);
#endif
any=1;
}
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
if(show_all)
break;
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
if(!any)
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_error(_("unknown configuration item `%s'\n"),name);
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
}
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
/* List options and default values in the GPG Conf format. This is a
new tool distributed with gnupg 1.9.x but we also want some limited
support in older gpg versions. The output is the name of the
configuration file and a list of options available for editing by
gpgconf. */
static void
gpgconf_list (const char *configfile)
{
/* The following definitions are taken from gnupg/tools/gpgconf-comp.c. */
#define GC_OPT_FLAG_NONE 0UL
#define GC_OPT_FLAG_DEFAULT (1UL << 4)
printf ("gpgconf-gpg.conf:%lu:\"%s\n",
GC_OPT_FLAG_DEFAULT,configfile?configfile:"/dev/null");
printf ("verbose:%lu:\n", GC_OPT_FLAG_NONE);
printf ("quiet:%lu:\n", GC_OPT_FLAG_NONE);
printf ("keyserver:%lu:\n", GC_OPT_FLAG_NONE);
* configure.ac: Don't check for usb_create_match or use_get_string_simple anymore. * g10.c (list_config): New config option ccid-reader-id. (gpgconf_list): Add "reader-port". * apdu.c (open_ccid_reader): New arg PORTSTR. Pass it to ccid_open_reader. (apdu_open_reader): Pass portstr to open_ccid_reader. * ccid-driver.c (ccid_get_reader_list): New. (ccid_open_reader): Changed API to take a string for the reader. Removed al the cruft for the libusb development vesion which seems not to be maintained anymore and there are no packages anyway. The stable library works just fine. (struct ccid_reader_id_s): Deleted and replaced everywhere by a simple string. (usb_get_string_simple): Removed. (bulk_in): Do valgrind hack here and not just everywhere.
2004-09-17 15:57:29 +02:00
printf ("reader-port:%lu:\n", GC_OPT_FLAG_NONE);
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
}
* options.h, keylist.c (print_one_subpacket, print_subpackets_colon): Print a spk record for each request subpacket. (list_keyblock_colon): Call them here. * g10.c (parse_subpacket_list, parse_list_options): New. Make the list of subpackets we are going to print. (main): Call them here.
2004-09-12 17:27:38 +02: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;
}
}
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(opt.show_subpackets);
opt.show_subpackets=xmalloc(count+1);
* options.h, keylist.c (print_one_subpacket, print_subpackets_colon): Print a spk record for each request subpacket. (list_keyblock_colon): Call them here. * g10.c (parse_subpacket_list, parse_list_options): New. Make the list of subpackets we are going to print. (main): Call them here.
2004-09-12 17:27:38 +02:00
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[]=
{
* main.h, misc.c (parse_options): Add the ability to have help strings in xxx-options commands. * keyserver.c (keyserver_opts), import.c (parse_import_options), export.c (parse_export_options), g10.c (parse_list_options, main): Add help strings to xxx-options.
2005-09-15 00:31:21 +02:00
{"show-photos",LIST_SHOW_PHOTOS,NULL,
N_("display photo IDs during key listings")},
{"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},
{NULL,0,NULL,NULL}
* options.h, keylist.c (print_one_subpacket, print_subpackets_colon): Print a spk record for each request subpacket. (list_keyblock_colon): Call them here. * g10.c (parse_subpacket_list, parse_list_options): New. Make the list of subpackets we are going to print. (main): Call them here.
2004-09-12 17:27:38 +02:00
};
* g10.c (parse_list_options): Fix non-constant initializer so we can build with C89.
2004-10-21 03:10:49 +02:00
/* C99 allows for non-constant initializers, but we'd like to
* options.h, g10.c (main), mainproc.c (check_sig_and_print): Rename verify-option show-validity to show-uid-validity to match the similar list-option. * app-openpgp.c (verify_chv3): Fix typo.
2004-10-21 21:18:47 +02:00
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. */
* g10.c (parse_list_options): Fix non-constant initializer so we can build with C89.
2004-10-21 03:10:49 +02:00
lopts[12].value=&subpackets;
* options.h, keylist.c (print_one_subpacket, print_subpackets_colon): Print a spk record for each request subpacket. (list_keyblock_colon): Call them here. * g10.c (parse_subpacket_list, parse_list_options): New. Make the list of subpackets we are going to print. (main): Call them here.
2004-09-12 17:27:38 +02: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' */
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(opt.show_subpackets);
* options.h, keylist.c (print_one_subpacket, print_subpackets_colon): Print a spk record for each request subpacket. (list_keyblock_colon): Call them here. * g10.c (parse_subpacket_list, parse_list_options): New. Make the list of subpackets we are going to print. (main): Call them here.
2004-09-12 17:27:38 +02:00
opt.show_subpackets=NULL;
}
return 1;
}
else
return 0;
}
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
/* 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;
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
str=xrealloc(str,len);
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
if(first)
{
str[0]='\0';
first=0;
}
else
strcat(str," ");
strcat(str,argv[i]);
}
return str;
}
* pkclist.c (do_edit_ownertrust): Different prompt when we're using direct trust since the meaning is different. * keyedit.c (trustsig_prompt): Change the strings to match the ones in pkclist.c:do_edit_ownertrust to make translation easier. * trustdb.c (trust_model_string, get_validity): Add direct trust model which applies to the key as a whole and not per-uid. * options.h, g10.c (parse_trust_model): New. (main): Call it from here to do string-to-trust-model.
2004-10-13 17:34:52 +02:00
static void
parse_trust_model(const char *model)
{
if(ascii_strcasecmp(model,"pgp")==0)
* options.h, gpg.c (main, parse_trust_model), pkclist.c (check_signatures_trust), mainproc.c (check_sig_and_print, pka_uri_from_sig), trustdb.c (init_trustdb): Some tweaks to PKA so that it is a verify-option now.
2006-03-07 21:14:20 +01:00
opt.trust_model=TM_PGP;
* pkclist.c (do_edit_ownertrust): Different prompt when we're using direct trust since the meaning is different. * keyedit.c (trustsig_prompt): Change the strings to match the ones in pkclist.c:do_edit_ownertrust to make translation easier. * trustdb.c (trust_model_string, get_validity): Add direct trust model which applies to the key as a whole and not per-uid. * options.h, g10.c (parse_trust_model): New. (main): Call it from here to do string-to-trust-model.
2004-10-13 17:34:52 +02:00
else if(ascii_strcasecmp(model,"classic")==0)
* options.h, gpg.c (main, parse_trust_model), pkclist.c (check_signatures_trust), mainproc.c (check_sig_and_print, pka_uri_from_sig), trustdb.c (init_trustdb): Some tweaks to PKA so that it is a verify-option now.
2006-03-07 21:14:20 +01:00
opt.trust_model=TM_CLASSIC;
* pkclist.c (do_edit_ownertrust): Different prompt when we're using direct trust since the meaning is different. * keyedit.c (trustsig_prompt): Change the strings to match the ones in pkclist.c:do_edit_ownertrust to make translation easier. * trustdb.c (trust_model_string, get_validity): Add direct trust model which applies to the key as a whole and not per-uid. * options.h, g10.c (parse_trust_model): New. (main): Call it from here to do string-to-trust-model.
2004-10-13 17:34:52 +02:00
else if(ascii_strcasecmp(model,"always")==0)
* options.h, gpg.c (main, parse_trust_model), pkclist.c (check_signatures_trust), mainproc.c (check_sig_and_print, pka_uri_from_sig), trustdb.c (init_trustdb): Some tweaks to PKA so that it is a verify-option now.
2006-03-07 21:14:20 +01:00
opt.trust_model=TM_ALWAYS;
* pkclist.c (do_edit_ownertrust): Different prompt when we're using direct trust since the meaning is different. * keyedit.c (trustsig_prompt): Change the strings to match the ones in pkclist.c:do_edit_ownertrust to make translation easier. * trustdb.c (trust_model_string, get_validity): Add direct trust model which applies to the key as a whole and not per-uid. * options.h, g10.c (parse_trust_model): New. (main): Call it from here to do string-to-trust-model.
2004-10-13 17:34:52 +02:00
else if(ascii_strcasecmp(model,"direct")==0)
* options.h, gpg.c (main, parse_trust_model), pkclist.c (check_signatures_trust), mainproc.c (check_sig_and_print, pka_uri_from_sig), trustdb.c (init_trustdb): Some tweaks to PKA so that it is a verify-option now.
2006-03-07 21:14:20 +01:00
opt.trust_model=TM_DIRECT;
* pkclist.c (do_edit_ownertrust): Different prompt when we're using direct trust since the meaning is different. * keyedit.c (trustsig_prompt): Change the strings to match the ones in pkclist.c:do_edit_ownertrust to make translation easier. * trustdb.c (trust_model_string, get_validity): Add direct trust model which applies to the key as a whole and not per-uid. * options.h, g10.c (parse_trust_model): New. (main): Call it from here to do string-to-trust-model.
2004-10-13 17:34:52 +02:00
else if(ascii_strcasecmp(model,"auto")==0)
* options.h, gpg.c (main, parse_trust_model), pkclist.c (check_signatures_trust), mainproc.c (check_sig_and_print, pka_uri_from_sig), trustdb.c (init_trustdb): Some tweaks to PKA so that it is a verify-option now.
2006-03-07 21:14:20 +01:00
opt.trust_model=TM_AUTO;
* pkclist.c (do_edit_ownertrust): Different prompt when we're using direct trust since the meaning is different. * keyedit.c (trustsig_prompt): Change the strings to match the ones in pkclist.c:do_edit_ownertrust to make translation easier. * trustdb.c (trust_model_string, get_validity): Add direct trust model which applies to the key as a whole and not per-uid. * options.h, g10.c (parse_trust_model): New. (main): Call it from here to do string-to-trust-model.
2004-10-13 17:34:52 +02:00
else
log_error("unknown trust model `%s'\n",model);
}
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
* gpg.c (reopen_std): New function to reopen fd 0, 1, or 2 if we are called with them closed. This is to protect our keyring/trustdb files from corruption if they get attached to one of the standard fds. Print a warning if possible that this has happened, and fail completely if we cannot reopen (should never happen). (main): Call it here.
2006-05-24 00:04:09 +02:00
/* Must be called before we open any files. */
static void
reopen_std(void)
{
do no use reopen_std under W32.
2006-06-27 10:40:23 +02:00
#if defined(HAVE_STAT) && !defined(HAVE_W32_SYSTEM)
* gpg.c (reopen_std): New function to reopen fd 0, 1, or 2 if we are called with them closed. This is to protect our keyring/trustdb files from corruption if they get attached to one of the standard fds. Print a warning if possible that this has happened, and fail completely if we cannot reopen (should never happen). (main): Call it here.
2006-05-24 00:04:09 +02:00
struct stat statbuf;
int did_stdin=0,did_stdout=0,did_stderr=0;
FILE *complain;
if(fstat(STDIN_FILENO,&statbuf)==-1 && errno==EBADF)
{
if(open("/dev/null",O_RDONLY)==STDIN_FILENO)
did_stdin=1;
else
did_stdin=2;
}
if(fstat(STDOUT_FILENO,&statbuf)==-1 && errno==EBADF)
{
if(open("/dev/null",O_WRONLY)==STDOUT_FILENO)
did_stdout=1;
else
did_stdout=2;
}
if(fstat(STDERR_FILENO,&statbuf)==-1 && errno==EBADF)
{
if(open("/dev/null",O_WRONLY)==STDERR_FILENO)
did_stderr=1;
else
did_stderr=2;
}
/* It's hard to log this sort of thing since the filehandle we would
complain to may be closed... */
if(did_stderr==0)
complain=stderr;
else if(did_stdout==0)
complain=stdout;
else
complain=NULL;
if(complain)
{
if(did_stdin==1)
fprintf(complain,"gpg: WARNING: standard input reopened\n");
if(did_stdout==1)
fprintf(complain,"gpg: WARNING: standard output reopened\n");
if(did_stderr==1)
fprintf(complain,"gpg: WARNING: standard error reopened\n");
if(did_stdin==2 || did_stdout==2 || did_stderr==2)
fprintf(complain,"gpg: fatal: unable to reopen standard input,"
" output, or error\n");
}
if(did_stdin==2 || did_stdout==2 || did_stderr==2)
exit(3);
do no use reopen_std under W32.
2006-06-27 10:40:23 +02:00
#endif /* HAVE_STAT && !HAVE_W32_SYSTEM */
* gpg.c (reopen_std): New function to reopen fd 0, 1, or 2 if we are called with them closed. This is to protect our keyring/trustdb files from corruption if they get attached to one of the standard fds. Print a warning if possible that this has happened, and fail completely if we cannot reopen (should never happen). (main): Call it here.
2006-05-24 00:04:09 +02:00
}
* parse-packet.c (parse_symkeyenc): Show the unpacked as well as the packed s2k iteration count. * main.h, options.h, gpg.c (encode_s2k_iterations, main), passphrase.c (hash_passphrase): Add --s2k-count option to specify the number of s2k hash iterations.
2006-10-13 05:44:34 +02:00
/* Pack an s2k iteration count into the form specified in 2440. If
we're in between valid values, round up. */
static unsigned char
encode_s2k_iterations(int iterations)
{
unsigned char c=0,result;
unsigned int count;
if(iterations<=1024)
return 0;
if(iterations>=65011712)
return 255;
/* Need count to be in the range 16-31 */
for(count=iterations>>6;count>=32;count>>=1)
c++;
result=(c<<4)|(count-16);
if(S2K_DECODE_COUNT(result)<iterations)
result++;
return result;
}
add-key works
1998-05-26 15:38:00 +02:00
int
* g10.c, options.h: New option --limit-card-insert-tries. * cardglue.c (open_card): Use it.
2005-07-19 14:14:39 +02:00
main (int argc, char **argv )
initially checkin
1997-11-18 15:06:00 +01:00
{
added option file handling
1997-12-12 13:03:58 +01:00
ARGPARSE_ARGS pargs;
initially checkin
1997-11-18 15:06:00 +01:00
IOBUF a;
added some trust model stuff
1998-01-16 22:15:24 +01:00
int rc=0;
added option file handling
1997-12-12 13:03:58 +01:00
int orig_argc;
char **orig_argv;
partial DSA support
1998-03-09 22:44:06 +01:00
const char *fname;
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 14:57:54 +02:00
char *username;
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
int may_coredump;
IDEA removed, signing works
1997-11-24 12:04:11 +01:00
STRLIST sl, remusr= NULL, locusr=NULL;
fixed severe exploit
1998-07-09 15:37:17 +02:00
STRLIST nrings=NULL, sec_nrings=NULL;
Armor works now
1997-11-21 15:53:57 +01:00
armor_filter_context_t afx;
fingerprints and self signatures added
1997-12-09 13:46:23 +01:00
int detached_sig = 0;
added option file handling
1997-12-12 13:03:58 +01:00
FILE *configfp = NULL;
char *configname = NULL;
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
char *save_configname = NULL;
added option file handling
1997-12-12 13:03:58 +01:00
unsigned configlineno;
bug fixes
1998-02-12 00:22:09 +01:00
int parse_debug = 0;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
int default_config = 1;
very first release
1997-12-20 18:23:29 +01:00
int default_keyring = 1;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
int greeting = 0;
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 19:47:23 +02:00
int nogreeting = 0;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
int use_random_seed = 1;
bug fix release
1998-08-11 19:29:34 +02:00
enum cmd_and_opt_values cmd = 0;
changed structure of trustdb
1998-02-02 15:36:06 +01:00
const char *trustdb_name = NULL;
fixed severe exploit
1998-07-09 15:37:17 +02:00
char *def_cipher_string = NULL;
char *def_digest_string = NULL;
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
char *compress_algo_string = NULL;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
char *cert_digest_string = NULL;
*** empty log message ***
1998-09-28 21:25:31 +02:00
char *s2k_cipher_string = NULL;
char *s2k_digest_string = NULL;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
char *pers_cipher_list = NULL;
char *pers_digest_list = NULL;
char *pers_compress_list = NULL;
int eyes_only=0;
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
int multifile=0;
*** empty log message ***
1998-09-28 21:25:31 +02:00
int pwfd = -1;
See ChangeLog: Thu Jul 8 16:21:27 CEST 1999 Werner Koch
1999-07-08 16:24:35 +02:00
int with_fpr = 0; /* make an option out of --fingerprint */
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
int any_explicit_recipient = 0;
* g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg to exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock.
2004-12-16 06:16:09 +01:00
int require_secmem=0,got_secmem=0;
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#ifdef USE_SHM_COPROCESSING
add coprocess facility
1998-07-31 18:45:58 +02:00
ulong requested_shm_size=0;
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#endif
added option file handling
1997-12-12 13:03:58 +01:00
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#ifdef __riscos__
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.lock_once = 1;
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#endif /* __riscos__ */
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
* gpg.c (reopen_std): New function to reopen fd 0, 1, or 2 if we are called with them closed. This is to protect our keyring/trustdb files from corruption if they get attached to one of the standard fds. Print a warning if possible that this has happened, and fail completely if we cannot reopen (should never happen). (main): Call it here.
2006-05-24 00:04:09 +02:00
reopen_std();
new release
1998-05-15 20:49:19 +02:00
trap_unaligned();
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
secmem_set_flags( secmem_get_flags() | 2 ); /* suspend warnings */
release 0.2.3
1998-02-09 18:43:42 +01: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
*/
Renamed to GNUPG
1998-02-24 19:50:46 +01:00
log_set_name("gpg");
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
secure_randoxmalloc(); /* put random number into secure memory */
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
may_coredump = disable_core_dumps();
backup
1998-10-12 22:16:38 +02:00
init_signals();
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 14:16:33 +01:00
create_dotlock(NULL); /* register locking cleanup */
added initial i18n stuff
1998-01-26 23:09:01 +01:00
i18n_init();
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
opt.command_fd = -1; /* no command fd */
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
opt.compress_level = -1; /* defaults to standard compress level */
* g10.c (strusage, main): Show development version warning in --version output. (main): Set --bzip2-compress-level to the default value at startup. Remove --emulate-checksum-bug noop.
2003-12-04 05:58:12 +01:00
opt.bz2_compress_level = -1; /* defaults to standard compress level */
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
/* note: if you change these lines, look at oOpenPGP */
intermediate check in
1998-08-05 18:51:59 +02:00
opt.def_cipher_algo = 0;
new release
1998-05-15 20:49:19 +02:00
opt.def_digest_algo = 0;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.cert_digest_algo = 0;
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
opt.compress_algo = -1; /* defaults to DEFAULT_COMPRESS_ALGO */
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
opt.s2k_mode = 3; /* iterated+salted */
* parse-packet.c (parse_symkeyenc): Show the unpacked as well as the packed s2k iteration count. * main.h, options.h, gpg.c (encode_s2k_iterations, main), passphrase.c (hash_passphrase): Add --s2k-count option to specify the number of s2k hash iterations.
2006-10-13 05:44:34 +02:00
opt.s2k_count = 96; /* 65536 iterations */
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
#ifdef USE_CAST5
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
#else
opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
#endif
Ready to test version 0.2.0
1998-01-25 19:56:33 +01:00
opt.completes_needed = 1;
opt.marginals_needed = 3;
See ChangeLog ;-). Key validation should now be faster
1998-11-13 20:41:41 +01:00
opt.max_cert_depth = 5;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
opt.pgp2_workarounds = 1;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.force_v3_sigs = 1;
opt.escape_from = 1;
* gpg.c (main): Restore convert-sk-to-pk as programs rely on it. * keyid.c (usagestr_from_pk): Remove special PUBKEY_USAGE_CERT flag. It's no longer needed.
2005-12-19 02:51:31 +01:00
opt.import_options=IMPORT_SK2PK;
* options.h, g10.c (main), export.c (parse_export_options, do_export_stream): Add export-options export-clean-sigs, export-clean-uids, export-clean-subkeys, and export-clean which is all of the above. Export-minimal is the same except it also removes all non-selfsigs. export-unusable-sigs is now a noop.
2005-06-08 05:31:48 +02:00
opt.export_options=EXPORT_ATTRIBUTES;
* main.h, g10.c (main), import.c (parse_import_options, fix_pks_corruption): It's really PKS corruption, not HKP corruption. Keep the old repair-hkp-subkey-bug command as an alias. * g10.c (main): Rename --no-version to --no-emit-version for consistency. Keep --no-version as an alias.
2003-04-09 03:57:46 +02:00
opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
* options.h, g10.c (main), export.c (parse_export_options, do_export_stream): Add export-options export-clean-sigs, export-clean-uids, export-clean-subkeys, and export-clean which is all of the above. Export-minimal is the same except it also removes all non-selfsigs. export-unusable-sigs is now a noop.
2005-06-08 05:31:48 +02:00
opt.keyserver_options.export_options=EXPORT_ATTRIBUTES;
* options.h, keyserver.c (parse_keyserver_options): Remove duplicate code from parse_keyserver_options by calling the generic parse_options. * keyserver.c (keyserver_spawn, keyserver_refresh), g10.c (main), gpgv.c (main), mainproc.c (check_sig_and_print), import.c (revocation_present): Change all callers.
2004-04-15 20:16:17 +02:00
opt.keyserver_options.options=
* options.c, gpg.c (main), keyserver.c (keyserver_spawn): No special treatment of include-revoked, include-subkeys, and try-dns-srv. These are keyserver features, and GPG shouldn't get involved here.
2006-02-23 23:39:40 +01:00
KEYSERVER_HONOR_KEYSERVER_URL|KEYSERVER_HONOR_PKA_RECORD;
* options.skel: Use new hkp://subkeys.pgp.net as sample keyserver since they at least handle subkeys correctly. * options.h, g10.c (main), main.h, keylist.c (show_keyserver_url), mainproc.c (check_sig_and_print), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt, can_handle_critical): Add read-only support for preferred keyserver subpackets. They're basically policy URLs with a different name. Add a verify-option "show-preferred-keyserver" to turn them on and off (on by default, as per stable branch). * g10.c (main): Add "--set-notation" as alias to "--notation-data" this is to make things consistent with --set-policy-url meaning both sigs and certs.
2003-06-05 04:06:12 +02:00
opt.verify_options=
* keylist.c (show_notation): Use bits to select which sort of notation to show. Don't allow a not-shown notation to prevent us from issuing the proper --status-fd message. * options.h, g10.c (main): Add show-std/standard-notations and show-user-notations. show-notations is both. Default is to show standard notations only during verify. Change all callers.
2004-05-05 04:40:27 +02:00
VERIFY_SHOW_POLICY_URLS|VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_KEYSERVER_URLS;
* sign.c (do_sign): Show the hash used when making a signature in verbose mode. * tdbio.h, tdbio.c (tdbio_read_model): New function to return the trust model used in a given trustdb. * options.h, g10.c (main), trustdb.c (init_trustdb, check_trustdb, update_trustdb): Use tdbio_read_model to implement an "auto" trust model which is set via the trustdb.
2003-04-26 22:38:16 +02:00
opt.trust_model=TM_AUTO;
* options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Add --min-cert-check-level option to specify minimum cert check level. Defaults to 2 (so 0x11 sigs are ignored). 0x10 sigs cannot be ignored.
2004-02-23 05:00:51 +01:00
opt.mangle_dos_filenames=0;
* plaintext.c: Copyright. * encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
2004-02-25 00:37:18 +01:00
opt.min_cert_level=2;
* mainproc.c (list_node): Show sigs with --verbose. * options.h, g10.c (set_screen_dimensions): New function to look at COLUMNS and LINES. * keyserver.c (parse_keyrec, keyserver_search_prompt), keyedit.c (print_and_check_one_sig): Use new screen dimension variables.
2004-01-24 01:47:45 +01:00
set_screen_dimensions();
* options.h, g10.c (main): Add a more flexible --keyid-format option to replace the list-option (and eventually verify-option) show-long-keyids. The format can be short, long, 0xshort, and 0xlong. * keydb.h, keyid.c (keystr, keystrlen): New functions to generate a printable keyid. * keyedit.c (print_and_check_one_sig, show_key_with_all_names), keylist.c (list_keyblock_print): Use new keystr() function here to print keyids.
2004-03-03 06:47:51 +01:00
opt.keyid_format=KF_SHORT;
* keyedit.c (keyedit_menu): Invisible alias "passwd" as "password". * passphrase.c: Don't check for __CYGWIN__, so it is treated as a unix-like system. * options.h, g10.c (main), textfilter.c (standard): Use new option --rfc2440-text to determine whether to filter "<space>\t\r\n" or just "\r\n" before canonicalizing text line endings. Default to "<space>\t\r\n".
2004-12-20 06:19:09 +01:00
opt.rfc2440_text=1;
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
opt.def_sig_expire="0";
opt.def_cert_expire="0";
* g10.c (i18n_init) [W32]: Pass registry key to gettext initialization. * gpgv.c (i18n_init) [W32]: Ditto. * simple-gettext.c (set_gettext_file): Use MO files depending on the installation directory. Add new arg REGKEY.
2005-01-20 12:42:03 +01:00
set_homedir ( default_homedir () );
* options.h, gpg.c (main), passphrase.c (passphrase_to_dek): Add --passphrase-repeat option to control how many times gpg will re-prompt for a passphrase to ensure the user has typed it correctly. Defaults to 1.
2006-12-03 05:38:53 +01:00
opt.passwd_repeat=1;
added option file handling
1997-12-12 13:03:58 +01:00
* g10.c (main) [ENABLE_CARD_SUPPORT]: Add a default for --pcsc-driver. * cardglue.c (learn_status_cb): Fixed faulty use of !space.
2003-10-25 16:17:24 +02:00
#ifdef ENABLE_CARD_SUPPORT
cygwin fixes
2005-10-27 11:14:27 +02:00
#if defined(_WIN32) || defined(__CYGWIN__)
* Makefile.am: Include @LIBUSB_CPPFLAGS@ in our CPPFLAGS. Strictly speaking this should be only in gpg_CPPFLAGS, but then we have to compile everything twice for gpg and gpgv. * apdu.c (open_pcsc_reader): Fix double free. * gpg.c (main) [__APPLE__]: Default the PCSC driver to the OS X location. Suggested by Patty A. Hardy.
2005-11-06 05:32:54 +01:00
opt.pcsc_driver = "winscard.dll";
#elif defined(__APPLE__)
opt.pcsc_driver = "/System/Library/Frameworks/PCSC.framework/PCSC";
About to release 1.4.3
2006-04-03 12:13:23 +02:00
#elif defined(__GLIBC__)
opt.pcsc_driver = "libpcsclite.so.1";
* g10.c (main) [ENABLE_CARD_SUPPORT]: Add a default for --pcsc-driver. * cardglue.c (learn_status_cb): Fixed faulty use of !space.
2003-10-25 16:17:24 +02:00
#else
opt.pcsc_driver = "libpcsclite.so";
#endif
#endif /*ENABLE_CARD_SUPPORT*/
applied Mathews typo and grammar fixes
1998-04-14 19:51:16 +02:00
/* check whether we have a config file on the commandline */
added option file handling
1997-12-12 13:03:58 +01:00
orig_argc = argc;
orig_argv = argv;
pargs.argc = &argc;
pargs.argv = &argv;
update from tobold
1998-06-11 09:16:50 +02:00
pargs.flags= 1|(1<<6); /* do not remove the args, ignore version */
initially checkin
1997-11-18 15:06:00 +01:00
while( arg_parse( &pargs, opts) ) {
*** empty log message ***
1998-09-11 07:47:32 +02:00
if( pargs.r_opt == oDebug || pargs.r_opt == oDebugAll )
bug fixes
1998-02-12 00:22:09 +01:00
parse_debug++;
*** empty log message ***
1998-09-11 07:47:32 +02:00
else if( pargs.r_opt == oOptions ) {
added option file handling
1997-12-12 13:03:58 +01:00
/* yes there is one, so we do not try the default one, but
* read the option file when it is encountered at the commandline
*/
default_config = 0;
}
*** empty log message ***
1998-09-11 07:47:32 +02:00
else if( pargs.r_opt == oNoOptions )
import works
1998-02-17 21:48:52 +01:00
default_config = 0; /* --no-options */
*** empty log message ***
1998-09-11 07:47:32 +02:00
else if( pargs.r_opt == oHomedir )
2002-09-28 David Shaw <dshaw@jabberwocky.com> * export.c (do_export_stream): Comment. * sig-check.c (check_key_signature2): Properly handle a non-designated revocation import. 2002-09-26 Werner Koch <wk@gnupg.org> * g10.c (set_homedir): New. Changed all direct assignments to use this. * gpgv.c (set_homedir): Ditto.
2002-09-28 19:49:38 +02:00
set_homedir ( pargs.r.ret_str );
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
else if( pargs.r_opt == oNoPermissionWarn )
opt.no_perm_warn=1;
* g10.c (main): Handle --strict and --no-strict from the command line before the options file is loaded.
2002-10-17 13:50:46 +02:00
else if (pargs.r_opt == oStrict )
{
opt.strict=1;
log_set_strict(1);
}
else if (pargs.r_opt == oNoStrict )
{
opt.strict=0;
log_set_strict(0);
}
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#ifdef USE_SHM_COPROCESSING
*** empty log message ***
1998-09-28 21:25:31 +02:00
else if( pargs.r_opt == oRunAsShmCP ) {
/* does not make sense in a options file, we do it here,
* so that we are the able to drop setuid as soon as possible */
opt.shm_coprocess = 1;
requested_shm_size = pargs.r.ret_ulong;
}
See ChangeLog: Mon May 31 19:41:10 CEST 1999 Werner Koch
1999-05-31 19:49:37 +02:00
else if ( pargs.r_opt == oStatusFD ) {
/* this is needed to ensure that the status-fd filedescriptor is
* initialized when init_shm_coprocessing() is called */
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) );
See ChangeLog: Mon May 31 19:41:10 CEST 1999 Werner Koch
1999-05-31 19:49:37 +02:00
}
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#endif
*** empty log message ***
1998-09-28 21:25:31 +02:00
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#ifdef HAVE_DOSISH_SYSTEM
if ( strchr (opt.homedir,'\\') ) {
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
char *d, *buf = xmalloc (strlen (opt.homedir)+1);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
const char *s = opt.homedir;
for (d=buf,s=opt.homedir; *s; s++)
Finished PKA feature
2005-12-20 21:19:16 +01:00
{
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
*d++ = *s == '\\'? '/': *s;
Finished PKA feature
2005-12-20 21:19:16 +01:00
#ifdef HAVE_W32_SYSTEM
if (s[1] && IsDBCSLeadByte (*s))
*d++ = *++s;
#endif
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
*d = 0;
2002-09-28 David Shaw <dshaw@jabberwocky.com> * export.c (do_export_stream): Comment. * sig-check.c (check_key_signature2): Properly handle a non-designated revocation import. 2002-09-26 Werner Koch <wk@gnupg.org> * g10.c (set_homedir): New. Changed all direct assignments to use this. * gpgv.c (set_homedir): Ditto.
2002-09-28 19:49:38 +02:00
set_homedir (buf);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
}
#endif
#ifdef USE_SHM_COPROCESSING
*** empty log message ***
1998-09-28 21:25:31 +02:00
if( opt.shm_coprocess ) {
init_shm_coprocessing(requested_shm_size, 1 );
added option file handling
1997-12-12 13:03:58 +01:00
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#endif
*** empty log message ***
1998-09-28 21:25:31 +02:00
/* initialize the secure memory. */
* g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg to exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock.
2004-12-16 06:16:09 +01:00
got_secmem=secmem_init( 32768 );
*** empty log message ***
1998-09-28 21:25:31 +02:00
maybe_setuid = 0;
/* Okay, we are now working under our real uid */
* gpgv.c, keydb.c (keydb_add_resource): Factored keyring creation out to .. (maybe_create_keyring): .. new. Make sure that we do the checks in a locked state. Problem reported by Stefan Haller. Try to create the home directory before acquiring a lock for the keyring. From Werner on stable branch. * g10.c (main): Blow up if we didn't lose setuid. From Werner on stable branch.
2004-09-30 17:00:58 +02:00
#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
/* There should be no way to get to this spot while still carrying
setuid privs. Just in case, bomb out if we are. */
if(getuid()!=geteuid())
BUG();
#endif
* g10.c (main): Try to set a default character set. Print the used one in verbosity level 3. * gpgv.c (main): Try to set a default character set. * status.c, status.h (STATUS_IMPORT_OK): New. * import.c (import_one,import_secret_one): Print new status.
2002-09-02 12:59:04 +02:00
set_native_charset (NULL); /* Try to auto set the character set */
* g10.c (main): Enhance the version-specific config file code to try for more specific matches before giving up (e.g. 1.3.3-cvs, 1.3.3, 1.3, 1).
2003-10-26 16:49:44 +01:00
/* Try for a version specific config file first */
added option file handling
1997-12-12 13:03:58 +01:00
if( default_config )
* g10.c (main): Try to use "gpg.conf" as default option file. * openfile.c (copy_options_file): Changed name of created file.
2002-08-06 15:29:27 +02:00
{
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
char *name=xstrdup("gpg" EXTSEP_S "conf-" SAFE_VERSION);
* g10.c (main): Enhance the version-specific config file code to try for more specific matches before giving up (e.g. 1.3.3-cvs, 1.3.3, 1.3, 1).
2003-10-26 16:49:44 +01:00
char *ver=&name[strlen("gpg" EXTSEP_S "conf-")];
do
* g10.c (main), keylist.c (show_policy_url, show_notation), mainproc.c (check_sig_and_print): Emulate the old policy and notation behavior (display by default). Send to status-fd whether it is displayed on the screen or not. * g10.c (main): Since we now have some options in devel that won't work in a stable branch gpg.conf file, try for a version-specific gpg.conf-VERSION file before falling back to gpg.conf. * main.h, options.h: Move various option flags to options.h.
2003-06-01 17:36:13 +02:00
{
* g10.c (main): Enhance the version-specific config file code to try for more specific matches before giving up (e.g. 1.3.3-cvs, 1.3.3, 1.3, 1).
2003-10-26 16:49:44 +01:00
if(configname)
{
char *tok;
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(configname);
* g10.c (main): Enhance the version-specific config file code to try for more specific matches before giving up (e.g. 1.3.3-cvs, 1.3.3, 1.3, 1).
2003-10-26 16:49:44 +01:00
configname=NULL;
if((tok=strrchr(ver,SAFE_VERSION_DASH)))
*tok='\0';
else if((tok=strrchr(ver,SAFE_VERSION_DOT)))
*tok='\0';
else
break;
}
configname = make_filename(opt.homedir,name,NULL);
* g10.c (main), keylist.c (show_policy_url, show_notation), mainproc.c (check_sig_and_print): Emulate the old policy and notation behavior (display by default). Send to status-fd whether it is displayed on the screen or not. * g10.c (main): Since we now have some options in devel that won't work in a stable branch gpg.conf file, try for a version-specific gpg.conf-VERSION file before falling back to gpg.conf. * main.h, options.h: Move various option flags to options.h.
2003-06-01 17:36:13 +02:00
}
* g10.c (main): Enhance the version-specific config file code to try for more specific matches before giving up (e.g. 1.3.3-cvs, 1.3.3, 1.3, 1).
2003-10-26 16:49:44 +01:00
while(access(configname,R_OK));
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(name);
* g10.c (main): Enhance the version-specific config file code to try for more specific matches before giving up (e.g. 1.3.3-cvs, 1.3.3, 1.3, 1).
2003-10-26 16:49:44 +01:00
if(!configname)
configname=make_filename(opt.homedir, "gpg" EXTSEP_S "conf", NULL );
* g10.c (main): Try to use "gpg.conf" as default option file. * openfile.c (copy_options_file): Changed name of created file.
2002-08-06 15:29:27 +02:00
if (!access (configname, R_OK))
{ /* Print a warning when both config files are present. */
char *p = make_filename(opt.homedir, "options", NULL );
if (!access (p, R_OK))
log_info (_("NOTE: old default options file `%s' ignored\n"), p);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree (p);
* g10.c (main): Try to use "gpg.conf" as default option file. * openfile.c (copy_options_file): Changed name of created file.
2002-08-06 15:29:27 +02:00
}
else
{ /* Keep on using the old default one. */
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree (configname);
* g10.c (main): Try to use "gpg.conf" as default option file. * openfile.c (copy_options_file): Changed name of created file.
2002-08-06 15:29:27 +02:00
configname = make_filename(opt.homedir, "options", NULL );
}
}
added option file handling
1997-12-12 13:03:58 +01:00
argc = orig_argc;
argv = orig_argv;
pargs.argc = &argc;
pargs.argv = &argv;
pargs.flags= 1; /* do not remove the args */
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
/* By this point we have a homedir, and cannot change it. */
check_permissions(opt.homedir,0);
added option file handling
1997-12-12 13:03:58 +01:00
next_pass:
if( configname ) {
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
if(check_permissions(configname,1))
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{
/* If any options 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. */
opt.exec_disable=1;
}
added option file handling
1997-12-12 13:03:58 +01:00
configlineno = 0;
configfp = fopen( configname, "r" );
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
if (configfp && is_secured_file (fileno (configfp)))
{
fclose (configfp);
configfp = NULL;
errno = EPERM;
}
added option file handling
1997-12-12 13:03:58 +01:00
if( !configfp ) {
if( default_config ) {
bug fixes
1998-02-12 00:22:09 +01:00
if( parse_debug )
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
1998-12-29 14:47:31 +01:00
log_info(_("NOTE: no default option file `%s'\n"),
import works
1998-02-17 21:48:52 +01:00
configname );
added option file handling
1997-12-12 13:03:58 +01:00
}
added option export
1998-02-13 21:58:50 +01:00
else {
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
1998-12-29 14:47:31 +01:00
log_error(_("option file `%s': %s\n"),
added option file handling
1997-12-12 13:03:58 +01:00
configname, strerror(errno) );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_exit(2);
added option export
1998-02-13 21:58:50 +01:00
}
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(configname); configname = NULL;
added option file handling
1997-12-12 13:03:58 +01:00
}
bug fixes
1998-02-12 00:22:09 +01:00
if( parse_debug && configname )
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
1998-12-29 14:47:31 +01:00
log_info(_("reading options from `%s'\n"), configname );
added option file handling
1997-12-12 13:03:58 +01:00
default_config = 0;
}
while( optfile_parse( configfp, configname, &configlineno,
* g10.c (main): Add --no-groups to zero --group list. * encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically encrypted session key. Use --s2k-cipher-algo to choose cipher, rather than the default cipher. * parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically encrypted session key is seen without salt. Show in --list-packets if a symetrically encrypted session key is present. * pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless --quiet is set. Use text name of cipher in warning.
2003-10-01 17:15:58 +02:00
&pargs, opts) )
{
switch( pargs.r_opt )
{
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
case aCheckKeys:
case aListConfig:
case aGPGConfList:
New command --gpgconf-test.
2006-10-23 16:21:41 +02:00
case aGPGConfTest:
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
case aListPackets:
case aImport:
case aFastImport:
case aSendKeys:
case aRecvKeys:
case aSearchKeys:
case aRefreshKeys:
* keyserver.c (keyserver_spawn): Don't print "searching for key 00000000" when fetching a URI. * keyserver-internal.h, keyserver.c (keyserver_fetch): New. Fetch an arbitrary URI using the keyserver helpers. * gpg.c (main): Call it from here for --fetch-keys.
2005-12-07 23:34:11 +01:00
case aFetchKeys:
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
case aExport:
set_cmd (&cmd, pargs.r_opt);
break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case aListKeys: set_cmd( &cmd, aListKeys); break;
case aListSigs: set_cmd( &cmd, aListSigs); break;
case aExportSecret: set_cmd( &cmd, aExportSecret); break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case aExportSecretSub: set_cmd( &cmd, aExportSecretSub); break;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
case aDeleteSecretKeys:
set_cmd( &cmd, aDeleteSecretKeys);
greeting=1;
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case aDeleteSecretAndPublicKeys:
set_cmd( &cmd, aDeleteSecretAndPublicKeys);
greeting=1;
break;
case aDeleteKeys: set_cmd( &cmd, aDeleteKeys); greeting=1; break;
removed g10maint.c
1998-03-05 10:22:13 +01:00
bug fix release
1998-08-11 19:29:34 +02:00
case aDetachedSign: detached_sig = 1; set_cmd( &cmd, aSign ); break;
case aSym: set_cmd( &cmd, aSym); break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
case aDecryptFiles: multifile=1; /* fall through */
bug fix release
1998-08-11 19:29:34 +02:00
case aDecrypt: set_cmd( &cmd, aDecrypt); break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
case aEncrFiles: multifile=1; /* fall through */
bug fix release
1998-08-11 19:29:34 +02:00
case aEncr: set_cmd( &cmd, aEncr); break;
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
case aVerifyFiles: multifile=1; /* fall through */
case aVerify: set_cmd( &cmd, aVerify); break;
bug fix release
1998-08-11 19:29:34 +02:00
case aSign: set_cmd( &cmd, aSign ); break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
case aKeygen: set_cmd( &cmd, aKeygen); greeting=1; break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case aSignKey: set_cmd( &cmd, aSignKey); break;
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
case aLSignKey: set_cmd( &cmd, aLSignKey); break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case aStore: set_cmd( &cmd, aStore); break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
case aEditKey: set_cmd( &cmd, aEditKey); greeting=1; break;
bug fix release
1998-08-11 19:29:34 +02:00
case aClearsign: set_cmd( &cmd, aClearsign); break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case aGenRevoke: set_cmd( &cmd, aGenRevoke); break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case aDesigRevoke: set_cmd( &cmd, aDesigRevoke); break;
See ChangeLog: Sun Apr 18 10:11:28 CEST 1999 Werner Koch
1999-04-18 10:18:52 +02:00
case aPrimegen: set_cmd( &cmd, aPrimegen); break;
case aGenRandom: set_cmd( &cmd, aGenRandom); break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case aPrintMD: set_cmd( &cmd, aPrintMD); break;
case aPrintMDs: set_cmd( &cmd, aPrintMDs); break;
case aListTrustDB: set_cmd( &cmd, aListTrustDB); break;
case aCheckTrustDB: set_cmd( &cmd, aCheckTrustDB); break;
last local commit
1998-10-16 18:00:17 +02:00
case aUpdateTrustDB: set_cmd( &cmd, aUpdateTrustDB); break;
a new release
1998-10-07 15:30:43 +02:00
case aFixTrustDB: set_cmd( &cmd, aFixTrustDB); break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case aListTrustPath: set_cmd( &cmd, aListTrustPath); break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
case aDeArmor: set_cmd( &cmd, aDeArmor); break;
case aEnArmor: set_cmd( &cmd, aEnArmor); break;
* keydb.h: Err on the side of making an unknown signature a SIG rather than a CERT. * import.c (delete_inv_parts): Discard any key signatures that aren't key types (i.e. 0x00, 0x01, etc.) * g10.c (main): Add deprecated option warning for --list-ownertrust. Add --compression-algo alias for --compress-algo. Change --version output strings to match "showpref" strings, and make translatable. * status.c (do_get_from_fd): Accept 'y' as well as 'Y' for --command-fd boolean input. * trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX) * keyedit.c (show_key_with_all_names_colon): Show no-ks-modify flag.
2003-03-24 21:05:53 +01:00
case aListOwnerTrust:
deprecated_warning(configname,configlineno,
"--list-ownertrust","--export-ownertrust","");
*** empty log message ***
1998-09-11 07:47:32 +02:00
case aExportOwnerTrust: set_cmd( &cmd, aExportOwnerTrust); break;
case aImportOwnerTrust: set_cmd( &cmd, aImportOwnerTrust); break;
* g10.c (main, add_notation_data, add_policy_url) (add_keyserver_url): Use isascii() to protect the isfoo macros and to replace direct tests. Possible problems noted by Christian Biere. * keyserver.c (parse_keyserver_uri): Ditto. * g10.c (main): Declare --pipemode deprecated. * misc.c (deprecated_command): New.
2005-04-11 20:24:09 +02:00
case aPipeMode:
deprecated_command ("--pipemode");
set_cmd( &cmd, aPipeMode);
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case aRebuildKeydbCaches: set_cmd( &cmd, aRebuildKeydbCaches); break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
#ifdef ENABLE_CARD_SUPPORT
case aCardStatus: set_cmd (&cmd, aCardStatus); break;
case aCardEdit: set_cmd (&cmd, aCardEdit); break;
case aChangePIN: set_cmd (&cmd, aChangePIN); break;
case oReaderPort:
* cardglue.c (pin_cb): Detect whether an admin or regular PIN is requested. (genkey_status_cb): New. (agent_scd_genkey): Implemented. * keygen.c (generate_keypair): New arg CARD_SERIALNO and prepare parameters for on card key generation. Changed all callers. (do_generate_keypair): Add new arg card and merged casrd specific changes from 1.9. (proc_parameter_file): New arg card, apss it down to do_generate_keypair and changed all callers. (gen_card_key): New. * g10.c: Include cardclue.h. (main): s/app_set_default_reader_port/card_set_reader_port/. * cardglue.c (card_set_reader_port): New to address include file issues.
2003-10-08 17:21:20 +02:00
card_set_reader_port (pargs.r.ret_str);
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
break;
case octapiDriver: opt.ctapi_driver = pargs.r.ret_str; break;
case opcscDriver: opt.pcsc_driver = pargs.r.ret_str; break;
case oDisableCCID: opt.disable_ccid = 1; break;
#endif /* ENABLE_CARD_SUPPORT*/
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oArmor: opt.armor = 1; opt.no_armor=0; break;
bug fix release
1998-08-11 19:29:34 +02:00
case oOutput: opt.outfile = pargs.r.ret_str; break;
* options.h, g10.c (main), plaintext.c (handle_plaintext): Add --max-output option to help people deal with decompression bombs.
2004-02-19 00:09:27 +01:00
case oMaxOutput: opt.max_output = pargs.r.ret_ulong; break;
some random changes
1998-10-25 20:00:01 +01:00
case oQuiet: opt.quiet = 1; break;
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
case oNoTTY: tty_no_terminal(1); break;
See ChangeLog: Thu Feb 25 18:47:39 CET 1999 Werner Koch
1999-02-25 18:51:55 +01:00
case oDryRun: opt.dry_run = 1; break;
See ChangeLog: Wed May 19 16:04:30 CEST 1999 Werner Koch
1999-05-19 16:12:26 +02:00
case oInteractive: opt.interactive = 1; break;
* options.h, g10.c (main), keylist.c (list_keyblock_print): Add "show-unusable-uids" list-option to show revoked and/or expired user IDs.
2003-09-25 06:03:11 +02:00
case oVerbose:
g10_opt_verbose++;
opt.verbose++;
opt.list_options|=LIST_SHOW_UNUSABLE_UIDS;
* options.h, g10.c (main), keylist.c (list_keyblock_print): Add "show-unusable-subkeys" list-option to show revoked and/or expired subkeys.
2004-02-11 14:46:23 +01:00
opt.list_options|=LIST_SHOW_UNUSABLE_SUBKEYS;
* options.h, g10.c (main), keylist.c (list_keyblock_print): Add "show-unusable-uids" list-option to show revoked and/or expired user IDs.
2003-09-25 06:03:11 +02:00
break;
bug fix release
1998-08-11 19:29:34 +02:00
case oKOption: set_cmd( &cmd, aKMode ); break;
removed g10maint.c
1998-03-05 10:22:13 +01:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oBatch: opt.batch = 1; nogreeting = 1; break;
case oUseAgent:
#ifndef __riscos__
opt.use_agent = 1;
#else /* __riscos__ */
opt.use_agent = 0;
added RISC OS module loading support
2002-10-31 17:58:47 +01:00
riscos_not_implemented("use-agent");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#endif /* __riscos__ */
break;
case oNoUseAgent: opt.use_agent = 0; break;
case oGpgAgentInfo: opt.gpg_agent_info = pargs.r.ret_str; break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oAnswerYes: opt.answer_yes = 1; break;
case oAnswerNo: opt.answer_no = 1; break;
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
* g10.c (main), keydb.c (keydb_add_resource, keydb_locate_writable): Rename --default-keyring as --primary-keyring. Stefan wins the naming contest.
2002-11-25 04:18:48 +01:00
case oPrimaryKeyring:
* keyring.h, keyring.c (keyring_register_filename): Return the pointer if a given keyring is registered twice. * keydb.h, keydb.c (keydb_add_resource): Use flags to indicate a default keyring. (keydb_locate_writable): Prefer the default keyring if possible. * g10.c (main): Add --default-keyring option.
2002-11-08 04:31:21 +01:00
sl=append_to_strlist( &nrings, pargs.r.ret_str);
sl->flags=2;
break;
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
case oShowKeyring:
deprecated_warning(configname,configlineno,"--show-keyring",
"--list-options ","show-keyring");
opt.list_options|=LIST_SHOW_KEYRING;
break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oDebug: opt.debug |= pargs.r.ret_ulong; break;
case oDebugAll: opt.debug = ~0; break;
* g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver. * ccid-driver.c (read_device_info): Removed. (make_reader_id, scan_or_find_devices): New. (ccid_open_reader): Simplified by make use of the new functions. (ccid_set_debug_level): New. Changed the macros to make use of it. It has turned out that it is often useful to enable debugging at runtime so I added this option.
2004-09-15 17:26:38 +02:00
case oDebugCCIDDriver:
#if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB)
* cardglue.c (open_card): Check USE_AGENT. * g10.c (main): Option --debug-ccid-driver may now be given several times increase the debug level. * ccid-driver.c (parse_ccid_descriptor): Mark SCR335 FW version 5.14 as good. (do_close_reader): Never do a reset. The caller should instead make sure that the reader has been closed properly. The new retry code in ccid_slot_status will make sure that the readersatrts up fine even if the last process didn't closed the USB connection properly. (ccid_get_atr): For certain readers try switching to ISO mode. Thanks to Ludovic Rousseau for this hint and the magic numbers. (print_command_failed): New. (bulk_in): Use it here. Add new arg NO_DEBUG. (ccid_slot_status): Disabled debugging.
2005-05-23 16:38:05 +02:00
ccid_set_debug_level (ccid_set_debug_level (1)+1);
* g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver. * ccid-driver.c (read_device_info): Removed. (make_reader_id, scan_or_find_devices): New. (ccid_open_reader): Simplified by make use of the new functions. (ccid_set_debug_level): New. Changed the macros to make use of it. It has turned out that it is often useful to enable debugging at runtime so I added this option.
2004-09-15 17:26:38 +02:00
#endif
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oStatusFD:
set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) );
break;
case oStatusFile:
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
set_status_fd ( open_info_file (pargs.r.ret_str, 1) );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
case oAttributeFD:
set_attrib_fd(iobuf_translate_file_handle (pargs.r.ret_int, 1));
break;
case oAttributeFile:
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
set_attrib_fd ( open_info_file (pargs.r.ret_str, 1) );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
case oLoggerFD:
log_set_logfile( NULL,
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
iobuf_translate_file_handle (pargs.r.ret_int, 1));
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
case oLoggerFile:
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
log_set_logfile( NULL, open_info_file (pargs.r.ret_str, 1) );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
See ChangeLog: Thu Jul 8 16:21:27 CEST 1999 Werner Koch
1999-07-08 16:24:35 +02:00
case oWithFingerprint:
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.with_fingerprint = 1;
with_fpr=1; /*fall thru*/
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oFingerprint: opt.fingerprint++; break;
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
case oSecretKeyring:
append_to_strlist( &sec_nrings, pargs.r.ret_str);
break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oOptions:
added option file handling
1997-12-12 13:03:58 +01:00
/* config files may not be nested (silently ignore them) */
if( !configfp ) {
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(configname);
configname = xstrdup(pargs.r.ret_str);
added option file handling
1997-12-12 13:03:58 +01:00
goto next_pass;
}
break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oNoArmor: opt.no_armor=1; opt.armor=0; break;
case oNoDefKeyring: default_keyring = 0; break;
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 19:47:23 +02:00
case oNoGreeting: nogreeting = 1; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoVerbose: g10_opt_verbose = 0;
opt.verbose = 0; opt.list_sigs=0; break;
case oQuickRandom: quick_random_gen(1); break;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
case oEmitVersion: opt.no_version=0; break;
* main.h, g10.c (main), import.c (parse_import_options, fix_pks_corruption): It's really PKS corruption, not HKP corruption. Keep the old repair-hkp-subkey-bug command as an alias. * g10.c (main): Rename --no-version to --no-emit-version for consistency. Keep --no-version as an alias.
2003-04-09 03:57:46 +02:00
case oNoEmitVersion: opt.no_version=1; break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oCompletesNeeded: opt.completes_needed = pargs.r.ret_int; break;
case oMarginalsNeeded: opt.marginals_needed = pargs.r.ret_int; break;
See ChangeLog ;-). Key validation should now be faster
1998-11-13 20:41:41 +01:00
case oMaxCertDepth: opt.max_cert_depth = pargs.r.ret_int; break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oTrustDBName: trustdb_name = pargs.r.ret_str; break;
case oDefaultKey: opt.def_secret_key = pargs.r.ret_str; break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
case oDefRecipient:
if( *pargs.r.ret_str )
opt.def_recipient = make_username(pargs.r.ret_str);
break;
case oDefRecipientSelf:
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(opt.def_recipient); opt.def_recipient = NULL;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
opt.def_recipient_self = 1;
break;
case oNoDefRecipient:
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(opt.def_recipient); opt.def_recipient = NULL;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
opt.def_recipient_self = 0;
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */
case oHomedir: break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oNoBatch: opt.batch = 0; break;
See ChangeLog: Tue Jun 8 13:36:25 CEST 1999 Werner Koch
1999-06-08 13:41:46 +02:00
case oWithKeyData: opt.with_key_data=1; /* fall thru */
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oWithColons: opt.with_colons=':'; break;
case oSkipVerify: opt.skip_verify=1; break;
case oCompressKeys: opt.compress_keys = 1; break;
case aListSecretKeys: set_cmd( &cmd, aListSecretKeys); break;
* options.h, g10.c (main): Add --trust-model option. Current models are "openpgp" which is classic+trustsigs, "classic" which is classic only, and "always" which is the same as the current option --always-trust (which still works). Default is "openpgp". * trustdb.c (validate_one_keyblock): Use "openpgp" trust model to enable trust sigs. * gpgv.c (main), mainproc.c (check_sig_and_print), pkclist.c (do_we_trust, do_we_trust_pre, check_signatures_trust): Use new --trust-model option in place of --always-trust.
2002-11-03 21:18:56 +01: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:
* pkclist.c (do_edit_ownertrust): Different prompt when we're using direct trust since the meaning is different. * keyedit.c (trustsig_prompt): Change the strings to match the ones in pkclist.c:do_edit_ownertrust to make translation easier. * trustdb.c (trust_model_string, get_validity): Add direct trust model which applies to the key as a whole and not per-uid. * options.h, g10.c (parse_trust_model): New. (main): Call it from here to do string-to-trust-model.
2004-10-13 17:34:52 +02:00
parse_trust_model(pargs.r.ret_str);
* options.h, g10.c (main): Add --trust-model option. Current models are "openpgp" which is classic+trustsigs, "classic" which is classic only, and "always" which is the same as the current option --always-trust (which still works). Default is "openpgp". * trustdb.c (validate_one_keyblock): Use "openpgp" trust model to enable trust sigs. * gpgv.c (main), mainproc.c (check_sig_and_print), pkclist.c (do_we_trust, do_we_trust_pre, check_signatures_trust): Use new --trust-model option in place of --always-trust.
2002-11-03 21:18:56 +01:00
break;
* options.h, g10.c (main), trustdb.c (ask_ownertrust): Add --force-ownertrust option for debugging purposes. This allows setting a whole keyring to a given trust during an --update-trustdb. Not for normal use - it's just easier than hitting "4" all the time to test a large trustdb.
2002-11-07 05:37:27 +01:00
case oForceOwnertrust:
log_info(_("NOTE: %s is not for normal use!\n"),
"--force-ownertrust");
* tdbio.c (create_version_record): Only create new trustdbs with TM_CLASSIC or TM_PGP. * trustdb.h, trustdb.c (trust_string, get_ownertrust_string, get_validity_string, ask_ownertrust, validate_keys), pkclist.c (do_edit_ownertrust): Rename trust_string to trust_value_to_string for naming consistency. * trustdb.h, trustdb.c (string_to_trust_value): New function to translate a string to a trust value. * g10.c (main): Use string_to_trust_value here for --force-ownertrust. * options.h, g10.c (main), trustdb.c (trust_model_string, init_trustdb, check_trustdb, update_trustdb, get_validity, validate_one_keyblock): An "OpenPGP" trust model is misleading since there is no official OpenPGP trust model. Use "PGP" instead.
2003-05-01 23:37:08 +02:00
opt.force_ownertrust=string_to_trust_value(pargs.r.ret_str);
if(opt.force_ownertrust==-1)
{
* pkclist.c (do_edit_ownertrust): Use the same translated string for showing the user ID as mainproc.c:print_pkenc_list. * mainproc.c (print_pkenc_list): Allow translating the quotes around the user ID. * card-util.c, g10.c, photoid.c, trustdb.c: The last of the \"%s\" -> `%s' quoting for things that aren't user IDs. * keyserver.c (keyserver_spawn): If there is no keyserver host, print the whole URI since it is self-contained.
2004-10-11 23:08:37 +02:00
log_error("invalid ownertrust `%s'\n",pargs.r.ret_str);
* tdbio.c (create_version_record): Only create new trustdbs with TM_CLASSIC or TM_PGP. * trustdb.h, trustdb.c (trust_string, get_ownertrust_string, get_validity_string, ask_ownertrust, validate_keys), pkclist.c (do_edit_ownertrust): Rename trust_string to trust_value_to_string for naming consistency. * trustdb.h, trustdb.c (string_to_trust_value): New function to translate a string to a trust value. * g10.c (main): Use string_to_trust_value here for --force-ownertrust. * options.h, g10.c (main), trustdb.c (trust_model_string, init_trustdb, check_trustdb, update_trustdb, get_validity, validate_one_keyblock): An "OpenPGP" trust model is misleading since there is no official OpenPGP trust model. Use "PGP" instead.
2003-05-01 23:37:08 +02:00
opt.force_ownertrust=0;
}
* options.h, g10.c (main), trustdb.c (ask_ownertrust): Add --force-ownertrust option for debugging purposes. This allows setting a whole keyring to a given trust during an --update-trustdb. Not for normal use - it's just easier than hitting "4" all the time to test a large trustdb.
2002-11-07 05:37:27 +01:00
break;
last local commit
1998-10-16 18:00:17 +02:00
case oLoadExtension:
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#ifndef __riscos__
* passphrase.c (agent_send_all_options): Make use of $GPG_TTY. * g10.c (main): Disable use-agent if passphrase-fd is given later. Suggested by Kurt Garloff. * exec.c, g10.c, gpgv.c, passphrase.c, photoid.c: s/__MINGW32__/_WIN32/ to help building on native Windows compilers. Requested by Brian Gladman. From Werner on stable branch.
2003-08-29 02:14:42 +02:00
#if defined(USE_DYNAMIC_LINKING) || defined(_WIN32)
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
if(check_permissions(pargs.r.ret_str,2))
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("cipher extension `%s' not loaded due to"
" unsafe permissions\n"),pargs.r.ret_str);
* keyedit.c (menu_revsig): Properly show a uid is revoked without restarting gpg. This is Debian bug 124219, though their supplied patch will not do the right thing. * main.h, tdbio.c (tdbio_set_dbname), misc.c (removed check_permissions), keydb.c (keydb_add_resource), g10.c (main, check_permissions): Significant reworking of the permission check mechanism. The new behavior is to check everything in the homedir by checking the homedir itself. If the user wants to put (possibly shared) keyrings outside the homedir, they are not checked. The options file and any extension files are checked wherever they are, as well as their enclosing directories. This is Debian bug 147760.
2002-08-07 17:53:15 +02:00
else
register_cipher_extension(orig_argc? *orig_argv:NULL,
pargs.r.ret_str);
#endif
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#else /* __riscos__ */
added RISC OS module loading support
2002-10-31 17:58:47 +01:00
riscos_not_implemented("load-extension");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#endif /* __riscos__ */
last local commit
1998-10-16 18:00:17 +02:00
break;
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 18:36:05 +01:00
case oRFC1991:
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
opt.compliance = CO_RFC1991;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.force_v4_certs = 0;
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 18:36:05 +01:00
opt.escape_from = 1;
break;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
case oOpenPGP:
* keyedit.c (keyedit_menu): Invisible alias "passwd" as "password". * passphrase.c: Don't check for __CYGWIN__, so it is treated as a unix-like system. * options.h, g10.c (main), textfilter.c (standard): Use new option --rfc2440-text to determine whether to filter "<space>\t\r\n" or just "\r\n" before canonicalizing text line endings. Default to "<space>\t\r\n".
2004-12-20 06:19:09 +01:00
case oRFC2440:
/* TODO: When 2440bis becomes a RFC, set new values for
oOpenPGP. */
opt.rfc2440_text=1;
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
opt.compliance = CO_RFC2440;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.allow_non_selfsigned_uid = 1;
opt.allow_freeform_uid = 1;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
opt.pgp2_workarounds = 0;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
opt.escape_from = 0;
opt.force_v3_sigs = 0;
* keyedit.c (keyedit_menu): Invisible alias "passwd" as "password". * passphrase.c: Don't check for __CYGWIN__, so it is treated as a unix-like system. * options.h, g10.c (main), textfilter.c (standard): Use new option --rfc2440-text to determine whether to filter "<space>\t\r\n" or just "\r\n" before canonicalizing text line endings. Default to "<space>\t\r\n".
2004-12-20 06:19:09 +01:00
opt.compress_keys = 0; /* not mandated, but we do it */
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
opt.compress_sigs = 0; /* ditto. */
opt.not_dash_escaped = 0;
opt.def_cipher_algo = 0;
opt.def_digest_algo = 0;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.cert_digest_algo = 0;
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
opt.compress_algo = -1;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.s2k_mode = 3; /* iterated+salted */
opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 14:31:07 +02:00
break;
* trustdb.h, trustdb.c (is_disabled), gpgv.c (is_disabled): Rename is_disabled to cache_disabled_value, which now takes a pk and not just the keyid. This is for speed since there is no need to re-fetch a key when we already have that key handy. Cache the result of the check so we don't need to hit the trustdb more than once. * getkey.c (skip_disabled): New function to get a pk and call is_disabled on it. (key_byname): Use it here. * packet.h, getkey.c (skip_disabled), keylist.c (print_capabilities): New "pk_is_disabled" macro to retrieve the cached disabled value if available, and fill it in via cache_disabled_value if not available. * trustdb.c (get_validity): Cache the disabled value since we have it handy and it might be useful later. * parse-packet.c (parse_key): Clear disabled flag when parsing a new key. Just in case someone forgets to clear the whole key. * getkey.c (merge_selfsigs_main): Add an "if all else fails" path for setting a single user ID primary when there are multiple set primaries all at the same second, or no primaries set and the most recent user IDs are at the same second, or no signed user IDs at all. This is arbitrary, but deterministic. * exec.h, photoid.h: Add copyright message. * keylist.c (list_keyblock_print): Don't dump attribs for revoked/expired/etc uids for non-colon key listings. This is for consistency with --show-photos. * main.h, keylist.c (dump_attribs), mainproc.c (check_sig_and_print): Dump attribs if --attrib-fd is set when verifying signatures. * g10.c (main): New --gnupg option to disable the various --openpgp, --pgpX, etc. options. This is the same as --no-XXXX for those options. * revoke.c (ask_revocation_reason): Clear old reason if user elects to repeat question. This is bug 153. * keyedit.c (sign_uids): Show keyid of the key making the signature.
2003-05-21 18:42:22 +02:00
case oPGP2: opt.compliance = CO_PGP2; break;
case oPGP6: opt.compliance = CO_PGP6; break;
case oPGP7: opt.compliance = CO_PGP7; break;
case oPGP8: opt.compliance = CO_PGP8; break;
case oGnuPG: opt.compliance = CO_GNUPG; break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oCompressSigs: opt.compress_sigs = 1; break;
* keyedit.c (keyedit_menu): Invisible alias "passwd" as "password". * passphrase.c: Don't check for __CYGWIN__, so it is treated as a unix-like system. * options.h, g10.c (main), textfilter.c (standard): Use new option --rfc2440-text to determine whether to filter "<space>\t\r\n" or just "\r\n" before canonicalizing text line endings. Default to "<space>\t\r\n".
2004-12-20 06:19:09 +01:00
case oRFC2440Text: opt.rfc2440_text=1; break;
case oNoRFC2440Text: opt.rfc2440_text=0; break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oRunAsShmCP:
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#ifndef __riscos__
Cleanups and minor fixes.
2002-09-10 10:40:12 +02:00
# ifndef USE_SHM_COPROCESSING
*** empty log message ***
1998-09-28 21:25:31 +02:00
/* not possible in the option file,
* but we print the warning here anyway */
add coprocess facility
1998-07-31 18:45:58 +02:00
log_error("shared memory coprocessing is not available\n");
Cleanups and minor fixes.
2002-09-10 10:40:12 +02:00
# endif
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#else /* __riscos__ */
added RISC OS module loading support
2002-10-31 17:58:47 +01:00
riscos_not_implemented("run-as-shm-coprocess");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#endif /* __riscos__ */
add coprocess facility
1998-07-31 18:45:58 +02:00
break;
* gpg.c (print_mds), armor.c (armor_filter, parse_hash_header): Add SHA-224. * sign.c (write_plaintext_packet), encode.c (encode_simple): Factor common literal packet setup code from here, to... * main.h, plaintext.c (setup_plaintext_name): Here. New. Make sure the literal packet filename field is UTF-8 encoded. * options.h, gpg.c (main): Make sure --set-filename is UTF-8 encoded and note when filenames are already UTF-8.
2006-04-20 04:36:05 +02: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;
Update head to match stable 1.0
2002-06-29 15:46:34 +02: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;
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
case oShowPolicyURL:
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--show-policy-url",
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the plurarility (or not) of various list and verify options.
2003-11-14 06:06:19 +01:00
"--list-options ","show-policy-urls");
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--show-policy-url",
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the plurarility (or not) of various list and verify options.
2003-11-14 06:06:19 +01:00
"--verify-options ","show-policy-urls");
opt.list_options|=LIST_SHOW_POLICY_URLS;
opt.verify_options|=VERIFY_SHOW_POLICY_URLS;
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
break;
case oNoShowPolicyURL:
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--no-show-policy-url",
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the plurarility (or not) of various list and verify options.
2003-11-14 06:06:19 +01:00
"--list-options ","no-show-policy-urls");
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--no-show-policy-url",
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the plurarility (or not) of various list and verify options.
2003-11-14 06:06:19 +01:00
"--verify-options ","no-show-policy-urls");
opt.list_options&=~LIST_SHOW_POLICY_URLS;
opt.verify_options&=~VERIFY_SHOW_POLICY_URLS;
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
break;
* options.h, g10.c (main, add_keyserver_url): Add --sig-preferred-keyserver to implant a "where to get my key" subpacket into a signature. * sign.c (mk_notation_and_policy): Rename to mk_notation_policy_etc and add preferred keyserver support for signatures.
2003-07-24 21:28:12 +02:00
case oSigKeyserverURL: add_keyserver_url(pargs.r.ret_str,0); break;
* gpg.c (print_mds), armor.c (armor_filter, parse_hash_header): Add SHA-224. * sign.c (write_plaintext_packet), encode.c (encode_simple): Factor common literal packet setup code from here, to... * main.h, plaintext.c (setup_plaintext_name): Here. New. Make sure the literal packet filename field is UTF-8 encoded. * options.h, gpg.c (main): Make sure --set-filename is UTF-8 encoded and note when filenames are already UTF-8.
2006-04-20 04:36:05 +02:00
case oUseEmbeddedFilename:
opt.flags.use_embedded_filename=1;
break;
case oNoUseEmbeddedFilename:
opt.flags.use_embedded_filename=0;
break;
* import.c (import_one): Show the keyid when giving the Elgamal slow import warning. * g10.c (main): Older versions used --comment "" to indicate no comment. Don't add an empty comment.
2003-10-15 01:30:14 +02:00
case oComment:
if(pargs.r.ret_str[0])
* trustdb.c (update_min_ownertrust, validate_keys): Do not use keystr functions in log_debug. * import.c (import_one): Try and collapse user IDs when importing a key for the first time. * keyedit.c (menu_addrevoker): Allow appointing a subkey as a designated revoker if the user forces it via keyid!, so long as the subkey can certify. Also use the proper date string when prompting for confirmation. * g10.c (main): Maintain ordering of multiple Comment lines. Requested by Peter Hyman.
2004-03-20 00:15:27 +01:00
append_to_strlist(&opt.comments,pargs.r.ret_str);
* import.c (import_one): Show the keyid when giving the Elgamal slow import warning. * g10.c (main): Older versions used --comment "" to indicate no comment. Don't add an empty comment.
2003-10-15 01:30:14 +02:00
break;
* g10.c (main): Deprecate --default-comment in favor of --no-comments. * options.h, g10.c (main), armor.c (armor_filter): Allow using --comment multiple times to get multiple Comment: header lines. --no-comments resets list.
2003-09-23 05:52:55 +02:00
case oDefaultComment:
deprecated_warning(configname,configlineno,
"--default-comment","--no-comments","");
/* fall through */
case oNoComments:
free_strlist(opt.comments);
opt.comments=NULL;
break;
* plaintext.c (handle_plaintext): Bigger buffer for extra safety. * g10.c (main): New alias --throw-keyid for --throw-keyids, so that it continues to work in old configuration files. Noted by Jens Adam. * pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2. * status.c (do_get_from_fd): Flush stdout if status isn't flushing it for us. This guarantees that any menus that were displayed before the prompt don't get stuck in a buffer. Noted by Peter Palfrader. This is Debian bug #254072. * sign.c (update_keysig_packet): Revert change of 2004-05-18. It is not appropriate to strip policy and notations when remaking a sig. That should only happen when specifically requested by the user.
2004-08-08 15:28:04 +02:00
case oThrowKeyids: opt.throw_keyid = 1; break;
case oNoThrowKeyids: opt.throw_keyid = 0; break;
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
case oShowPhotos:
deprecated_warning(configname,configlineno,"--show-photos",
"--list-options ","show-photos");
deprecated_warning(configname,configlineno,"--show-photos",
"--verify-options ","show-photos");
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
opt.list_options|=LIST_SHOW_PHOTOS;
opt.verify_options|=VERIFY_SHOW_PHOTOS;
break;
case oNoShowPhotos:
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--no-show-photos",
"--list-options ","no-show-photos");
deprecated_warning(configname,configlineno,"--no-show-photos",
"--verify-options ","no-show-photos");
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
opt.list_options&=~LIST_SHOW_PHOTOS;
opt.verify_options&=~VERIFY_SHOW_PHOTOS;
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
Snapshot release 0.4.2
1998-10-18 17:21:22 +02:00
case oForceV3Sigs: opt.force_v3_sigs = 1; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoForceV3Sigs: opt.force_v3_sigs = 0; break;
case oForceV4Certs: opt.force_v4_certs = 1; break;
case oNoForceV4Certs: opt.force_v4_certs = 0; break;
See ChangeLog: Mon Apr 26 17:48:15 CEST 1999 Werner Koch
1999-04-26 17:53:01 +02:00
case oForceMDC: opt.force_mdc = 1; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoForceMDC: opt.force_mdc = 0; break;
case oDisableMDC: opt.disable_mdc = 1; break;
case oNoDisableMDC: opt.disable_mdc = 0; break;
*** empty log message ***
1998-09-28 21:25:31 +02:00
case oS2KMode: opt.s2k_mode = pargs.r.ret_int; break;
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
case oS2KDigest: s2k_digest_string = xstrdup(pargs.r.ret_str); break;
case oS2KCipher: s2k_cipher_string = xstrdup(pargs.r.ret_str); break;
* parse-packet.c (parse_symkeyenc): Show the unpacked as well as the packed s2k iteration count. * main.h, options.h, gpg.c (encode_s2k_iterations, main), passphrase.c (hash_passphrase): Add --s2k-count option to specify the number of s2k hash iterations.
2006-10-13 05:44:34 +02:00
case oS2KCount:
opt.s2k_count=encode_s2k_iterations(pargs.r.ret_int);
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oSimpleSKChecksum: opt.simple_sk_checksum = 1; break;
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
1999-02-19 15:54:00 +01:00
case oNoEncryptTo: opt.no_encrypt_to = 1; break;
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 14:16:33 +01:00
case oEncryptTo: /* store the recipient in the second list */
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 12:53:35 +02:00
sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 14:16:33 +01:00
sl->flags = 1;
break;
* g10.c (main): Add --no-throw-keyid. * keydb.h, encode.c (write_pubkey_enc_from_list), g10.c (main), pkclist.c (build_pk_list): Add --hidden-recipient (-R) and --hidden-encrypt-to, which do a single-user variation on --throw-keyid. The "hide this key" flag is carried in bit 0 of the pk_list flags field. * keyserver.c (parse_keyrec): Fix shadowing warning.
2002-11-01 17:15:45 +01:00
case oHiddenEncryptTo: /* store the recipient in the second list */
sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
sl->flags = 1|2;
break;
See ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch
1999-01-24 18:16:40 +01:00
case oRecipient: /* store the recipient */
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 12:53:35 +02:00
add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
any_explicit_recipient = 1;
*** empty log message ***
1998-09-11 07:47:32 +02:00
break;
* g10.c (main): Add --no-throw-keyid. * keydb.h, encode.c (write_pubkey_enc_from_list), g10.c (main), pkclist.c (build_pk_list): Add --hidden-recipient (-R) and --hidden-encrypt-to, which do a single-user variation on --throw-keyid. The "hide this key" flag is carried in bit 0 of the pk_list flags field. * keyserver.c (parse_keyrec): Fix shadowing warning.
2002-11-01 17:15:45 +01:00
case oHiddenRecipient: /* store the recipient with a flag */
sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
sl->flags = 2;
any_explicit_recipient = 1;
break;
(Does not compile yet)
1998-11-03 20:38:58 +01:00
case oTextmodeShort: opt.textmode = 2; break;
*** empty log message ***
1998-09-11 07:47:32 +02:00
case oTextmode: opt.textmode=1; break;
* g10.c (main): Add --no-textmode. * export.c (do_export_stream), keyedit.c (show_key_with_all_names, menu_addrevoker), mainproc.c (check_sig_and_print), photoid.c (show_photos), sign.c (mk_notation_and_policy), trustdb.c (get_validity, reset_trust_records, validate_keys): Make some strings translatable. * mainproc.c (check_sig_and_print): Show digest algorithm and sig class when verifying a sig with --verbose on, and add version, pk and hash algorithms and sig class to VALIDSIG. * parse-packet.c (enum_sig_subpkt): Make a warning message a --verbose warning message since we don't need to warn every time we see an unknown critical (we only need to invalidate the signature). * trustdb.c (init_trustdb): Check the trustdb options even with TM_AUTO since the auto may become TM_CLASSIC or TM_OPENPGP.
2003-04-27 22:22:09 +02:00
case oNoTextmode: opt.textmode=0; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oExpert: opt.expert = 1; break;
case oNoExpert: opt.expert = 0; break;
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
case oDefSigExpire:
if(*pargs.r.ret_str!='\0')
{
* main.h, keygen.c (parse_expire_string, ask_expire_interval), sign.c (sign_file, clearsign_file, sign_symencrypt_file), g10.c (main), keyedit.c (sign_uids): Use seconds rather than days internally to calculate expiration. We no longer need the day-based code as we don't generate v3 keys.
2005-05-06 21:25:19 +02:00
if(parse_expire_string(pargs.r.ret_str)==(u32)-1)
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
log_error(_("`%s' is not a valid signature expiration\n"),
pargs.r.ret_str);
else
opt.def_sig_expire=pargs.r.ret_str;
}
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oAskSigExpire: opt.ask_sig_expire = 1; break;
case oNoAskSigExpire: opt.ask_sig_expire = 0; break;
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
case oDefCertExpire:
if(*pargs.r.ret_str!='\0')
{
* main.h, keygen.c (parse_expire_string, ask_expire_interval), sign.c (sign_file, clearsign_file, sign_symencrypt_file), g10.c (main), keyedit.c (sign_uids): Use seconds rather than days internally to calculate expiration. We no longer need the day-based code as we don't generate v3 keys.
2005-05-06 21:25:19 +02:00
if(parse_expire_string(pargs.r.ret_str)==(u32)-1)
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
log_error(_("`%s' is not a valid signature expiration\n"),
pargs.r.ret_str);
else
opt.def_cert_expire=pargs.r.ret_str;
}
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oAskCertExpire: opt.ask_cert_expire = 1; break;
case oNoAskCertExpire: opt.ask_cert_expire = 0; break;
* options.h, g10.c (main): Add new --default-sig-expire and --default-cert-expire options. Suggested by Florian Weimer. * main.h, keygen.c (parse_expire_string, ask_expire_interval): Use defaults passed in, or "0" to control what default expiration is. * keyedit.c (sign_uids), sign.c (sign_file, clearsign_file, sign_symencrypt_file): Call them here, so that default expiration is used when --ask-xxxxx-expire is off.
2005-05-05 21:21:40 +02:00
case oDefCertLevel: opt.def_cert_level=pargs.r.ret_int; break;
case oMinCertLevel: opt.min_cert_level=pargs.r.ret_int; break;
* plaintext.c: Copyright. * encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
2004-02-25 00:37:18 +01:00
case oAskCertLevel: opt.ask_cert_level = 1; break;
case oNoAskCertLevel: opt.ask_cert_level = 0; break;
* g10.c (main): Add aliases sign-with->local-user and user->recipient to make switching from PGP command line to GPG easier.
2005-08-20 21:38:45 +02:00
case oLocalUser: /* store the local users */
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 12:53:35 +02:00
add_to_strlist2( &locusr, pargs.r.ret_str, utf8_strings );
*** empty log message ***
1998-09-11 07:47:32 +02:00
break;
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01: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;
* options.h, g10.c (main), compress-bz2.c (init_uncompress): Rename --bzip2-compress-lowmem to --bzip2-decompress-lowmem since it applies to decompression, not compression.
2004-03-25 23:43:51 +01:00
case oBZ2DecompressLowmem: opt.bz2_decompress_lowmem=1; break;
* g10.c (main), passphrase.c (set_passphrase_from_string): New --passphrase command line option. Only useful in very special circumstances.
2005-08-05 21:54:06 +02:00
case oPasswd:
set_passphrase_from_string(pargs.r.ret_str);
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oPasswdFD:
pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0);
* passphrase.c (agent_send_all_options): Make use of $GPG_TTY. * g10.c (main): Disable use-agent if passphrase-fd is given later. Suggested by Kurt Garloff. * exec.c, g10.c, gpgv.c, passphrase.c, photoid.c: s/__MINGW32__/_WIN32/ to help building on native Windows compilers. Requested by Brian Gladman. From Werner on stable branch.
2003-08-29 02:14:42 +02:00
opt.use_agent = 0;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
case oPasswdFile:
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
pwfd = open_info_file (pargs.r.ret_str, 0);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
* options.h, gpg.c (main), passphrase.c (passphrase_to_dek): Add --passphrase-repeat option to control how many times gpg will re-prompt for a passphrase to ensure the user has typed it correctly. Defaults to 1.
2006-12-03 05:38:53 +01:00
case oPasswdRepeat: opt.passwd_repeat=pargs.r.ret_int; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oCommandFD:
opt.command_fd = iobuf_translate_file_handle (pargs.r.ret_int, 0);
break;
case oCommandFile:
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
opt.command_fd = open_info_file (pargs.r.ret_str, 0);
break;
case oCipherAlgo:
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
def_cipher_string = xstrdup(pargs.r.ret_str);
(open_info_file): New. (main): Unconditionally implement --status-file, --logger-file, --attribute-file, --passphrase-file, --command-file. This is not generally useful but easy to support and might make scripting under Windows easier.
2004-11-17 17:04:21 +01:00
break;
case oDigestAlgo:
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
def_digest_string = xstrdup(pargs.r.ret_str);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
* g10.c (main): Allow compression algorithm names as the argument to --compress-algo. The old algorithm names still work for backwards compatibility. * misc.c (string_to_compress_algo): Allow "none" as an alias for "uncompressed".
2002-11-15 05:07:24 +01:00
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)
{
* g10.c (main, add_notation_data, add_policy_url) (add_keyserver_url): Use isascii() to protect the isfoo macros and to replace direct tests. Possible problems noted by Christian Biere. * keyserver.c (parse_keyserver_uri): Ditto. * g10.c (main): Declare --pipemode deprecated. * misc.c (deprecated_command): New.
2005-04-11 20:24:09 +02:00
if (!isascii (*pt) || !isdigit (*pt))
* g10.c (main): Allow compression algorithm names as the argument to --compress-algo. The old algorithm names still work for backwards compatibility. * misc.c (string_to_compress_algo): Allow "none" as an alias for "uncompressed".
2002-11-15 05:07:24 +01:00
break;
pt++;
}
if(*pt=='\0')
{
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
compress_algo_string=xmalloc(strlen(pargs.r.ret_str)+2);
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
strcpy(compress_algo_string,"Z");
strcat(compress_algo_string,pargs.r.ret_str);
* g10.c (main): Allow compression algorithm names as the argument to --compress-algo. The old algorithm names still work for backwards compatibility. * misc.c (string_to_compress_algo): Allow "none" as an alias for "uncompressed".
2002-11-15 05:07:24 +01:00
}
else
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
compress_algo_string = xstrdup(pargs.r.ret_str);
* g10.c (main): Allow compression algorithm names as the argument to --compress-algo. The old algorithm names still work for backwards compatibility. * misc.c (string_to_compress_algo): Allow "none" as an alias for "uncompressed".
2002-11-15 05:07:24 +01:00
}
break;
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
case oCertDigestAlgo: cert_digest_string = xstrdup(pargs.r.ret_str); break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break;
* g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg to exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock.
2004-12-16 06:16:09 +01:00
case oRequireSecmem: require_secmem=1; break;
case oNoRequireSecmem: require_secmem=0; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoPermissionWarn: opt.no_perm_warn=1; break;
* options.h, g10.c (main), mainproc.c (proc_encrypted): Return a decryption failed error if a MDC does not verify. Warn if a MDC is not present (can disable via --no-mdc-warning). * exec.c (exec_write), g10.c (main), keyserver.c (keyserver_spawn): Use new DISABLE_KEYSERVER_PATH rather than FIXED_EXEC_PATH.
2002-07-30 18:48:21 +02:00
case oNoMDCWarn: opt.no_mdc_warn=1; break;
* g10.c (main): Alias --charset as --display-charset to help avoid the continuing confusion and make room for possible changes in devel. * parse-packet.c (parse_plaintext): Show the hex value for the literal packet mode since it may not be printable. * keygen.c (make_backsig): Make sure that the backsig was built successfully before we try and use it. * status.h, status.c (get_status_string), plaintext.c (handle_plaintext): New status tags PLAINTEXT and PLAINTEXT_LENGTH.
2004-07-15 23:00:35 +02:00
case oDisplayCharset:
Some bug fixes of the last release
1998-11-10 13:59:59 +01:00
if( set_native_charset( pargs.r.ret_str ) )
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_error(_("`%s' is not a valid character set\n"),
pargs.r.ret_str);
Some bug fixes of the last release
1998-11-10 13:59:59 +01:00
break;
Expiration time works (I hope so)
1998-11-20 18:42:18 +01:00
case oNotDashEscaped: opt.not_dash_escaped = 1; break;
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 18:36:05 +01:00
case oEscapeFrom: opt.escape_from = 1; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoEscapeFrom: opt.escape_from = 0; break;
See ChangeLog: Fri Nov 27 21:37:41 CET 1998 Werner Koch
1998-11-27 21:40:56 +01:00
case oLockOnce: opt.lock_once = 1; break;
Lock random seed file
2006-02-09 13:54:41 +01:00
case oLockNever:
disable_dotlock ();
random_disable_locking ();
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oLockMultiple:
#ifndef __riscos__
opt.lock_once = 0;
#else /* __riscos__ */
added RISC OS module loading support
2002-10-31 17:58:47 +01:00
riscos_not_implemented("lock-multiple");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
#endif /* __riscos__ */
break;
case oKeyServer:
* keydb.h, getkey.c (release_akl), gpg.c (main): Add --no-auto-key-locate. * options.h, gpg.c (main): Keep track of each keyserver registered so we can match on them later. * keyserver-internal.h, keyserver.c (cmp_keyserver_spec, keyserver_match), gpgv.c: New. Find a keyserver that matches ours and return its spec. * getkey.c (get_pubkey_byname): Use it here to get the per-keyserver options from an earlier keyserver.
2006-02-24 15:27:22 +01:00
{
struct keyserver_spec *keyserver;
keyserver=parse_keyserver_uri(pargs.r.ret_str,0,
configname,configlineno);
if(!keyserver)
log_error(_("could not parse keyserver URL\n"));
else
{
keyserver->next=opt.keyserver;
opt.keyserver=keyserver;
}
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
case oKeyServerOptions:
* options.h, g10.c (main): Add keyserver-option honor-keyserver-url. parse_keyserver_options now returns a success code. * keyserver.c (parse_keyserver_options): Return error on failure to parse. Currently there is no way to fail as any unrecognized options get saved to be sent to the keyserver plugins later. Check length of keyserver option tokens since with =arguments we must only match the prefix. (free_keyserver_spec): Moved code from parse_keyserver_url. (keyserver_work, keyserver_spawn): Pass in a struct keyserver_spec rather than using the global keyserver option. (calculate_keyid_fpr): New. Fills in a KEYDB_SEARCH_DESC for a key. (keyidlist): New implementation using get_pubkey_bynames rather than searching the keydb directly. If honor-keyserver-url is set, make up a keyserver_spec and try and fetch that key directly. Do not include it in the returned keyidlist in that case.
2004-04-19 18:02:11 +02:00
if(!parse_keyserver_options(pargs.r.ret_str))
{
if(configname)
log_error(_("%s:%d: invalid keyserver options\n"),
configname,configlineno);
else
log_error(_("invalid keyserver options\n"));
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
* options.h, main.h, g10.c (main), import.c (parse_import_options, delete_inv_parts), keyserver.c (parse_keyserver_options): add new --import-options option. The only current flag is "allow-local-sigs". * g10.c (main): Don't disable MDC in pgp7 mode. * options.h, g10.c (main), keyserver.c (parse_keyserver_options): Remove old keyserver-option include-attributes now that there is an export-option for the same thing.
2002-07-23 00:26:14 +02:00
case oImportOptions:
* main.h, misc.c (parse_options): Add a "noisy" flag to enable and disable the messages about which option didn't match or matched ambiguously. Change all callers (g10.c, keyserver.c). * main.h, import.c (import_options), export.c (export_options): Pass the noisy flag through.
2003-12-28 04:46:43 +01:00
if(!parse_import_options(pargs.r.ret_str,&opt.import_options,1))
* options.h, main.h, g10.c (main), import.c (parse_import_options, delete_inv_parts), keyserver.c (parse_keyserver_options): add new --import-options option. The only current flag is "allow-local-sigs". * g10.c (main): Don't disable MDC in pgp7 mode. * options.h, g10.c (main), keyserver.c (parse_keyserver_options): Remove old keyserver-option include-attributes now that there is an export-option for the same thing.
2002-07-23 00:26:14 +02:00
{
if(configname)
log_error(_("%s:%d: invalid import options\n"),
configname,configlineno);
else
log_error(_("invalid import options\n"));
}
break;
* options.h, main.h, export.c (parse_export_options, do_export_stream), g10.c (main): add new --export-options option. Current flags are "include-non-rfc", "include-local-sigs", "include-attributes", and "include-sensitive-revkeys". * options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options, keyserver_spawn): try passing unknown keyserver options to export options, and if successful, use them when doing a keyserver --send-key. * build-packet.c (build_sig_subpkt): We do not generate SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
case oExportOptions:
* main.h, misc.c (parse_options): Add a "noisy" flag to enable and disable the messages about which option didn't match or matched ambiguously. Change all callers (g10.c, keyserver.c). * main.h, import.c (import_options), export.c (export_options): Pass the noisy flag through.
2003-12-28 04:46:43 +01:00
if(!parse_export_options(pargs.r.ret_str,&opt.export_options,1))
* options.h, main.h, export.c (parse_export_options, do_export_stream), g10.c (main): add new --export-options option. Current flags are "include-non-rfc", "include-local-sigs", "include-attributes", and "include-sensitive-revkeys". * options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options, keyserver_spawn): try passing unknown keyserver options to export options, and if successful, use them when doing a keyserver --send-key. * build-packet.c (build_sig_subpkt): We do not generate SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 21:07:21 +02:00
{
if(configname)
log_error(_("%s:%d: invalid export options\n"),
configname,configlineno);
else
log_error(_("invalid export options\n"));
}
break;
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
case oListOptions:
* options.h, keylist.c (print_one_subpacket, print_subpackets_colon): Print a spk record for each request subpacket. (list_keyblock_colon): Call them here. * g10.c (parse_subpacket_list, parse_list_options): New. Make the list of subpackets we are going to print. (main): Call them here.
2004-09-12 17:27:38 +02:00
if(!parse_list_options(pargs.r.ret_str))
{
if(configname)
log_error(_("%s:%d: invalid list options\n"),
configname,configlineno);
else
log_error(_("invalid list options\n"));
}
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
break;
case oVerifyOptions:
{
struct parse_options vopts[]=
{
* main.h, misc.c (parse_options): Add the ability to have help strings in xxx-options commands. * keyserver.c (keyserver_opts), import.c (parse_import_options), export.c (parse_export_options), g10.c (parse_list_options, main): Add help strings to xxx-options.
2005-09-15 00:31:21 +02: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")},
* options.h, mainproc.c (check_sig_and_print), gpg.c (main): pka-lookups, not pka-lookup. * options.h, gpg.c (main), keyedit.c [cmds], sig-check.c (signature_check2): Rename "backsign" to "cross-certify" as a more accurate name.
2006-03-08 03:40:42 +01:00
{"pka-lookups",VERIFY_PKA_LOOKUPS,NULL,
* options.h, gpg.c (main, parse_trust_model), pkclist.c (check_signatures_trust), mainproc.c (check_sig_and_print, pka_uri_from_sig), trustdb.c (init_trustdb): Some tweaks to PKA so that it is a verify-option now.
2006-03-07 21:14:20 +01:00
N_("validate signatures with PKA data")},
{"pka-trust-increase",VERIFY_PKA_TRUST_INCREASE,NULL,
N_("elevate the trust of signatures with valid PKA data")},
* main.h, misc.c (parse_options): Add the ability to have help strings in xxx-options commands. * keyserver.c (keyserver_opts), import.c (parse_import_options), export.c (parse_export_options), g10.c (parse_list_options, main): Add help strings to xxx-options.
2005-09-15 00:31:21 +02:00
{NULL,0,NULL,NULL}
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
};
* main.h, misc.c (parse_options): Add a "noisy" flag to enable and disable the messages about which option didn't match or matched ambiguously. Change all callers (g10.c, keyserver.c). * main.h, import.c (import_options), export.c (export_options): Pass the noisy flag through.
2003-12-28 04:46:43 +01:00
if(!parse_options(pargs.r.ret_str,&opt.verify_options,vopts,1))
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
{
if(configname)
log_error(_("%s:%d: invalid verify options\n"),
configname,configlineno);
else
log_error(_("invalid verify options\n"));
}
}
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oTempDir: opt.temp_dir=pargs.r.ret_str; break;
case oExecPath:
* exec.h, exec.c (set_exec_path): Remove some dead code and change all callers. We no longer need to append to $PATH.
2005-03-31 19:11:53 +02:00
if(set_exec_path(pargs.r.ret_str))
* exec.h, exec.c (set_exec_path, exec_write), g10.c (main): If USE_EXEC_PATH is defined at compile time, use it to lock the exec-path and not allow the user to change it.
2002-07-03 06:01:21 +02:00
log_error(_("unable to set exec-path to %s\n"),pargs.r.ret_str);
* options.h, exec.h, exec.c (set_exec_path, exec_write), g10.c (main), keyserver.c (keyserver_spawn): If the user does not use "exec-path", completely replace $PATH with GNUPG_LIBEXECDIR before calling the keyserver helper. If the user does use "exec-path", append GNUPG_LIBEXECDIR after the specified path.
2002-07-24 21:24:08 +02:00
else
opt.exec_path_set=1;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
* options.skel: Use new hkp://subkeys.pgp.net as sample keyserver since they at least handle subkeys correctly. * options.h, g10.c (main), main.h, keylist.c (show_keyserver_url), mainproc.c (check_sig_and_print), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt, can_handle_critical): Add read-only support for preferred keyserver subpackets. They're basically policy URLs with a different name. Add a verify-option "show-preferred-keyserver" to turn them on and off (on by default, as per stable branch). * g10.c (main): Add "--set-notation" as alias to "--notation-data" this is to make things consistent with --set-policy-url meaning both sigs and certs.
2003-06-05 04:06:12 +02:00
case oSetNotation:
Update head to match stable 1.0
2002-06-29 15:46:34 +02: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;
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
case oShowNotation:
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--show-notation",
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the plurarility (or not) of various list and verify options.
2003-11-14 06:06:19 +01:00
"--list-options ","show-notations");
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--show-notation",
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the plurarility (or not) of various list and verify options.
2003-11-14 06:06:19 +01:00
"--verify-options ","show-notations");
opt.list_options|=LIST_SHOW_NOTATIONS;
opt.verify_options|=VERIFY_SHOW_NOTATIONS;
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
break;
case oNoShowNotation:
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--no-show-notation",
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the plurarility (or not) of various list and verify options.
2003-11-14 06:06:19 +01:00
"--list-options ","no-show-notations");
* g10.c (main): Give a deprecated option warning for --show-keyring, --show-photos, --show-policy-url, --show-notation, and their respective no- forms. * options.skel: Remove show-photos and replace with list/verify-options show-photos. Remove no-mangle-dos-filenames. * misc.c (parse_options): Allow for incomplete (but unambiguous) options.
2003-10-10 05:05:05 +02:00
deprecated_warning(configname,configlineno,"--no-show-notation",
* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the plurarility (or not) of various list and verify options.
2003-11-14 06:06:19 +01:00
"--verify-options ","no-show-notations");
opt.list_options&=~LIST_SHOW_NOTATIONS;
opt.verify_options&=~VERIFY_SHOW_NOTATIONS;
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy, show_notation): Collapse the old print_notation_data into show_policy() and show_notation() so there is only one function to print notations and policy URLs. * options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig), keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c (mk_notation_and_policy): New "list-options" and "verify-options" commands. These replace the existing --show-photos/--no-show-photos, --show-notation/--no-show-notation, --show-policy-url/--no-show-policy-url, and --show-keyring options. The new method is more flexible since a user can specify (for example) showing photos during sig verification, but not in key listings. The old options are emulated.
2003-06-01 01:23:19 +02:00
break;
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 12:53:35 +02:00
case oUtf8Strings: utf8_strings = 1; break;
case oNoUtf8Strings: utf8_strings = 0; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oDisableCipherAlgo:
disable_cipher_algo( string_to_cipher_algo(pargs.r.ret_str) );
See ChangeLog: Thu Jul 15 10:15:35 CEST 1999 Werner Koch
1999-07-15 10:16:46 +02:00
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oDisablePubkeyAlgo:
disable_pubkey_algo( string_to_pubkey_algo(pargs.r.ret_str) );
See ChangeLog: Thu Jul 15 10:15:35 CEST 1999 Werner Koch
1999-07-15 10:16:46 +02:00
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoSigCache: opt.no_sig_cache = 1; break;
case oNoSigCreateCheck: opt.no_sig_create_check = 1; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case oAllowNonSelfsignedUID: opt.allow_non_selfsigned_uid = 1; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoAllowNonSelfsignedUID: opt.allow_non_selfsigned_uid=0; break;
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
case oAllowFreeformUID: opt.allow_freeform_uid = 1; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oNoAllowFreeformUID: opt.allow_freeform_uid = 0; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case oNoLiteral: opt.no_literal = 1; break;
case oSetFilesize: opt.set_filesize = pargs.r.ret_ulong; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oHonorHttpProxy:
* options.h, g10.c (main), keyserver.c (keyserver_opts, parse_keyserver_uri): honor-http-proxy is no longer an option since we can do the same thing with http-proxy with no arguments. Also remove broken-http-proxy since it can be better handled in the HTTP helper.
2003-12-28 17:08:04 +01:00
add_to_strlist(&opt.keyserver_options.other,"http-proxy");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
deprecated_warning(configname,configlineno,
"--honor-http-proxy",
* options.h, g10.c (main), keyserver.c (keyserver_opts, parse_keyserver_uri): honor-http-proxy is no longer an option since we can do the same thing with http-proxy with no arguments. Also remove broken-http-proxy since it can be better handled in the HTTP helper.
2003-12-28 17:08:04 +01:00
"--keyserver-options ","http-proxy");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case oFastListMode: opt.fast_list_mode = 1; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oFixedListMode: opt.fixed_list_mode = 1; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case oListOnly: opt.list_only=1; break;
case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oIgnoreValidFrom: opt.ignore_valid_from = 1; break;
case oIgnoreCrcError: opt.ignore_crc_error = 1; break;
* options.h, g10.c (main), mainproc.c (proc_encrypted): --ignore-mdc-error option to turn a MDC check error into a warning.
2002-08-06 19:57:53 +02:00
case oIgnoreMDCError: opt.ignore_mdc_error = 1; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case oNoRandomSeedFile: use_random_seed = 0; break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oAutoKeyRetrieve:
case oNoAutoKeyRetrieve:
* options.h, keyserver.c (parse_keyserver_options): Remove duplicate code from parse_keyserver_options by calling the generic parse_options. * keyserver.c (keyserver_spawn, keyserver_refresh), g10.c (main), gpgv.c (main), mainproc.c (check_sig_and_print), import.c (revocation_present): Change all callers.
2004-04-15 20:16:17 +02:00
if(pargs.r_opt==oAutoKeyRetrieve)
opt.keyserver_options.options|=KEYSERVER_AUTO_KEY_RETRIEVE;
else
opt.keyserver_options.options&=~KEYSERVER_AUTO_KEY_RETRIEVE;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
deprecated_warning(configname,configlineno,
pargs.r_opt==oAutoKeyRetrieve?"--auto-key-retrieve":
"--no-auto-key-retrieve","--keyserver-options ",
pargs.r_opt==oAutoKeyRetrieve?"auto-key-retrieve":
"no-auto-key-retrieve");
break;
case oShowSessionKey: opt.show_session_key = 1; break;
case oOverrideSessionKey:
opt.override_session_key = pargs.r.ret_str;
break;
* options.h, g10.c (main), import.c (parse_import_options, import_one, import_secret_one), keyserver.c (keyserver_refresh): Change --merge-only to --import-option merge-only. Deprecate --merge-only.
2003-12-31 05:58:52 +01:00
case oMergeOnly:
deprecated_warning(configname,configlineno,"--merge-only",
"--import-options ","merge-only");
opt.import_options|=IMPORT_MERGE_ONLY;
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oAllowSecretKeyImport: /* obsolete */ break;
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
case oTryAllSecrets: opt.try_all_secrets = 1; break;
case oTrustedKey: register_trusted_key( pargs.r.ret_str ); break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oEnableSpecialFilenames:
iobuf_enable_special_filenames (1);
break;
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;
* options.h, gpg.c (main), keygen.c (keygen_upd_std_prefs, keygen_add_std_prefs, proc_parameter_file): Add --default-keyserver-url to specify a keyserver URL at key generation time, and "Keyserver:" keyword for doing the same through a batch file.
2006-06-23 00:56:54 +02:00
case oDefaultKeyserverURL:
{
struct keyserver_spec *keyserver;
keyserver=parse_keyserver_uri(pargs.r.ret_str,1,
configname,configlineno);
if(!keyserver)
log_error(_("could not parse keyserver URL\n"));
else
free_keyserver_spec(keyserver);
opt.def_keyserver_url = pargs.r.ret_str;
}
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case oPersonalCipherPreferences:
pers_cipher_list=pargs.r.ret_str;
break;
case oPersonalDigestPreferences:
pers_digest_list=pargs.r.ret_str;
break;
case oPersonalCompressPreferences:
pers_compress_list=pargs.r.ret_str;
break;
case oDisplay: opt.display = pargs.r.ret_str; break;
case oTTYname: opt.ttyname = pargs.r.ret_str; break;
case oTTYtype: opt.ttytype = pargs.r.ret_str; break;
case oLCctype: opt.lc_ctype = pargs.r.ret_str; break;
case oLCmessages: opt.lc_messages = pargs.r.ret_str; break;
case oGroup: add_group(pargs.r.ret_str); break;
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
case oUnGroup: rm_group(pargs.r.ret_str); break;
* g10.c (main): Add --no-groups to zero --group list. * encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically encrypted session key. Use --s2k-cipher-algo to choose cipher, rather than the default cipher. * parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically encrypted session key is seen without salt. Show in --list-packets if a symetrically encrypted session key is present. * pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless --quiet is set. Use text name of cipher in warning.
2003-10-01 17:15:58 +02:00
case oNoGroups:
while(opt.grouplist)
{
struct groupitem *iter=opt.grouplist;
free_strlist(iter->values);
opt.grouplist=opt.grouplist->next;
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(iter);
* g10.c (main): Add --no-groups to zero --group list. * encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically encrypted session key. Use --s2k-cipher-algo to choose cipher, rather than the default cipher. * parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically encrypted session key is seen without salt. Show in --list-packets if a symetrically encrypted session key is present. * pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless --quiet is set. Use text name of cipher in warning.
2003-10-01 17:15:58 +02:00
}
break;
* options.h, g10.c (main): Add --strict and --no-strict to switch the log_warning severity level from info to error.
2002-10-04 00:13:04 +02:00
case oStrict: opt.strict=1; log_set_strict(1); break;
case oNoStrict: opt.strict=0; log_set_strict(0); break;
* g10.c: New options --[no-]mangle-dos-filenames. * options.h (opt): Added mangle-dos-filenames. * openfile.c (open_outfile) [USE_ONLY_8DOT3]: Truncate the filename only when this option is set; this is the default.
2002-12-05 16:25:16 +01:00
case oMangleDosFilenames: opt.mangle_dos_filenames = 1; break;
case oNoMangleDosFilenames: opt.mangle_dos_filenames = 0; break;
* Makefile.am (AM_CFLAGS): Make use of AM_CFLAGS and AM_LDFLAGS. * g10.c, options.h: New option --enable-progress-filter. * progress.c (handle_progress): Make use of it.
2003-04-15 17:46:13 +02:00
case oEnableProgressFilter: opt.enable_progress_filter = 1; break;
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
case oMultifile: multifile=1; break;
* options.h, g10.c (main): Add a more flexible --keyid-format option to replace the list-option (and eventually verify-option) show-long-keyids. The format can be short, long, 0xshort, and 0xlong. * keydb.h, keyid.c (keystr, keystrlen): New functions to generate a printable keyid. * keyedit.c (print_and_check_one_sig, show_key_with_all_names), keylist.c (list_keyblock_print): Use new keystr() function here to print keyids.
2004-03-03 06:47:51 +01:00
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;
else
* pkclist.c (do_edit_ownertrust): Use the same translated string for showing the user ID as mainproc.c:print_pkenc_list. * mainproc.c (print_pkenc_list): Allow translating the quotes around the user ID. * card-util.c, g10.c, photoid.c, trustdb.c: The last of the \"%s\" -> `%s' quoting for things that aren't user IDs. * keyserver.c (keyserver_spawn): If there is no keyserver host, print the whole URI since it is self-contained.
2004-10-11 23:08:37 +02:00
log_error("unknown keyid-format `%s'\n",pargs.r.ret_str);
* options.h, g10.c (main): Add a more flexible --keyid-format option to replace the list-option (and eventually verify-option) show-long-keyids. The format can be short, long, 0xshort, and 0xlong. * keydb.h, keyid.c (keystr, keystrlen): New functions to generate a printable keyid. * keyedit.c (print_and_check_one_sig, show_key_with_all_names), keylist.c (list_keyblock_print): Use new keystr() function here to print keyids.
2004-03-03 06:47:51 +01:00
break;
* gpg.sgml (http): * g10.c, options.h: New option --exit-on-status-write-error. * status.c (write_status_text): Make use of this option.
2005-07-22 18:28:40 +02:00
case oExitOnStatusWriteError:
opt.exit_on_status_write_error = 1;
break;
* g10.c, options.h: New option --limit-card-insert-tries. * cardglue.c (open_card): Use it.
2005-07-19 14:14:39 +02:00
case oLimitCardInsertTries:
opt.limit_card_insert_tries = pargs.r.ret_int;
break;
* options.h, mainproc.c (check_sig_and_print), gpg.c (main): pka-lookups, not pka-lookup. * options.h, gpg.c (main), keyedit.c [cmds], sig-check.c (signature_check2): Rename "backsign" to "cross-certify" as a more accurate name.
2006-03-08 03:40:42 +01:00
case oRequireCrossCert: opt.flags.require_cross_cert=1; break;
case oNoRequireCrossCert: opt.flags.require_cross_cert=0; break;
* options.h, getkey.c (merge_selfsigs_subkey), gpg.c (main), sig-check.c (signature_check2): Add --require-backsigs and --no-require-backsigs. Currently defaults to --no-require-backsigs.
2005-10-12 22:44:24 +02:00
* options.h, keydb.h, g10.c (main), getkey.c (parse_auto_key_locate): Parse a list of key access methods. (get_pubkey_byname): Walk the list here to try and retrieve keys we don't have locally.
2006-02-22 20:06:23 +01:00
case oAutoKeyLocate:
if(!parse_auto_key_locate(pargs.r.ret_str))
{
if(configname)
log_error(_("%s:%d: invalid auto-key-locate list\n"),
configname,configlineno);
else
log_error(_("invalid auto-key-locate list\n"));
}
break;
* keydb.h, getkey.c (release_akl), gpg.c (main): Add --no-auto-key-locate. * options.h, gpg.c (main): Keep track of each keyserver registered so we can match on them later. * keyserver-internal.h, keyserver.c (cmp_keyserver_spec, keyserver_match), gpgv.c: New. Find a keyserver that matches ours and return its spec. * getkey.c (get_pubkey_byname): Use it here to get the per-keyserver options from an earlier keyserver.
2006-02-24 15:27:22 +01:00
case oNoAutoKeyLocate:
release_akl();
break;
* options.h, keydb.h, g10.c (main), getkey.c (parse_auto_key_locate): Parse a list of key access methods. (get_pubkey_byname): Walk the list here to try and retrieve keys we don't have locally.
2006-02-22 20:06:23 +01:00
More tests added; make distcheck works
2006-03-07 12:05:41 +01:00
case oAllowMultisigVerification:
opt.allow_multisig_verification = 1;
break;
* options.h, gpg.c (main): Add --enable-dsa2 and --disable-dsa2. Defaults to disable. * pkclist.c (algo_available): If --enable-dsa2 is set, we're allowed to truncate hashes to fit DSA keys. * sign.c (match_dsa_hash): New. Return the best match hash for a given q size. (do_sign, hash_for, sign_file): When signing with a DSA key, if it has q==160, assume it is an old DSA key and don't allow truncation unless --enable-dsa2 is also set. q!=160 always allows truncation since they must be DSA2 keys. (make_keysig_packet): If the user doesn't specify a --cert-digest-algo, use match_dsa_hash to pick the best hash for key signatures.
2006-04-20 23:32:42 +02:00
case oEnableDSA2: opt.flags.dsa2=1; break;
case oDisableDSA2: opt.flags.dsa2=0; break;
* build-packet.c (do_comment): Removed. (build_packet): Ignore comment packets. * export.c (do_export_stream): Don't export comment packets any longer. * options.h, g10.c (main): Remove --sk-comments and --no-sk-comments options, and replace with no-op.
2005-05-14 04:38:31 +02:00
case oNoop: break;
* Makefile.am (AM_CFLAGS): Make use of AM_CFLAGS and AM_LDFLAGS. * g10.c, options.h: New option --enable-progress-filter. * progress.c (handle_progress): Make use of it.
2003-04-15 17:46:13 +02:00
Some bug fixes of the last release
1998-11-10 13:59:59 +01:00
default : pargs.err = configfp? 1:2; break;
* g10.c (main): Add --no-groups to zero --group list. * encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically encrypted session key. Use --s2k-cipher-algo to choose cipher, rather than the default cipher. * parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically encrypted session key is seen without salt. Show in --list-packets if a symetrically encrypted session key is present. * pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless --quiet is set. Use text name of cipher in warning.
2003-10-01 17:15:58 +02:00
}
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
added option file handling
1997-12-12 13:03:58 +01:00
if( configfp ) {
fclose( configfp );
configfp = NULL;
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
/* Remember the first config file name. */
if (!save_configname)
save_configname = configname;
else
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(configname);
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
configname = NULL;
added option file handling
1997-12-12 13:03:58 +01:00
goto next_pass;
}
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree( configname ); configname = NULL;
added option export
1998-02-13 21:58:50 +01:00
if( log_get_errorcount(0) )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_exit(2);
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
/* The command --gpgconf-list is pretty simple and may be called
directly after the option parsing. */
if (cmd == aGPGConfList)
{
gpgconf_list (save_configname);
g10_exit (0);
}
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree (save_configname);
* g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
2004-05-20 19:06:34 +02:00
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 19:47:23 +02:00
if( nogreeting )
greeting = 0;
added option file handling
1997-12-12 13:03:58 +01:00
bug fixes
1998-02-12 00:22:09 +01:00
if( greeting ) {
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
1999-02-19 15:54:00 +01:00
fprintf(stderr, "%s %s; %s\n",
strusage(11), strusage(13), strusage(14) );
fprintf(stderr, "%s\n", strusage(15) );
bug fixes
1998-02-12 00:22:09 +01:00
}
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#ifdef IS_DEVELOPMENT_VERSION
* g10.c (strusage, main): Show development version warning in --version output. (main): Set --bzip2-compress-level to the default value at startup. Remove --emulate-checksum-bug noop.
2003-12-04 05:58:12 +01:00
if( !opt.batch )
{
const char *s;
if((s=strusage(20)))
log_info("%s\n",s);
if((s=strusage(21)))
log_info("%s\n",s);
if((s=strusage(22)))
log_info("%s\n",s);
}
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#endif
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
* g10.c (main): Try to set a default character set. Print the used one in verbosity level 3. * gpgv.c (main): Try to set a default character set. * status.c, status.h (STATUS_IMPORT_OK): New. * import.c (import_one,import_secret_one): Print new status.
2002-09-02 12:59:04 +02:00
if (opt.verbose > 2)
log_info ("using character set `%s'\n", get_native_charset ());
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 16:35:34 +02:00
if( may_coredump && !opt.quiet )
log_info(_("WARNING: program may create a core file!\n"));
Update head to match stable 1.0
2002-06-29 15:46:34 +02: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";
}
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 09:44:46 +02:00
if (opt.no_literal) {
log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal");
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"),
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
eyes_only?"--for-your-eyes-only":"--set-filename",
"--no-literal" );
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 09:44:46 +02:00
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
Changes to make use of code taken from libassuan. This replaces the old ad-hoc connection code to gpg-agent. We do need this for the forthcoming diversion of card code to an already running gpg-agent with card-support.
2005-04-05 19:09:13 +02:00
#ifndef ENABLE_AGENT_SUPPORT
if (opt.use_agent) {
log_info(_("NOTE: %s is not available in this version\n"),
"--use-agent");
opt.use_agent = 0;
}
#endif /*!ENABLE_AGENT_SUPPORT*/
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 09:44:46 +02:00
if (opt.set_filesize)
log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize");
See ChangeLog: Sun Apr 18 10:11:28 CEST 1999 Werner Koch
1999-04-18 10:18:52 +02:00
if( opt.batch )
tty_batchmode( 1 );
bug fixes
1998-02-12 00:22:09 +01:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
secmem_set_flags( secmem_get_flags() & ~2 ); /* resume warnings */
Ready to test version 0.2.0
1998-01-25 19:56:33 +01:00
* g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg to exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock.
2004-12-16 06:16:09 +01:00
if(require_secmem && !got_secmem)
{
* g10.c (main): Typo. * armor.c (is_armor_header): Allow CR and LF (not just actual spaces) in an armor header line (-----BEGIN etc). This is needed due to CRLF issues on win32. As before, --openpgp makes it strict.
2005-01-06 05:44:38 +01:00
log_info(_("will not run with insecure memory due to %s\n"),
"--require-secmem");
* g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg to exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock.
2004-12-16 06:16:09 +01:00
g10_exit(2);
}
initially checkin
1997-11-18 15:06:00 +01:00
set_debug();
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
/* Do these after the switch(), so they can override settings. */
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
if(PGP2)
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
int unusable=0;
if(cmd==aSign && !detached_sig)
{
log_info(_("you can only make detached or clear signatures "
"while in --pgp2 mode\n"));
unusable=1;
}
else if(cmd==aSignEncr || cmd==aSignSym)
{
log_info(_("you can't sign and encrypt at the "
"same time while in --pgp2 mode\n"));
unusable=1;
}
else if(argc==0 && (cmd==aSign || cmd==aEncr || cmd==aSym))
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
log_info(_("you must use files (and not a pipe) when "
"working with --pgp2 enabled.\n"));
unusable=1;
}
else if(cmd==aEncr || cmd==aSym)
{
/* Everything else should work without IDEA (except using
a secret key encrypted with IDEA and setting an IDEA
preference, but those have their own error
messages). */
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
if(check_cipher_algo(CIPHER_ALGO_IDEA))
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
log_info(_("encrypting a message in --pgp2 mode requires "
"the IDEA cipher\n"));
idea_cipher_warn(1);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
unusable=1;
}
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
else if(cmd==aSym)
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
/* This only sets IDEA for symmetric encryption
since it is set via select_algo_from_prefs for
pk encryption. */
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(def_cipher_string);
def_cipher_string = xstrdup("idea");
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
}
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
/* PGP2 can't handle the output from the textmode
filter, so we disable it for anything that could
create a literal packet (only encryption and
symmetric encryption, since we disable signing
above). */
if(!unusable)
opt.textmode=0;
* options.h, g10.c (main), encode.c (write_pubkey_enc_from_list), pkclist.c (algo_available), revoke.c (gen_revoke): Add --pgp8 mode. This is basically identical to --pgp7 in all ways except that signing subkeys, v4 data sigs (including expiration), and SK comments are allowed. * getkey.c (finish_lookup): Comment. * main.h, keylist.c (reorder_keyblock), keyedit.c (keyedit_menu): Reorder user ID display in the --edit-key menu to match that of the --list-keys display. * g10.c (add_notation_data): Fix initialization.
2002-12-04 00:31:48 +01:00
}
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
if(unusable)
compliance_failure();
else
* options.h, g10.c (main), encode.c (write_pubkey_enc_from_list), pkclist.c (algo_available), revoke.c (gen_revoke): Add --pgp8 mode. This is basically identical to --pgp7 in all ways except that signing subkeys, v4 data sigs (including expiration), and SK comments are allowed. * getkey.c (finish_lookup): Comment. * main.h, keylist.c (reorder_keyblock), keyedit.c (keyedit_menu): Reorder user ID display in the --edit-key menu to match that of the --list-keys display. * g10.c (add_notation_data): Fix initialization.
2002-12-04 00:31:48 +01:00
{
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
opt.force_v4_certs = 0;
opt.escape_from = 1;
opt.force_v3_sigs = 1;
opt.pgp2_workarounds = 1;
opt.ask_sig_expire = 0;
opt.ask_cert_expire = 0;
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(def_digest_string);
def_digest_string = xstrdup("md5");
xfree(s2k_digest_string);
s2k_digest_string = xstrdup("md5");
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
opt.compress_algo = COMPRESS_ALGO_ZIP;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
}
}
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
else if(PGP6)
{
opt.escape_from=1;
opt.force_v3_sigs=1;
opt.ask_sig_expire=0;
}
else if(PGP7)
{
opt.escape_from=1;
opt.force_v3_sigs=1;
opt.ask_sig_expire=0;
}
else if(PGP8)
{
opt.escape_from=1;
}
fixed severe exploit
1998-07-09 15:37:17 +02:00
/* must do this after dropping setuid, because string_to...
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
* may try to load an module */
fixed severe exploit
1998-07-09 15:37:17 +02:00
if( def_cipher_string ) {
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.def_cipher_algo = string_to_cipher_algo(def_cipher_string);
if(opt.def_cipher_algo==0 &&
* g10.c (main): Accept "s1" in addition to "idea" to match the other ciphers. * main.h, misc.c (idea_cipher_warn): We don't need this if IDEA has been disabled.
2003-02-22 14:00:18 +01:00
(ascii_strcasecmp(def_cipher_string,"idea")==0
|| ascii_strcasecmp(def_cipher_string,"s1")==0))
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
idea_cipher_warn(1);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(def_cipher_string); def_cipher_string = NULL;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if( check_cipher_algo(opt.def_cipher_algo) )
intermediate check in
1998-08-05 18:51:59 +02:00
log_error(_("selected cipher algorithm is invalid\n"));
fixed severe exploit
1998-07-09 15:37:17 +02:00
}
if( def_digest_string ) {
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.def_digest_algo = string_to_digest_algo(def_digest_string);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(def_digest_string); def_digest_string = NULL;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if( check_digest_algo(opt.def_digest_algo) )
intermediate check in
1998-08-05 18:51:59 +02:00
log_error(_("selected digest algorithm is invalid\n"));
fixed severe exploit
1998-07-09 15:37:17 +02:00
}
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
if( compress_algo_string ) {
opt.compress_algo = string_to_compress_algo(compress_algo_string);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(compress_algo_string); compress_algo_string = NULL;
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
if( check_compress_algo(opt.compress_algo) )
* g10.c (main): Allow compression algorithm names as the argument to --compress-algo. The old algorithm names still work for backwards compatibility. * misc.c (string_to_compress_algo): Allow "none" as an alias for "uncompressed".
2002-11-15 05:07:24 +01:00
log_error(_("selected compression algorithm is invalid\n"));
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if( cert_digest_string ) {
opt.cert_digest_algo = string_to_digest_algo(cert_digest_string);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(cert_digest_string); cert_digest_string = NULL;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if( check_digest_algo(opt.cert_digest_algo) )
log_error(_("selected certification digest algorithm is invalid\n"));
}
*** empty log message ***
1998-09-28 21:25:31 +02:00
if( s2k_cipher_string ) {
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.s2k_cipher_algo = string_to_cipher_algo(s2k_cipher_string);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(s2k_cipher_string); s2k_cipher_string = NULL;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if( check_cipher_algo(opt.s2k_cipher_algo) )
*** empty log message ***
1998-09-28 21:25:31 +02:00
log_error(_("selected cipher algorithm is invalid\n"));
}
if( s2k_digest_string ) {
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.s2k_digest_algo = string_to_digest_algo(s2k_digest_string);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(s2k_digest_string); s2k_digest_string = NULL;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if( check_digest_algo(opt.s2k_digest_algo) )
*** empty log message ***
1998-09-28 21:25:31 +02:00
log_error(_("selected digest algorithm is invalid\n"));
}
intermediate check in
1998-08-05 18:51:59 +02:00
if( opt.completes_needed < 1 )
* options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Add --min-cert-check-level option to specify minimum cert check level. Defaults to 2 (so 0x11 sigs are ignored). 0x10 sigs cannot be ignored.
2004-02-23 05:00:51 +01:00
log_error(_("completes-needed must be greater than 0\n"));
intermediate check in
1998-08-05 18:51:59 +02:00
if( opt.marginals_needed < 2 )
* options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Add --min-cert-check-level option to specify minimum cert check level. Defaults to 2 (so 0x11 sigs are ignored). 0x10 sigs cannot be ignored.
2004-02-23 05:00:51 +01:00
log_error(_("marginals-needed must be greater than 1\n"));
See ChangeLog ;-). Key validation should now be faster
1998-11-13 20:41:41 +01:00
if( opt.max_cert_depth < 1 || opt.max_cert_depth > 255 )
* options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Add --min-cert-check-level option to specify minimum cert check level. Defaults to 2 (so 0x11 sigs are ignored). 0x10 sigs cannot be ignored.
2004-02-23 05:00:51 +01:00
log_error(_("max-cert-depth must be in the range from 1 to 255\n"));
* plaintext.c: Copyright. * encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
2004-02-25 00:37:18 +01:00
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"));
*** empty log message ***
1998-09-28 21:25:31 +02:00
switch( opt.s2k_mode ) {
*** empty log message ***
1998-09-29 18:15:15 +02:00
case 0:
Some bug fixes of the last release
1998-11-10 13:59:59 +01:00
log_info(_("NOTE: simple S2K mode (0) is strongly discouraged\n"));
*** empty log message ***
1998-09-29 18:15:15 +02:00
break;
case 1: case 3: break;
*** empty log message ***
1998-09-28 21:25:31 +02:00
default:
log_error(_("invalid S2K mode; must be 0, 1 or 3\n"));
}
intermediate check in
1998-08-05 18:51:59 +02:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
/* 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"));
* plaintext.c: Copyright. * encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
2004-02-25 00:37:18 +01:00
/* We provide defaults for the personal digest list. This is
SHA-1. */
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if(!pers_digest_list)
pers_digest_list="h2";
if(pers_cipher_list &&
keygen_set_std_prefs(pers_cipher_list,PREFTYPE_SYM))
log_error(_("invalid personal cipher preferences\n"));
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"));
See ChangeLog: Tue Dec 8 13:15:16 CET 1998 Werner Koch
1998-12-08 13:20:53 +01:00
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
/* We don't support all possible commands with multifile yet */
if(multifile)
{
char *cmdname;
switch(cmd)
{
case aSign:
cmdname="--sign";
break;
case aClearsign:
cmdname="--clearsign";
break;
case aDetachedSign:
cmdname="--detach-sign";
break;
case aSym:
cmdname="--symmetric";
break;
* g10.c (main): Add --symmetric --encrypt command. This generates a message that can be decrypted via a passphrase or public key system. * main.h, encode.c (encode_seskey): Allow passing in an already-created session key dek. (encode_simple): Use the actual symmetric cipher when encrypting a session key for a symmetric message. (encode_crypt): Add a flag to trigger a hybrid mode that can be decrypted via a passphrase or a pk. Change all callers. * mainproc.c (symkey_decrypt_sesskey): There is no way to tell the difference here between a bad passphrase and a cipher algorithm that we don't have, so use a error message that makes that clear. Use the actual list of ciphers when checking whether a cipher is invalid. Return error if the decrypted cipher algorithm is invalid. (proc_symkey_enc): In a mixed passphrase/pk message, if a valid dek already exists from decrypting via pk, do not try to process the passphrase. (proc_symkey_enc): Indicate when we're decrypting a session key as opposed to decrypting data. If a passphrase is invalid, discard the dek so we'll keep trying.
2003-10-26 04:26:14 +01:00
case aEncrSym:
cmdname="--symmetric --encrypt";
break;
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
case aStore:
cmdname="--store";
break;
default:
cmdname=NULL;
break;
}
if(cmdname)
log_error(_("%s does not yet work with %s\n"),cmdname,"--multifile");
}
fixed severe exploit
1998-07-09 15:37:17 +02:00
if( log_get_errorcount(0) )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_exit(2);
fixed severe exploit
1998-07-09 15:37:17 +02:00
* g10.c (main, rm_group): Add --ungroup command to remove a particular group. (add_group): When adding a group with the same name as an already existing group, merge the two groups. (list_config): Show an error message when listing a config item that doesn't exist. (main): Replace -z0 trick for no compression. * packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c (list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to remove local_id, which is no longer used.
2004-01-30 17:49:28 +01:00
if(opt.compress_level==0)
opt.compress_algo=COMPRESS_ALGO_NONE;
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
/* Check our chosen algorithms against the list of legal
algorithms. */
if(!GNUPG)
{
const char *badalg=NULL;
preftype_t badtype=PREFTYPE_NONE;
if(opt.def_cipher_algo
&& !algo_available(PREFTYPE_SYM,opt.def_cipher_algo,NULL))
{
badalg=cipher_algo_to_string(opt.def_cipher_algo);
badtype=PREFTYPE_SYM;
}
else if(opt.def_digest_algo
&& !algo_available(PREFTYPE_HASH,opt.def_digest_algo,NULL))
{
badalg=digest_algo_to_string(opt.def_digest_algo);
badtype=PREFTYPE_HASH;
}
else if(opt.cert_digest_algo
&& !algo_available(PREFTYPE_HASH,opt.cert_digest_algo,NULL))
{
badalg=digest_algo_to_string(opt.cert_digest_algo);
badtype=PREFTYPE_HASH;
}
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
else if(opt.compress_algo!=-1
&& !algo_available(PREFTYPE_ZIP,opt.compress_algo,NULL))
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
{
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c (init_compress): Add --compress-level and --bzip2-compress-level. -z sets them both. Change various callers.
2003-11-15 23:31:58 +01:00
badalg=compress_algo_to_string(opt.compress_algo);
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
badtype=PREFTYPE_ZIP;
}
if(badalg)
{
switch(badtype)
{
case PREFTYPE_SYM:
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("you may not use cipher algorithm `%s'"
" while in %s mode\n"),
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
badalg,compliance_option_string());
break;
case PREFTYPE_HASH:
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("you may not use digest algorithm `%s'"
" while in %s mode\n"),
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
badalg,compliance_option_string());
break;
case PREFTYPE_ZIP:
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_info(_("you may not use compression algorithm `%s'"
" while in %s mode\n"),
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
badalg,compliance_option_string());
break;
default:
BUG();
}
compliance_failure();
}
}
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
/* set the random seed file */
if( use_random_seed ) {
char *p = make_filename(opt.homedir, "random_seed", NULL );
set_random_seed_file(p);
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
if (!access (p, F_OK))
register_secured_file (p);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(p);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
}
if( !cmd && opt.fingerprint && !with_fpr ) {
partial DSA support
1998-03-09 22:44:06 +01:00
set_cmd( &cmd, aListKeys);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
}
partial DSA support
1998-03-09 22:44:06 +01:00
NT version compiles
1998-01-05 20:13:15 +01:00
if( cmd == aKMode || cmd == aKModeC ) { /* kludge to be compatible to pgp */
if( cmd == aKModeC ) {
opt.fingerprint = 1;
cmd = aKMode;
}
opt.list_sigs = 0;
if( opt.verbose > 2 )
opt.check_sigs++;
if( opt.verbose > 1 )
opt.list_sigs++;
opt.verbose = opt.verbose > 1;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_opt_verbose = opt.verbose;
NT version compiles
1998-01-05 20:13:15 +01:00
}
removed g10maint.c
1998-03-05 10:22:13 +01:00
/* kludge to let -sat generate a clear text signature */
(Does not compile yet)
1998-11-03 20:38:58 +01:00
if( opt.textmode == 2 && !detached_sig && opt.armor && cmd == aSign )
removed g10maint.c
1998-03-05 10:22:13 +01:00
cmd = aClearsign;
initially checkin
1997-11-18 15:06:00 +01:00
if( opt.verbose > 1 )
set_packet_list_mode(1);
New command --gpgconf-test.
2006-10-23 16:21:41 +02:00
if (cmd == aGPGConfTest)
g10_exit(0);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
/* Add the keyrings, but not for some special commands and not in
case of "-kvv userid keyring". Also avoid adding the secret
keyring for a couple of commands to avoid unneeded access in
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
case the secrings are stored on a floppy.
We always need to add the keyrings if we are running under
* keydb.c (keydb_add_resource): Clarify meaning of flags. Add new flag 4. Use log_info for errors registering the default secret key. * g10.c (main): Flag the default keyrings.
2005-03-31 09:05:35 +02:00
SELinux, this is so that the rings are added to the list of
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
secured files. */
if( ALWAYS_ADD_KEYRINGS
|| (cmd != aDeArmor && cmd != aEnArmor
&& !(cmd == aKMode && argc == 2 )) )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
if (ALWAYS_ADD_KEYRINGS
|| (cmd != aCheckKeys && cmd != aListSigs && cmd != aListKeys
&& cmd != aVerify && cmd != aSym))
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{
if (!sec_nrings || default_keyring) /* add default secret rings */
* keydb.c (keydb_add_resource): Clarify meaning of flags. Add new flag 4. Use log_info for errors registering the default secret key. * g10.c (main): Flag the default keyrings.
2005-03-31 09:05:35 +02:00
keydb_add_resource ("secring" EXTSEP_S "gpg", 4, 1);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
for (sl = sec_nrings; sl; sl = sl->next)
keydb_add_resource ( sl->d, 0, 1 );
}
if( !nrings || default_keyring ) /* add default ring */
* keydb.c (keydb_add_resource): Clarify meaning of flags. Add new flag 4. Use log_info for errors registering the default secret key. * g10.c (main): Flag the default keyrings.
2005-03-31 09:05:35 +02:00
keydb_add_resource ("pubring" EXTSEP_S "gpg", 4, 0);
fixed severe exploit
1998-07-09 15:37:17 +02:00
for(sl = nrings; sl; sl = sl->next )
* keyring.h, keyring.c (keyring_register_filename): Return the pointer if a given keyring is registered twice. * keydb.h, keydb.c (keydb_add_resource): Use flags to indicate a default keyring. (keydb_locate_writable): Prefer the default keyring if possible. * g10.c (main): Add --default-keyring option.
2002-11-08 04:31:21 +01:00
keydb_add_resource ( sl->d, sl->flags, 0 );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
}
fixed severe exploit
1998-07-09 15:37:17 +02:00
FREE_STRLIST(nrings);
FREE_STRLIST(sec_nrings);
initially checkin
1997-11-18 15:06:00 +01:00
*** empty log message ***
1998-09-28 21:25:31 +02:00
if( pwfd != -1 ) /* read the passphrase now. */
read_passphrase_from_fd( pwfd );
fname = argc? *argv : NULL;
initially checkin
1997-11-18 15:06:00 +01:00
* gpg.c (print_mds), armor.c (armor_filter, parse_hash_header): Add SHA-224. * sign.c (write_plaintext_packet), encode.c (encode_simple): Factor common literal packet setup code from here, to... * main.h, plaintext.c (setup_plaintext_name): Here. New. Make sure the literal packet filename field is UTF-8 encoded. * options.h, gpg.c (main): Make sure --set-filename is UTF-8 encoded and note when filenames are already UTF-8.
2006-04-20 04:36:05 +02:00
if(fname && utf8_strings)
opt.flags.utf8_filename=1;
removed g10maint.c
1998-03-05 10:22:13 +01:00
switch( cmd ) {
case aPrimegen:
new release
1998-05-15 20:49:19 +02:00
case aPrintMD:
removed g10maint.c
1998-03-05 10:22:13 +01:00
case aPrintMDs:
case aGenRandom:
case aDeArmor:
case aEnArmor:
a new release
1998-10-07 15:30:43 +02:00
case aFixTrustDB:
removed g10maint.c
1998-03-05 10:22:13 +01:00
break;
See ChangeLog: Thu Mar 11 16:39:46 CET 1999 Werner Koch
1999-03-11 16:42:06 +01:00
case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break;
case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break;
default: rc = setup_trustdb(1, trustdb_name ); break;
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
added some trust model stuff
1998-01-16 22:15:24 +01:00
if( rc )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
log_error(_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
switch (cmd)
{
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case aStore:
case aSym:
case aSign:
case aSignSym:
case aClearsign:
if (!opt.quiet && any_explicit_recipient)
log_info (_("WARNING: recipients (-r) given "
"without using public key encryption\n"));
break;
default:
break;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
started with trust stuff
1998-01-12 11:18:17 +01:00
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
switch( cmd )
{
initially checkin
1997-11-18 15:06:00 +01:00
case aStore: /* only store the file */
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 19:54:31 +01:00
wrong_args(_("--store [filename]"));
initially checkin
1997-11-18 15:06:00 +01:00
if( (rc = encode_store(fname)) )
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
log_error ("storing `%s' failed: %s\n",
print_fname_stdin(fname),g10_errstr(rc) );
initially checkin
1997-11-18 15:06:00 +01:00
break;
case aSym: /* encrypt the given file only with the symmetric cipher */
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 19:54:31 +01:00
wrong_args(_("--symmetric [filename]"));
initially checkin
1997-11-18 15:06:00 +01:00
if( (rc = encode_symmetric(fname)) )
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
log_error (_("symmetric encryption of `%s' failed: %s\n"),
print_fname_stdin(fname),g10_errstr(rc) );
initially checkin
1997-11-18 15:06:00 +01:00
break;
case aEncr: /* encrypt the given file */
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
if(multifile)
encode_crypt_files(argc, argv, remusr);
else
{
if( argc > 1 )
wrong_args(_("--encrypt [filename]"));
* g10.c (main): Add --symmetric --encrypt command. This generates a message that can be decrypted via a passphrase or public key system. * main.h, encode.c (encode_seskey): Allow passing in an already-created session key dek. (encode_simple): Use the actual symmetric cipher when encrypting a session key for a symmetric message. (encode_crypt): Add a flag to trigger a hybrid mode that can be decrypted via a passphrase or a pk. Change all callers. * mainproc.c (symkey_decrypt_sesskey): There is no way to tell the difference here between a bad passphrase and a cipher algorithm that we don't have, so use a error message that makes that clear. Use the actual list of ciphers when checking whether a cipher is invalid. Return error if the decrypted cipher algorithm is invalid. (proc_symkey_enc): In a mixed passphrase/pk message, if a valid dek already exists from decrypting via pk, do not try to process the passphrase. (proc_symkey_enc): Indicate when we're decrypting a session key as opposed to decrypting data. If a passphrase is invalid, discard the dek so we'll keep trying.
2003-10-26 04:26:14 +01:00
if( (rc = encode_crypt(fname,remusr,0)) )
log_error("%s: encryption failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
}
break;
case aEncrSym:
* misc.c (compress_algo_to_string, string_to_compress_algo, check_compress_algo): Add bzip2. * compress.c (compress_filter): Make static to help force the use of push_compress_filter. Remove default algorithm setting since that is done in push_compress_filter now. * main.h: Use named algorithm. * filter.h, compress.c (push_compress_filter, push_compress_filter2): New. Figure out which is the appropriate compression filter to use, and push it into place. * compress.c (handle_compressed), encode.c (encode_simple, encode_crypt), sign.c (sign_file, sign_symencrypt_file), import.c (read_block), export.c (do_export): Use push_compress_filter instead of pushing the compression filter ourselves. * compress-bz2.c: New. Bzlib versions of the compression filter routines. * Makefile.am: Include compress-bz2.c if bz2lib is available.
2003-10-31 06:39:02 +01:00
/* 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
* g10.c (main): Add --symmetric --encrypt command. This generates a message that can be decrypted via a passphrase or public key system. * main.h, encode.c (encode_seskey): Allow passing in an already-created session key dek. (encode_simple): Use the actual symmetric cipher when encrypting a session key for a symmetric message. (encode_crypt): Add a flag to trigger a hybrid mode that can be decrypted via a passphrase or a pk. Change all callers. * mainproc.c (symkey_decrypt_sesskey): There is no way to tell the difference here between a bad passphrase and a cipher algorithm that we don't have, so use a error message that makes that clear. Use the actual list of ciphers when checking whether a cipher is invalid. Return error if the decrypted cipher algorithm is invalid. (proc_symkey_enc): In a mixed passphrase/pk message, if a valid dek already exists from decrypting via pk, do not try to process the passphrase. (proc_symkey_enc): Indicate when we're decrypting a session key as opposed to decrypting data. If a passphrase is invalid, discard the dek so we'll keep trying.
2003-10-26 04:26:14 +01:00
might work with 7, but alas, I don't have a copy to test
with right now. */
if( argc > 1 )
wrong_args(_("--symmetric --encrypt [filename]"));
else if(opt.s2k_mode==0)
log_error(_("you cannot use --symmetric --encrypt"
" with --s2k-mode 0\n"));
else if(PGP2 || PGP6 || PGP7 || RFC1991)
log_error(_("you cannot use --symmetric --encrypt"
" while in %s mode\n"),compliance_option_string());
else
{
if( (rc = encode_crypt(fname,remusr,1)) )
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
log_error("%s: encryption failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
}
IDEA removed, signing works
1997-11-24 12:04:11 +01:00
break;
* g10.c (main): Add --symmetric --encrypt command. This generates a message that can be decrypted via a passphrase or public key system. * main.h, encode.c (encode_seskey): Allow passing in an already-created session key dek. (encode_simple): Use the actual symmetric cipher when encrypting a session key for a symmetric message. (encode_crypt): Add a flag to trigger a hybrid mode that can be decrypted via a passphrase or a pk. Change all callers. * mainproc.c (symkey_decrypt_sesskey): There is no way to tell the difference here between a bad passphrase and a cipher algorithm that we don't have, so use a error message that makes that clear. Use the actual list of ciphers when checking whether a cipher is invalid. Return error if the decrypted cipher algorithm is invalid. (proc_symkey_enc): In a mixed passphrase/pk message, if a valid dek already exists from decrypting via pk, do not try to process the passphrase. (proc_symkey_enc): Indicate when we're decrypting a session key as opposed to decrypting data. If a passphrase is invalid, discard the dek so we'll keep trying.
2003-10-26 04:26:14 +01:00
IDEA removed, signing works
1997-11-24 12:04:11 +01:00
case aSign: /* sign the given file */
*** empty log message ***
1998-01-13 20:04:23 +01:00
sl = NULL;
if( detached_sig ) { /* sign all files */
for( ; argc; argc--, argv++ )
add_to_strlist( &sl, *argv );
}
else {
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 19:54:31 +01:00
wrong_args(_("--sign [filename]"));
*** empty log message ***
1998-01-13 20:04:23 +01:00
if( argc ) {
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
sl = xmalloc_clear( sizeof *sl + strlen(fname));
*** empty log message ***
1998-01-13 20:04:23 +01:00
strcpy(sl->d, fname);
}
}
if( (rc = sign_file( sl, detached_sig, locusr, 0, NULL, NULL)) )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
log_error("signing failed: %s\n", g10_errstr(rc) );
*** empty log message ***
1998-01-13 20:04:23 +01:00
free_strlist(sl);
IDEA removed, signing works
1997-11-24 12:04:11 +01:00
break;
case aSignEncr: /* sign and encrypt the given file */
Sylvester Version
1997-12-31 13:32:54 +01:00
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 19:54:31 +01:00
wrong_args(_("--sign --encrypt [filename]"));
*** empty log message ***
1998-01-13 20:04:23 +01:00
if( argc ) {
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
sl = xmalloc_clear( sizeof *sl + strlen(fname));
*** empty log message ***
1998-01-13 20:04:23 +01:00
strcpy(sl->d, fname);
}
else
sl = NULL;
if( (rc = sign_file(sl, detached_sig, locusr, 1, remusr, NULL)) )
* g10.c (main): Add --symmetric --sign --encrypt. * main.h, encode.c (setup_symkey): New. Prompt for a passphrase and create a DEK for symmetric encryption. (write_symkey_enc): New. Write out symmetrically encrypted session keys. (encode_crypt, encrypt_filter): Use them here here when creating a message that can be decrypted with a passphrase or a pk. * sign.c (sign_file): Call setup_symkey if we are doing a --symmetric --sign --encrypt.
2003-11-13 03:54:12 +01:00
log_error("%s: sign+encrypt failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
*** empty log message ***
1998-01-13 20:04:23 +01:00
free_strlist(sl);
initially checkin
1997-11-18 15:06:00 +01:00
break;
* g10.c (main): Add --symmetric --sign --encrypt. * main.h, encode.c (setup_symkey): New. Prompt for a passphrase and create a DEK for symmetric encryption. (write_symkey_enc): New. Write out symmetrically encrypted session keys. (encode_crypt, encrypt_filter): Use them here here when creating a message that can be decrypted with a passphrase or a pk. * sign.c (sign_file): Call setup_symkey if we are doing a --symmetric --sign --encrypt.
2003-11-13 03:54:12 +01:00
case aSignEncrSym: /* sign and encrypt the given file */
if( argc > 1 )
wrong_args(_("--symmetric --sign --encrypt [filename]"));
else if(opt.s2k_mode==0)
log_error(_("you cannot use --symmetric --sign --encrypt"
" with --s2k-mode 0\n"));
else if(PGP2 || PGP6 || PGP7 || RFC1991)
log_error(_("you cannot use --symmetric --sign --encrypt"
" while in %s mode\n"),compliance_option_string());
else
{
if( argc )
{
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
sl = xmalloc_clear( sizeof *sl + strlen(fname));
* g10.c (main): Add --symmetric --sign --encrypt. * main.h, encode.c (setup_symkey): New. Prompt for a passphrase and create a DEK for symmetric encryption. (write_symkey_enc): New. Write out symmetrically encrypted session keys. (encode_crypt, encrypt_filter): Use them here here when creating a message that can be decrypted with a passphrase or a pk. * sign.c (sign_file): Call setup_symkey if we are doing a --symmetric --sign --encrypt.
2003-11-13 03:54:12 +01:00
strcpy(sl->d, fname);
}
else
sl = NULL;
if( (rc = sign_file(sl, detached_sig, locusr, 2, remusr, NULL)) )
log_error("%s: symmetric+sign+encrypt failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
free_strlist(sl);
}
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case aSignSym: /* sign and conventionally encrypt the given file */
if (argc > 1)
wrong_args(_("--sign --symmetric [filename]"));
rc = sign_symencrypt_file (fname, locusr);
if (rc)
log_error("%s: sign+symmetric failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
break;
armor rewritten, but still buggy
1998-02-04 19:54:31 +01:00
case aClearsign: /* make a clearsig */
if( argc > 1 )
wrong_args(_("--clearsign [filename]"));
if( (rc = clearsign_file(fname, locusr, NULL)) )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
log_error("%s: clearsign failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
partial DSA support
1998-03-09 22:44:06 +01:00
break;
case aVerify:
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
if(multifile)
{
if( (rc = verify_files( argc, argv ) ))
log_error("verify files failed: %s\n", g10_errstr(rc) );
}
else
{
if( (rc = verify_signatures( argc, argv ) ))
log_error("verify signatures failed: %s\n", g10_errstr(rc) );
}
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
break;
partial DSA support
1998-03-09 22:44:06 +01:00
case aDecrypt:
* g10.c (main): Error out if --multifile is used with the commands that don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and --store). * g10.c (main): Add --multifile as an alias to turn --encrypt into --encrypt-files (plus --verify-files, --decrypt-files). * encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to check for MDC usability. Do not set the force_mdc or disable_mdc flags since there is no point any longer.
2003-09-09 02:25:53 +02:00
if(multifile)
decrypt_messages(argc, argv);
else
{
if( argc > 1 )
wrong_args(_("--decrypt [filename]"));
if( (rc = decrypt_message( fname ) ))
log_error("decrypt_message failed: %s\n", g10_errstr(rc) );
}
armor rewritten, but still buggy
1998-02-04 19:54:31 +01:00
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
* main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance the more general command list functionality to replace it. * g10.c (main): Use the general command functionality to implement --sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.
2004-02-12 19:32:09 +01:00
case aSignKey:
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
if( argc != 1 )
* main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance the more general command list functionality to replace it. * g10.c (main): Use the general command functionality to implement --sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.
2004-02-12 19:32:09 +01:00
wrong_args(_("--sign-key user-id"));
/* fall through */
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
case aLSignKey:
if( argc != 1 )
* main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance the more general command list functionality to replace it. * g10.c (main): Use the general command functionality to implement --sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.
2004-02-12 19:32:09 +01:00
wrong_args(_("--lsign-key user-id"));
/* fall through */
sl=NULL;
if(cmd==aSignKey)
append_to_strlist(&sl,"sign");
else if(cmd==aLSignKey)
append_to_strlist(&sl,"lsign");
else
BUG();
append_to_strlist( &sl, "save" );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
username = make_username( fname );
* main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance the more general command list functionality to replace it. * g10.c (main): Use the general command functionality to implement --sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.
2004-02-12 19:32:09 +01:00
keyedit_menu(fname, locusr, sl, 0, 0 );
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(username);
* main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance the more general command list functionality to replace it. * g10.c (main): Use the general command functionality to implement --sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.
2004-02-12 19:32:09 +01:00
free_strlist(sl);
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
intermediate release
1998-07-06 12:23:57 +02:00
case aEditKey: /* Edit a key signature */
Expiration time works (I hope so)
1998-11-20 18:42:18 +01:00
if( !argc )
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
wrong_args(_("--edit-key user-id [commands]"));
username = make_username( fname );
Expiration time works (I hope so)
1998-11-20 18:42:18 +01:00
if( argc > 1 ) {
sl = NULL;
for( argc--, argv++ ; argc; argc--, argv++ )
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
append_to_strlist( &sl, *argv );
* main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance the more general command list functionality to replace it. * g10.c (main): Use the general command functionality to implement --sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.
2004-02-12 19:32:09 +01:00
keyedit_menu( username, locusr, sl, 0, 1 );
Expiration time works (I hope so)
1998-11-20 18:42:18 +01:00
free_strlist(sl);
}
else
* main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance the more general command list functionality to replace it. * g10.c (main): Use the general command functionality to implement --sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.
2004-02-12 19:32:09 +01:00
keyedit_menu(username, locusr, NULL, 0, 1 );
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(username);
Bug in blowfish behoben
1998-01-06 22:01:36 +01:00
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case aDeleteKeys:
case aDeleteSecretKeys:
case aDeleteSecretAndPublicKeys:
sl = NULL;
/* I'm adding these in reverse order as add_to_strlist2
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 );
delete_keys(sl,cmd==aDeleteSecretKeys,cmd==aDeleteSecretAndPublicKeys);
free_strlist(sl);
v0.2.11
1998-03-03 09:43:28 +01:00
break;
added option export
1998-02-13 21:58:50 +01:00
case aCheckKeys:
partial DSA support
1998-03-09 22:44:06 +01:00
opt.check_sigs = 1;
case aListSigs:
opt.list_sigs = 1;
case aListKeys:
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
sl = NULL;
for( ; argc; argc--, argv++ )
add_to_strlist2( &sl, *argv, utf8_strings );
public_key_list( sl );
free_strlist(sl);
*** empty log message ***
1998-05-29 13:53:54 +02:00
break;
case aListSecretKeys:
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
sl = NULL;
for( ; argc; argc--, argv++ )
add_to_strlist2( &sl, *argv, utf8_strings );
secret_key_list( sl );
free_strlist(sl);
partial DSA support
1998-03-09 22:44:06 +01:00
break;
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 14:57:54 +02:00
case aKMode: /* list keyring -- NOTE: This will be removed soon */
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
if( argc < 2 ) { /* -kv [userid] */
sl = NULL;
if (argc && **argv)
add_to_strlist2( &sl, *argv, utf8_strings );
public_key_list( sl );
free_strlist(sl);
}
partial DSA support
1998-03-09 22:44:06 +01:00
else if( argc == 2 ) { /* -kv userid keyring */
if( access( argv[1], R_OK ) ) {
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_error(_("can't open `%s': %s\n"),
partial DSA support
1998-03-09 22:44:06 +01:00
print_fname_stdin(argv[1]), strerror(errno));
NT version compiles
1998-01-05 20:13:15 +01:00
}
added option export
1998-02-13 21:58:50 +01:00
else {
partial DSA support
1998-03-09 22:44:06 +01:00
/* add keyring (default keyrings are not registered in this
* special case */
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
keydb_add_resource( argv[1], 0, 0 );
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
sl = NULL;
if (**argv)
add_to_strlist2( &sl, *argv, utf8_strings );
public_key_list( sl );
free_strlist(sl);
added option export
1998-02-13 21:58:50 +01:00
}
NT version compiles
1998-01-05 20:13:15 +01:00
}
else
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 09:44:46 +02:00
wrong_args(_("-k[v][v][v][c] [user-id] [keyring]") );
NT version compiles
1998-01-05 20:13:15 +01:00
break;
added some stuff for signing keys
1997-12-16 20:15:09 +01:00
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case aKeygen: /* generate a key */
if( opt.batch ) {
if( argc > 1 )
wrong_args("--gen-key [parameterfile]");
Note: I have not fully tested the new key creation due to a pc/sc error. However the backupfile has been created successfully. * rsa.c (rsa_generate): Return the dummy list of factors only if the caller asked for it. * card_util.c (generate_card_keys): ask whether backup should be created. (card_store_subkey): Factored some code out to .. * keygen.c (save_unprotected_key_to_card): .. new function. (gen_card_key_with_backup): New. (generate_raw_key): New. (generate_keypair): New arg BACKUP_ENCRYPTION_DIR. Changed all callers. (do_generate_keypair): Divert to gen_card_key_with_backup when desired.
2004-09-23 21:34:45 +02:00
generate_keypair( argc? *argv : NULL, NULL, NULL );
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
}
else {
if( argc )
wrong_args("--gen-key");
Note: I have not fully tested the new key creation due to a pc/sc error. However the backupfile has been created successfully. * rsa.c (rsa_generate): Return the dummy list of factors only if the caller asked for it. * card_util.c (generate_card_keys): ask whether backup should be created. (card_store_subkey): Factored some code out to .. * keygen.c (save_unprotected_key_to_card): .. new function. (gen_card_key_with_backup): New. (generate_raw_key): New. (generate_keypair): New arg BACKUP_ENCRYPTION_DIR. Changed all callers. (do_generate_keypair): Divert to gen_card_key_with_backup when desired.
2004-09-23 21:34:45 +02:00
generate_keypair(NULL, NULL, NULL);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
}
initially checkin
1997-11-18 15:06:00 +01:00
break;
some random changes
1998-10-25 20:00:01 +01:00
case aFastImport:
* options.h, export.c (parse_export_options, do_export_stream), import.c (parse_import_options, import_keys_internal): Make the import-options and export-options distinct since they can be mixed together as part of keyserver-options.
2004-11-26 16:51:37 +01:00
opt.import_options |= IMPORT_FAST;
added some trust model stuff
1998-01-16 22:15:24 +01:00
case aImport:
added fast-import to import-options
2002-09-23 15:03:52 +02:00
import_keys( argc? argv:NULL, argc, NULL, opt.import_options );
added some trust model stuff
1998-01-16 22:15:24 +01:00
break;
* getkey.c (parse_auto_key_locate): Fix dupe-removal code. * keyedit.c (menu_backsign): Allow backsigning even if the secret subkey doesn't have a binding signature. * armor.c (radix64_read): Don't report EOF when reading only a pad (=) character. The EOF actually starts after the pad. * gpg.c (main): Make --export, --send-keys, --recv-keys, --refresh-keys, and --fetch-keys follow their arguments from left to right. Suggested by Peter Palfrader.
2006-04-09 05:34:09 +02: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. */
added initial i18n stuff
1998-01-26 23:09:01 +01:00
case aExport:
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 19:37:41 +01:00
case aSendKeys:
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
1999-03-20 11:53:39 +01:00
case aRecvKeys:
added initial i18n stuff
1998-01-26 23:09:01 +01:00
sl = NULL;
for( ; argc; argc--, argv++ )
* getkey.c (parse_auto_key_locate): Fix dupe-removal code. * keyedit.c (menu_backsign): Allow backsigning even if the secret subkey doesn't have a binding signature. * armor.c (radix64_read): Don't report EOF when reading only a pad (=) character. The EOF actually starts after the pad. * gpg.c (main): Make --export, --send-keys, --recv-keys, --refresh-keys, and --fetch-keys follow their arguments from left to right. Suggested by Peter Palfrader.
2006-04-09 05:34:09 +02:00
append_to_strlist2( &sl, *argv, utf8_strings );
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 19:37:41 +01:00
if( cmd == aSendKeys )
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
rc=keyserver_export( sl );
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
1999-03-20 11:53:39 +01:00
else if( cmd == aRecvKeys )
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
rc=keyserver_import( sl );
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 19:37:41 +01:00
else
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
rc=export_pubkeys( sl, opt.export_options );
if(rc)
{
if(cmd==aSendKeys)
log_error(_("keyserver send failed: %s\n"),g10_errstr(rc));
else if(cmd==aRecvKeys)
log_error(_("keyserver receive failed: %s\n"),g10_errstr(rc));
else
log_error(_("key export failed: %s\n"),g10_errstr(rc));
}
added initial i18n stuff
1998-01-26 23:09:01 +01:00
free_strlist(sl);
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case aSearchKeys:
sl = NULL;
for( ; argc; argc--, argv++ )
append_to_strlist2( &sl, *argv, utf8_strings );
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
rc=keyserver_search( sl );
if(rc)
log_error(_("keyserver search failed: %s\n"),g10_errstr(rc));
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
free_strlist(sl);
break;
case aRefreshKeys:
sl = NULL;
for( ; argc; argc--, argv++ )
* getkey.c (parse_auto_key_locate): Fix dupe-removal code. * keyedit.c (menu_backsign): Allow backsigning even if the secret subkey doesn't have a binding signature. * armor.c (radix64_read): Don't report EOF when reading only a pad (=) character. The EOF actually starts after the pad. * gpg.c (main): Make --export, --send-keys, --recv-keys, --refresh-keys, and --fetch-keys follow their arguments from left to right. Suggested by Peter Palfrader.
2006-04-09 05:34:09 +02:00
append_to_strlist2( &sl, *argv, utf8_strings );
* packet.h, build-packet.c (build_sig_subpkt), export.c (do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old sig cache subpacket. This wasn't completely harmless as it caused subpacket 101 to disappear on import and export. * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c, encode.c, getkey.c, revoke.c: The current flags for different levels of PGP-ness are massively complex. This is step one in simplifying them. No functional change yet, just use a macro to check for compliance level. * sign.c (sign_file): Fix bug that causes spurious compression preference warning. * sign.c (clearsign_file): Fix bug that prevents proper warning message from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key. * main.h, misc.c (compliance_option_string, compliance_string, compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file, clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New functions to put the "this message may not be usable...." warning in one place. * options.h, g10.c (main): Part two of the simplification. Use a single enum to indicate what we are compliant to (1991, 2440, PGPx, etc.) * g10.c (main): Show errors for failure in export, send-keys, recv-keys, and refresh-keys. * options.h, g10.c (main): Give algorithm warnings for algorithms chosen against the --pgpX and --openpgp rules. * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp mode. * sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of 0.
2003-05-03 06:07:45 +02:00
rc=keyserver_refresh(sl);
if(rc)
log_error(_("keyserver refresh failed: %s\n"),g10_errstr(rc));
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
free_strlist(sl);
break;
* keyserver.c (keyserver_spawn): Don't print "searching for key 00000000" when fetching a URI. * keyserver-internal.h, keyserver.c (keyserver_fetch): New. Fetch an arbitrary URI using the keyserver helpers. * gpg.c (main): Call it from here for --fetch-keys.
2005-12-07 23:34:11 +01:00
case aFetchKeys:
sl = NULL;
for( ; argc; argc--, argv++ )
* getkey.c (parse_auto_key_locate): Fix dupe-removal code. * keyedit.c (menu_backsign): Allow backsigning even if the secret subkey doesn't have a binding signature. * armor.c (radix64_read): Don't report EOF when reading only a pad (=) character. The EOF actually starts after the pad. * gpg.c (main): Make --export, --send-keys, --recv-keys, --refresh-keys, and --fetch-keys follow their arguments from left to right. Suggested by Peter Palfrader.
2006-04-09 05:34:09 +02:00
append_to_strlist2( &sl, *argv, utf8_strings );
* keyserver.c (keyserver_spawn): Don't print "searching for key 00000000" when fetching a URI. * keyserver-internal.h, keyserver.c (keyserver_fetch): New. Fetch an arbitrary URI using the keyserver helpers. * gpg.c (main): Call it from here for --fetch-keys.
2005-12-07 23:34:11 +01:00
rc=keyserver_fetch(sl);
if(rc)
log_error("key fetch failed: %s\n",g10_errstr(rc));
free_strlist(sl);
break;
textual changes
1998-06-29 14:30:57 +02:00
case aExportSecret:
sl = NULL;
for( ; argc; argc--, argv++ )
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 14:57:54 +02:00
add_to_strlist2( &sl, *argv, utf8_strings );
textual changes
1998-06-29 14:30:57 +02:00
export_seckeys( sl );
free_strlist(sl);
break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
case aExportSecretSub:
sl = NULL;
for( ; argc; argc--, argv++ )
add_to_strlist2( &sl, *argv, utf8_strings );
export_secsubkeys( sl );
free_strlist(sl);
break;
some import functionality
1998-02-16 21:05:02 +01:00
case aGenRevoke:
if( argc != 1 )
wrong_args("--gen-revoke user-id");
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 14:57:54 +02:00
username = make_username(*argv);
gen_revoke( username );
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree( username );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
case aDesigRevoke:
if( argc != 1 )
wrong_args("--desig-revoke user-id");
username = make_username(*argv);
* free-packet.c (copy_secret_key): Copy secret key into secure memory since we may unprotect it. * main.h, g10.c (main), revoke.c (gen_desig_revoke): Add local user support so users can use -u with --desig-revoke. This bypasses the interactive walk over the revocation keys.
2005-11-19 06:55:45 +01:00
gen_desig_revoke( username, locusr );
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree( username );
some import functionality
1998-02-16 21:05:02 +01:00
break;
removed g10maint.c
1998-03-05 10:22:13 +01:00
case aDeArmor:
if( argc > 1 )
wrong_args("--dearmor [file]");
rc = dearmor_file( argc? *argv: NULL );
if( rc )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
log_error(_("dearmoring failed: %s\n"), g10_errstr(rc));
removed g10maint.c
1998-03-05 10:22:13 +01:00
break;
case aEnArmor:
if( argc > 1 )
wrong_args("--enarmor [file]");
rc = enarmor_file( argc? *argv: NULL );
if( rc )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
log_error(_("enarmoring failed: %s\n"), g10_errstr(rc));
removed g10maint.c
1998-03-05 10:22:13 +01:00
break;
case aPrimegen:
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
{ int mode = argc < 2 ? 0 : atoi(*argv);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
if( mode == 1 && argc == 2 ) {
mpi_print( stdout, generate_public_prime( atoi(argv[1]) ), 1);
}
else if( mode == 2 && argc == 3 ) {
mpi_print( stdout, generate_elg_prime(
0, atoi(argv[1]),
atoi(argv[2]), NULL,NULL ), 1);
}
else if( mode == 3 && argc == 3 ) {
MPI *factors;
mpi_print( stdout, generate_elg_prime(
1, atoi(argv[1]),
atoi(argv[2]), NULL,&factors ), 1);
putchar('\n');
mpi_print( stdout, factors[0], 1 ); /* print q */
}
else if( mode == 4 && argc == 3 ) {
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
MPI g = mpi_alloc(1);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
mpi_print( stdout, generate_elg_prime(
0, atoi(argv[1]),
atoi(argv[2]), g, NULL ), 1);
putchar('\n');
mpi_print( stdout, g, 1 );
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
mpi_free(g);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
}
else
wrong_args("--gen-prime mode bits [qbits] ");
add DSA key generation
1998-05-05 22:34:20 +02:00
putchar('\n');
}
removed g10maint.c
1998-03-05 10:22:13 +01:00
break;
case aGenRandom:
{
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
int level = argc ? atoi(*argv):0;
int count = argc > 1 ? atoi(argv[1]): 0;
int endless = !count;
if( argc < 1 || argc > 2 || level < 0 || level > 2 || count < 0 )
wrong_args("--gen-random 0|1|2 [count]");
while( endless || count ) {
Some experimental support for other random gatheres
1998-11-25 12:55:58 +01:00
byte *p;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
/* Wee 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 levae this to
other tools */
size_t n = !endless && count < 99? count : 99;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
p = get_random_bits( n*8, level, 0);
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#ifdef HAVE_DOSISH_SYSTEM
See ChangeLog: Fri Jul 28 18:19:11 CEST 2000 Werner Koch
2000-07-28 18:19:07 +02:00
setmode ( fileno(stdout), O_BINARY );
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#endif
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if (opt.armor) {
char *tmp = make_radix64_string (p, n);
fputs (tmp, stdout);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree (tmp);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if (n%3 == 1)
putchar ('=');
if (n%3)
putchar ('=');
} else {
fwrite( p, n, 1, stdout );
}
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(p);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
if( !endless )
count -= n;
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
if (opt.armor)
putchar ('\n');
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
break;
new release
1998-05-15 20:49:19 +02:00
case aPrintMD:
if( argc < 1)
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
wrong_args("--print-md algo [files]");
{
int all_algos = (**argv=='*' && !(*argv)[1]);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
int algo = all_algos? 0 : string_to_digest_algo(*argv);
See ChangeLog: Fri Mar 24 11:25:45 CET 2000 Werner Koch
2000-03-24 11:19:50 +01:00
if( !algo && !all_algos )
log_error(_("invalid hash algorithm `%s'\n"), *argv );
else {
argc--; argv++;
if( !argc )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
print_mds(NULL, algo);
See ChangeLog: Fri Mar 24 11:25:45 CET 2000 Werner Koch
2000-03-24 11:19:50 +01:00
else {
for(; argc; argc--, argv++ )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
print_mds(*argv, algo);
new release
1998-05-15 20:49:19 +02:00
}
}
}
break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 17:41:14 +02:00
case aPrintMDs: /* old option */
removed g10maint.c
1998-03-05 10:22:13 +01:00
if( !argc )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
print_mds(NULL,0);
removed g10maint.c
1998-03-05 10:22:13 +01:00
else {
for(; argc; argc--, argv++ )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
print_mds(*argv,0);
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
break;
case aListTrustDB:
if( !argc )
list_trustdb(NULL);
else {
for( ; argc; argc--, argv++ )
list_trustdb( *argv );
}
break;
last local commit
1998-10-16 18:00:17 +02:00
case aUpdateTrustDB:
if( argc )
wrong_args("--update-trustdb");
update_trustdb();
break;
changed trustdb design
1998-07-21 14:53:38 +02:00
case aCheckTrustDB:
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
/* Old versions allowed for arguments - ignore them */
check_trustdb();
changed trustdb design
1998-07-21 14:53:38 +02:00
break;
a new release
1998-10-07 15:30:43 +02:00
case aFixTrustDB:
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
log_error("this command is not yet implemented.\n");
a new release
1998-10-07 15:30:43 +02:00
log_error("A workaround is to use \"--export-ownertrust\", remove\n");
log_error("the trustdb file and do an \"--import-ownertrust\".\n" );
break;
removed g10maint.c
1998-03-05 10:22:13 +01:00
case aListTrustPath:
some bug fixes
1998-11-18 20:59:06 +01:00
if( !argc )
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 18:49:22 +02:00
wrong_args("--list-trust-path <user-ids>");
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 14:57:54 +02:00
for( ; argc; argc--, argv++ ) {
username = make_username( *argv );
list_trust_path( username );
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(username);
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 14:57:54 +02:00
}
removed g10maint.c
1998-03-05 10:22:13 +01:00
break;
edit-key is now complete
1998-07-29 21:35:05 +02:00
case aExportOwnerTrust:
intermediate release
1998-07-06 12:23:57 +02:00
if( argc )
edit-key is now complete
1998-07-29 21:35:05 +02:00
wrong_args("--export-ownertrust");
export_ownertrust();
break;
case aImportOwnerTrust:
if( argc > 1 )
wrong_args("--import-ownertrust [file]");
import_ownertrust( argc? *argv:NULL );
intermediate release
1998-07-06 12:23:57 +02:00
break;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
case aPipeMode:
if ( argc )
wrong_args ("--pipemode");
run_in_pipemode ();
break;
case aRebuildKeydbCaches:
if (argc)
wrong_args ("--rebuild-keydb-caches");
* g10.c (main), keydb.h, keydb.c (keydb_rebuild_caches), keyring.h, keyring.c (keyring_rebuild_cache): Add "noisy" flag so cache rebuilds can remain noisy when called for itself, and quiet when called as part of the trustdb rebuild. * trustdb.c (validate_keys): Rebuild the sig caches before building the trustdb. Note that this is going to require some architectual re-thinking, as it is agonizingly slow.
2004-01-20 17:09:38 +01:00
keydb_rebuild_caches (1);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
break;
removed g10maint.c
1998-03-05 10:22:13 +01:00
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
#ifdef ENABLE_CARD_SUPPORT
case aCardStatus:
if (argc)
wrong_args ("--card-status");
* passphrase.c (ask_passphrase): Add optional promptid arg. Changed all callers. * cardglue.c (pin_cb): Use it here, so the machine interface can tell whether the Admin PIN is requested. * cardglue.c (agent_scd_checkpin): New. * misc.c (openpgp_pk_algo_usage): Added AUTH usage. * app-openpgp.c (check_against_given_fingerprint): New. Factored out that code elsewhere. (do_check_pin): New. * card-util.c (card_edit): New command "passwd". Add logic to check the PIN in advance. (card_status): Add new args to return the serial number. Changed all callers.
2003-10-21 20:22:21 +02:00
card_status (stdout, NULL, 0);
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
break;
case aCardEdit:
if (argc) {
sl = NULL;
for (argc--, argv++ ; argc; argc--, argv++)
append_to_strlist (&sl, *argv);
card_edit (sl);
free_strlist (sl);
}
else
card_edit (NULL);
break;
case aChangePIN:
if (!argc)
* main.h, g10.c (main), card-util.c (change_pin): If "admin" has not been issued, skip right to the CHV1/CHV2 PIN change. No need to show the unblock or admin PIN change option. (card_edit): Add "admin" command to add admin commands to the menu. Do not allow admin commands until "admin" is given. * app-openpgp.c (verify_chv3): Show a countdown of how many wrong admin PINs can be entered before the card is locked. * options.h, g10.c (main), app-openpgp.c (verify_chv3): Remove --allow-admin.
2004-09-25 15:04:55 +02:00
change_pin (0,1);
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
else if (argc == 1)
* main.h, g10.c (main), card-util.c (change_pin): If "admin" has not been issued, skip right to the CHV1/CHV2 PIN change. No need to show the unblock or admin PIN change option. (card_edit): Add "admin" command to add admin commands to the menu. Do not allow admin commands until "admin" is given. * app-openpgp.c (verify_chv3): Show a countdown of how many wrong admin PINs can be entered before the card is locked. * options.h, g10.c (main), app-openpgp.c (verify_chv3): Remove --allow-admin.
2004-09-25 15:04:55 +02:00
change_pin (atoi (*argv),1);
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
else
wrong_args ("--change-pin [no]");
break;
#endif /* ENABLE_CARD_SUPPORT*/
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
case aListConfig:
{
char *str=collapse_args(argc,argv);
list_config(str);
Converted all m_free to xfree etc.
2005-07-27 20:10:56 +02:00
xfree(str);
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
break;
* g10.c (main): New commands --card-edit, --card-status and --change-pin. New options --ctapi-driver, --pcsc-driver and --disable-ccid * options.h (DBG_CARD_IO): New. * cardglue.c, cardclue.h: Enhanced. * card-util.c: New. Taken from current the gnupg 1.9 branch. * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c * apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current gnupg 1.9 branch withy minor changes to include directives. * Makefile.am: Added these files.
2003-09-28 15:41:58 +02:00
added more stuff
1998-01-02 21:40:10 +01:00
case aListPackets:
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
opt.list_packets=2;
initially checkin
1997-11-18 15:06:00 +01:00
default:
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 19:54:31 +01:00
wrong_args(_("[filename]"));
Some bug fixes of the last release
1998-11-10 13:59:59 +01:00
/* Issue some output for the unix newbie */
if( !fname && !opt.outfile && isatty( fileno(stdin) )
&& isatty( fileno(stdout) ) && isatty( fileno(stderr) ) )
log_info(_("Go ahead and type your message ...\n"));
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
a = iobuf_open(fname);
if (a && is_secured_file (iobuf_get_fd (a)))
{
iobuf_close (a);
a = NULL;
errno = EPERM;
}
if( !a )
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
1998-12-29 14:47:31 +01:00
log_error(_("can't open `%s'\n"), print_fname_stdin(fname));
added option export
1998-02-13 21:58:50 +01:00
else {
Some bug fixes of the last release
1998-11-10 13:59:59 +01:00
added option export
1998-02-13 21:58:50 +01:00
if( !opt.no_armor ) {
some import functionality
1998-02-16 21:05:02 +01:00
if( use_armor_filter( a ) ) {
memset( &afx, 0, sizeof afx);
iobuf_push_filter( a, armor_filter, &afx );
}
added option export
1998-02-13 21:58:50 +01:00
}
if( cmd == aListPackets ) {
set_packet_list_mode(1);
opt.list_packets=1;
}
See ChangeLog: Thu May 6 14:18:17 CEST 1999 Werner Koch
1999-05-06 14:26:10 +02:00
rc = proc_packets(NULL, a );
if( rc )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
log_error("processing message failed: %s\n", g10_errstr(rc) );
added option export
1998-02-13 21:58:50 +01:00
iobuf_close(a);
added more stuff
1998-01-02 21:40:10 +01:00
}
initially checkin
1997-11-18 15:06:00 +01:00
break;
* g10.c (list_config): New function to dump config options to stdout. Currently requires --with-colons. (collapse_args): New function to turn argc/argv into a single string. (main): Use it here to pass list_config() more than one argument as a single string. (print_algo_numbers): Helper to print algorithm number for --list-config "pubkey", "cipher", "hash"/"digest", and "compress" config options.
2004-01-22 04:47:05 +01:00
}
initially checkin
1997-11-18 15:06:00 +01:00
/* cleanup */
FREE_STRLIST(remusr);
IDEA removed, signing works
1997-11-24 12:04:11 +01:00
FREE_STRLIST(locusr);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_exit(0);
add-key works
1998-05-26 15:38:00 +02:00
return 8; /*NEVER REACHED*/
version 0.2.1
1998-01-28 17:09:43 +01:00
}
void
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_exit( int rc )
version 0.2.1
1998-01-28 17:09:43 +01:00
{
* cardglue.c (card_close): New. * ccid-driver.c (ccid_close_reader): New. * apdu.c (close_ccid_reader, close_ct_reader, close_csc_reader) (close_osc_reader, apdu_close_reader): New. Not all are properly implemented yet. * g10.c (g10_exit): Use close_card.
2003-10-10 17:12:02 +02:00
#ifdef ENABLE_CARD_SUPPORT
card_close ();
#endif
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 19:34:53 +02:00
update_random_seed_file();
See ChangeLog: Fri Jul 2 11:45:54 CEST 1999 Werner Koch
1999-07-02 11:50:57 +02:00
if( opt.debug & DBG_MEMSTAT_VALUE ) {
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
m_print_stats("on exit");
random_dump_stats();
See ChangeLog: Fri Jul 2 11:45:54 CEST 1999 Werner Koch
1999-07-02 11:50:57 +02:00
}
a couple of changes; but some parts are now broken
1998-02-11 04:25:44 +01:00
if( opt.debug )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
secmem_dump_stats();
secmem_term();
Some bug fixes of the last release
1998-11-10 13:59:59 +01:00
rc = rc? rc : log_get_errorcount(0)? 2 :
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
g10_errors_seen? 1 : 0;
*** empty log message ***
1998-01-30 17:23:16 +01:00
exit(rc );
initially checkin
1997-11-18 15:06:00 +01:00
}
intermediate release
1998-07-06 12:23:57 +02:00
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01: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. */
removed g10maint.c
1998-03-05 10:22:13 +01:00
static void
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
print_hex( MD_HANDLE md, int algo, const char *fname )
removed g10maint.c
1998-03-05 10:22:13 +01:00
{
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
int i,n,count,indent=0;
const byte *p;
removed g10maint.c
1998-03-05 10:22:13 +01:00
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
if(fname)
indent=printf("%s: ",fname);
if(indent>40)
{
printf("\n");
indent=0;
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
if(algo==DIGEST_ALGO_RMD160)
indent+=printf("RMD160 = ");
else if(algo>0)
indent+=printf("%6s = ",digest_algo_to_string(algo));
else
algo=abs(algo);
count=indent;
p = md_read( md, algo );
n = md_digest_length(algo);
count+=printf("%02X",*p++);
for(i=1;i<n;i++,p++)
{
if(n==16)
{
if(count+2>79)
{
printf("\n%*s",indent," ");
count=indent;
}
else
count+=printf(" ");
if(!(i%8))
count+=printf(" ");
*** empty log message ***
1998-04-30 16:06:01 +02:00
}
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
else if (n==20)
{
if(!(i%2))
{
if(count+4>79)
{
printf("\n%*s",indent," ");
count=indent;
}
else
count+=printf(" ");
}
if(!(i%10))
count+=printf(" ");
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
else
{
if(!(i%4))
{
if(count+8>79)
{
printf("\n%*s",indent," ");
count=indent;
}
else
count+=printf(" ");
}
}
count+=printf("%02X",*p);
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
printf("\n");
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
static void
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
print_hashline( MD_HANDLE md, int algo, const char *fname )
{
int i, n;
const byte *p;
if ( fname ) {
for (p = fname; *p; p++ ) {
if ( *p <= 32 || *p > 127 || *p == ':' || *p == '%' )
printf("%%%02X", *p );
else
putchar( *p );
}
}
putchar(':');
printf("%d:", algo );
p = md_read( md, algo );
n = md_digest_length(algo);
for(i=0; i < n ; i++, p++ )
printf("%02X", *p );
putchar(':');
putchar('\n');
}
static void
print_mds( const char *fname, int algo )
removed g10maint.c
1998-03-05 10:22:13 +01:00
{
FILE *fp;
char buf[1024];
size_t n;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
MD_HANDLE md;
removed g10maint.c
1998-03-05 10:22:13 +01:00
if( !fname ) {
fp = stdin;
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#ifdef HAVE_DOSISH_SYSTEM
See ChangeLog: Fri Jul 28 18:19:11 CEST 2000 Werner Koch
2000-07-28 18:19:07 +02:00
setmode ( fileno(fp) , O_BINARY );
* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit all preprocessor instructions to remove whitespace before the '#'. This is not required by C89, but there are some compilers out there that don't like it.
2003-05-24 23:50:33 +02:00
#endif
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
new release
1998-05-15 20:49:19 +02:00
else {
removed g10maint.c
1998-03-05 10:22:13 +01:00
fp = fopen( fname, "rb" );
Added SELInux hacks and did some cleanups.
2004-10-13 20:10:06 +02:00
if (fp && is_secured_file (fileno (fp)))
{
fclose (fp);
fp = NULL;
errno = EPERM;
}
new release
1998-05-15 20:49:19 +02:00
}
removed g10maint.c
1998-03-05 10:22:13 +01:00
if( !fp ) {
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
log_error("%s: %s\n", fname?fname:"[stdin]", strerror(errno) );
removed g10maint.c
1998-03-05 10:22:13 +01:00
return;
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
md = md_open( 0, 0 );
new release
1998-05-15 20:49:19 +02:00
if( algo )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
md_enable( md, algo );
new release
1998-05-15 20:49:19 +02:00
else {
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
md_enable( md, DIGEST_ALGO_MD5 );
md_enable( md, DIGEST_ALGO_SHA1 );
md_enable( md, DIGEST_ALGO_RMD160 );
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
#ifdef USE_SHA256
* gpg.c (print_mds), armor.c (armor_filter, parse_hash_header): Add SHA-224. * sign.c (write_plaintext_packet), encode.c (encode_simple): Factor common literal packet setup code from here, to... * main.h, plaintext.c (setup_plaintext_name): Here. New. Make sure the literal packet filename field is UTF-8 encoded. * options.h, gpg.c (main): Make sure --set-filename is UTF-8 encoded and note when filenames are already UTF-8.
2006-04-20 04:36:05 +02:00
md_enable( md, DIGEST_ALGO_SHA224 );
* armor.c (parse_hash_header, armor_filter): Accept the new SHAs in the armor Hash: header. * g10.c (print_hex): Print long hash strings a little neater. (print_mds): Add the new SHAs to the hash list.
2003-02-04 20:33:09 +01:00
md_enable( md, DIGEST_ALGO_SHA256 );
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
#endif
#ifdef USE_SHA512
md_enable( md, DIGEST_ALGO_SHA384 );
md_enable( md, DIGEST_ALGO_SHA512 );
#endif
new release
1998-05-15 20:49:19 +02:00
}
removed g10maint.c
1998-03-05 10:22:13 +01:00
while( (n=fread( buf, 1, DIM(buf), fp )) )
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
md_write( md, buf, n );
removed g10maint.c
1998-03-05 10:22:13 +01:00
if( ferror(fp) )
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
log_error("%s: %s\n", fname?fname:"[stdin]", strerror(errno) );
removed g10maint.c
1998-03-05 10:22:13 +01:00
else {
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
md_final(md);
if ( opt.with_colons ) {
if ( algo )
print_hashline( md, algo, fname );
else {
print_hashline( md, DIGEST_ALGO_MD5, fname );
print_hashline( md, DIGEST_ALGO_SHA1, fname );
print_hashline( md, DIGEST_ALGO_RMD160, fname );
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
#ifdef USE_SHA256
* gpg.c (print_mds), armor.c (armor_filter, parse_hash_header): Add SHA-224. * sign.c (write_plaintext_packet), encode.c (encode_simple): Factor common literal packet setup code from here, to... * main.h, plaintext.c (setup_plaintext_name): Here. New. Make sure the literal packet filename field is UTF-8 encoded. * options.h, gpg.c (main): Make sure --set-filename is UTF-8 encoded and note when filenames are already UTF-8.
2006-04-20 04:36:05 +02:00
print_hashline( md, DIGEST_ALGO_SHA224, fname );
* armor.c (parse_hash_header, armor_filter): Accept the new SHAs in the armor Hash: header. * g10.c (print_hex): Print long hash strings a little neater. (print_mds): Add the new SHAs to the hash list.
2003-02-04 20:33:09 +01:00
print_hashline( md, DIGEST_ALGO_SHA256, fname );
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
#endif
#ifdef USE_SHA512
print_hashline( md, DIGEST_ALGO_SHA384, fname );
print_hashline( md, DIGEST_ALGO_SHA512, fname );
#endif
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
}
}
else {
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
if( algo )
print_hex(md,-algo,fname);
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
else {
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
print_hex( md, DIGEST_ALGO_MD5, fname );
print_hex( md, DIGEST_ALGO_SHA1, fname );
print_hex( md, DIGEST_ALGO_RMD160, fname );
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
#ifdef USE_SHA256
* gpg.c (print_mds), armor.c (armor_filter, parse_hash_header): Add SHA-224. * sign.c (write_plaintext_packet), encode.c (encode_simple): Factor common literal packet setup code from here, to... * main.h, plaintext.c (setup_plaintext_name): Here. New. Make sure the literal packet filename field is UTF-8 encoded. * options.h, gpg.c (main): Make sure --set-filename is UTF-8 encoded and note when filenames are already UTF-8.
2006-04-20 04:36:05 +02:00
print_hex( md, DIGEST_ALGO_SHA224, fname );
* exec.c (set_exec_path): Add debugging line. * g10.c (print_hex, print_mds): Print long hash strings a lot neater. This assumes at least an 80-character display, as there are a few other similar assumptions here and there. Users who need unformatted hashes can still use with-colons. Check that SHA384 and 512 are available before using them as they are no longer always available.
2003-02-12 06:18:26 +01:00
print_hex( md, DIGEST_ALGO_SHA256, fname );
* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5 support. Use 3DES for the s2k cipher in --openpgp mode. (print_mds): #ifdef all of the optional digest algorithms.
2003-02-21 21:43:17 +01:00
#endif
#ifdef USE_SHA512
print_hex( md, DIGEST_ALGO_SHA384, fname );
print_hex( md, DIGEST_ALGO_SHA512, fname );
#endif
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
}
}
removed g10maint.c
1998-03-05 10:22:13 +01:00
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
md_close(md);
removed g10maint.c
1998-03-05 10:22:13 +01:00
if( fp != stdin )
fclose(fp);
}
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 19:56:15 +02:00
/****************
* Check the supplied name,value string and add it to the notation
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
* data to be used for signatures. which==0 for sig notations, and 1
* for cert notations.
*/
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 19:56:15 +02:00
static void
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
add_notation_data( const char *string, int which )
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 19:56:15 +02:00
{
* options.h, sign.c (mk_notation_policy_etc), gpg.c (add_notation_data): Use it here for the various notation commands. * packet.h, main.h, keygen.c (keygen_add_notations), build-packet.c (string_to_notation, sig_to_notation) (free_notation): New "one stop shopping" functions to handle notations and start removing some code duplication.
2006-03-09 00:30:12 +01:00
struct notation *notation;
* g10.c (add_notation_data): Disallow notation names that do not contain a '@', unless --expert is set. This is to help prevent people from polluting the (as yet unused) IETF namespace. * main.h: Comments about default algorithms. * photoid.c (image_type_to_string): Comments about 3-letter file extensions.
2002-11-24 02:49:32 +01:00
* options.h, sign.c (mk_notation_policy_etc), gpg.c (add_notation_data): Use it here for the various notation commands. * packet.h, main.h, keygen.c (keygen_add_notations), build-packet.c (string_to_notation, sig_to_notation) (free_notation): New "one stop shopping" functions to handle notations and start removing some code duplication.
2006-03-09 00:30:12 +01: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;
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 19:56:15 +02:00
}
}
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 14:41:46 +02:00
}
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
static void
add_policy_url( const char *string, int which )
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 14:41:46 +02:00
{
* options.h, mainproc.c (symkey_decrypt_seskey), keyserver.c (struct keyrec, parse_keyrec, keyserver_search_prompt), keyedit.c (keyedit_menu), g10.c (add_keyserver_url, add_policy_url): Fix some compiler warnings.
2004-05-10 23:46:00 +02:00
unsigned int i,critical=0;
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
STRLIST sl;
if(*string=='!')
{
string++;
critical=1;
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 14:41:46 +02:00
}
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 19:56:15 +02:00
Update head to match stable 1.0
2002-06-29 15:46:34 +02:00
for(i=0;i<strlen(string);i++)
* g10.c (main, add_notation_data, add_policy_url) (add_keyserver_url): Use isascii() to protect the isfoo macros and to replace direct tests. Possible problems noted by Christian Biere. * keyserver.c (parse_keyserver_uri): Ditto. * g10.c (main): Declare --pipemode deprecated. * misc.c (deprecated_command): New.
2005-04-11 20:24:09 +02:00
if( !isascii (string[i]) || iscntrl(string[i]))
Update head to match stable 1.0
2002-06-29 15:46:34 +02: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)
sl->flags |= 1;
}
* options.h, g10.c (main, add_keyserver_url): Add --sig-preferred-keyserver to implant a "where to get my key" subpacket into a signature. * sign.c (mk_notation_and_policy): Rename to mk_notation_policy_etc and add preferred keyserver support for signatures.
2003-07-24 21:28:12 +02:00
static void
add_keyserver_url( const char *string, int which )
{
* options.h, mainproc.c (symkey_decrypt_seskey), keyserver.c (struct keyrec, parse_keyrec, keyserver_search_prompt), keyedit.c (keyedit_menu), g10.c (add_keyserver_url, add_policy_url): Fix some compiler warnings.
2004-05-10 23:46:00 +02:00
unsigned int i,critical=0;
* options.h, g10.c (main, add_keyserver_url): Add --sig-preferred-keyserver to implant a "where to get my key" subpacket into a signature. * sign.c (mk_notation_and_policy): Rename to mk_notation_policy_etc and add preferred keyserver support for signatures.
2003-07-24 21:28:12 +02:00
STRLIST sl;
if(*string=='!')
{
string++;
critical=1;
}
for(i=0;i<strlen(string);i++)
* g10.c (main, add_notation_data, add_policy_url) (add_keyserver_url): Use isascii() to protect the isfoo macros and to replace direct tests. Possible problems noted by Christian Biere. * keyserver.c (parse_keyserver_uri): Ditto. * g10.c (main): Declare --pipemode deprecated. * misc.c (deprecated_command): New.
2005-04-11 20:24:09 +02:00
if( !isascii (string[i]) || iscntrl(string[i]))
* options.h, g10.c (main, add_keyserver_url): Add --sig-preferred-keyserver to implant a "where to get my key" subpacket into a signature. * sign.c (mk_notation_and_policy): Rename to mk_notation_policy_etc and add preferred keyserver support for signatures.
2003-07-24 21:28:12 +02:00
break;
if(i==0 || i<strlen(string))
{
if(which)
BUG();
else
* encode.c, exec.c, g10.c, sign.c: Some translatable string cleanup. Change some "this" to `this'.
2004-08-27 19:32:31 +02:00
log_error(_("the given preferred keyserver URL is invalid\n"));
* options.h, g10.c (main, add_keyserver_url): Add --sig-preferred-keyserver to implant a "where to get my key" subpacket into a signature. * sign.c (mk_notation_and_policy): Rename to mk_notation_policy_etc and add preferred keyserver support for signatures.
2003-07-24 21:28:12 +02:00
}
if(which)
BUG();
else
sl=add_to_strlist( &opt.sig_keyserver_url, string );
if(critical)
sl->flags |= 1;
}
Copy Permalink