security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-24 10:39:57 +01:00
Code Activity
gnupg/g10/g10.c

2750 lines
83 KiB
C
Raw Normal View History

Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
/* g10.c - The GnuPG utility (main for gpg)
* Copyright (C) 1998,1999,2000,2001,2002 Free Software Foundation, Inc.
initially checkin
1997-11-18 14:06:00 +00:00
*
See ChangeLog: Wed Dec 23 13:34:22 CET 1998 Werner Koch
1998-12-23 12:41:40 +00:00
* This file is part of GnuPG.
initially checkin
1997-11-18 14:06:00 +00:00
*
See ChangeLog: Wed Dec 23 13:34:22 CET 1998 Werner Koch
1998-12-23 12:41:40 +00:00
* GnuPG is free software; you can redistribute it and/or modify
initially checkin
1997-11-18 14:06:00 +00: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 12:41:40 +00:00
* GnuPG is distributed in the hope that it will be useful,
initially checkin
1997-11-18 14:06:00 +00: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
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#include <config.h>
added option file handling
1997-12-12 12:03:58 +00:00
#include <errno.h>
initially checkin
1997-11-18 14:06:00 +00:00
#include <stdio.h>
#include <stdlib.h>
added some trust model stuff
1998-01-16 21:15:24 +00:00
#include <string.h>
See ChangeLog: Tue Dec 8 13:15:16 CET 1998 Werner Koch
1998-12-08 12:20:53 +00:00
#include <ctype.h>
List and check sigs works
1997-12-01 10:33:23 +00:00
#include <unistd.h>
See ChangeLog: Fri Jul 28 18:19:11 CEST 2000 Werner Koch
2000-07-28 16:19:07 +00:00
#ifdef HAVE_DOSISH_SYSTEM
#include <fcntl.h> /* for setmode() */
#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 15:53:15 +00:00
#ifdef HAVE_STAT
#include <sys/stat.h> /* for stat() */
#endif
initially checkin
1997-11-18 14:06:00 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#define INCLUDED_BY_MAIN_MODULE 1
initially checkin
1997-11-18 14:06:00 +00:00
#include "packet.h"
#include "iobuf.h"
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#include "memory.h"
initially checkin
1997-11-18 14:06:00 +00: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 15:42:06 +00:00
#include "trustdb.h"
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#include "mpi.h"
#include "cipher.h"
Armor works now
1997-11-21 14:53:57 +00:00
#include "filter.h"
added some trust model stuff
1998-01-16 21:15:24 +00:00
#include "ttyio.h"
added initial i18n stuff
1998-01-26 22:09:01 +00:00
#include "i18n.h"
*** empty log message ***
1998-01-30 16:23:16 +00:00
#include "status.h"
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#include "g10defs.h"
#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 04:01:21 +00:00
#include "exec.h"
initially checkin
1997-11-18 14:06:00 +00:00
bug fix release
1998-08-11 17:29:34 +00:00
enum cmd_and_opt_values { aNull = 0,
oArmor = 'a',
aDetachedSign = 'b',
aSym = 'c',
aDecrypt = 'd',
aEncr = 'e',
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
aEncrFiles,
See ChangeLog: Wed May 19 16:04:30 CEST 1999 Werner Koch
1999-05-19 14:12:26 +00:00
oInteractive = 'i',
bug fix release
1998-08-11 17:29:34 +00:00
oKOption = 'k',
oDryRun = 'n',
oOutput = 'o',
some random changes
1998-10-25 19:00:01 +00:00
oQuiet = 'q',
See ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch
1999-01-24 17:16:40 +00:00
oRecipient = 'r',
bug fix release
1998-08-11 17:29:34 +00:00
aSign = 's',
(Does not compile yet)
1998-11-03 19:38:58 +00:00
oTextmodeShort= 't',
bug fix release
1998-08-11 17:29:34 +00:00
oUser = 'u',
oVerbose = 'v',
oCompress = 'z',
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 17:56:15 +00:00
oNotation = 'N',
bug fix release
1998-08-11 17:29:34 +00:00
oBatch = 500,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oSigNotation,
oCertNotation,
oShowNotation,
oNoShowNotation,
aDecryptFiles,
*** empty log message ***
1998-09-11 05:47:32 +00:00
aClearsign,
bug fix release
1998-08-11 17:29:34 +00:00
aStore,
aKeygen,
aSignEncr,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
aSignSym,
bug fix release
1998-08-11 17:29:34 +00:00
aSignKey,
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
aLSignKey,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
aNRSignKey,
aNRLSignKey,
bug fix release
1998-08-11 17:29:34 +00:00
aListPackets,
aEditKey,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
aDeleteKeys,
aDeleteSecretKeys,
aDeleteSecretAndPublicKeys,
bug fix release
1998-08-11 17:29:34 +00:00
aKMode,
aKModeC,
aImport,
some random changes
1998-10-25 19:00:01 +00:00
aFastImport,
bug fix release
1998-08-11 17:29:34 +00:00
aVerify,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
aVerifyFiles,
bug fix release
1998-08-11 17:29:34 +00:00
aListKeys,
aListSigs,
aListSecretKeys,
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 18:37:41 +00:00
aSendKeys,
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
1999-03-20 10:53:39 +00:00
aRecvKeys,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
aSearchKeys,
bug fix release
1998-08-11 17:29:34 +00:00
aExport,
See ChangeLog: Thu Dec 10 20:15:36 CET 1998 Werner Koch
1998-12-10 19:20:47 +00:00
aExportAll,
bug fix release
1998-08-11 17:29:34 +00:00
aExportSecret,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
aExportSecretSub,
bug fix release
1998-08-11 17:29:34 +00:00
aCheckKeys,
aGenRevoke,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
aDesigRevoke,
bug fix release
1998-08-11 17:29:34 +00:00
aPrimegen,
aPrintMD,
aPrintMDs,
aCheckTrustDB,
last local commit
1998-10-16 16:00:17 +00:00
aUpdateTrustDB,
a new release
1998-10-07 13:30:43 +00:00
aFixTrustDB,
bug fix release
1998-08-11 17:29:34 +00:00
aListTrustDB,
aListTrustPath,
aExportOwnerTrust,
aImportOwnerTrust,
aDeArmor,
aEnArmor,
aGenRandom,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
aPipeMode,
aRebuildKeydbCaches,
aRefreshKeys,
*** empty log message ***
1998-09-11 05:47:32 +00:00
(Does not compile yet)
1998-11-03 19:38:58 +00:00
oTextmode,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oExpert,
oNoExpert,
oAskSigExpire,
oNoAskSigExpire,
oAskCertExpire,
oNoAskCertExpire,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oFingerprint,
See ChangeLog: Thu Jul 8 16:21:27 CEST 1999 Werner Koch
1999-07-08 14:24:35 +00:00
oWithFingerprint,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oAnswerYes,
oAnswerNo,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oDefCertCheckLevel,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oKeyring,
oSecretKeyring,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oShowKeyring,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oDefaultKey,
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
oDefRecipient,
oDefRecipientSelf,
oNoDefRecipient,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oOptions,
oDebug,
oDebugAll,
oStatusFD,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
oStatusFile,
#endif /* __riscos__ */
oAttributeFD,
#ifdef __riscos__
oAttributeFile,
#endif /* __riscos__ */
oSKComments,
oNoSKComments,
See ChangeLog: Wed Feb 10 17:15:39 CET 1999 Werner Koch
1999-02-10 16:22:40 +00:00
oNoVersion,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
oEmitVersion,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oCompletesNeeded,
oMarginalsNeeded,
See ChangeLog ;-). Key validation should now be faster
1998-11-13 19:41:41 +00:00
oMaxCertDepth,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oLoadExtension,
oRFC1991,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
oOpenPGP,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oPGP2,
oNoPGP2,
oPGP6,
oNoPGP6,
oPGP7,
oNoPGP7,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oCipherAlgo,
oDigestAlgo,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oCertDigestAlgo,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oCompressAlgo,
oPasswdFD,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
oPasswdFile,
#endif /* __riscos__ */
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
oCommandFD,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
oCommandFile,
#endif /* __riscos__ */
oQuickRandom,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oNoVerbose,
oTrustDBName,
oNoSecmemWarn,
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 16:48:21 +00:00
oNoMDCWarn,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oNoArmor,
oNoDefKeyring,
oNoGreeting,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
oNoTTY,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oNoOptions,
oNoBatch,
oHomedir,
oWithColons,
See ChangeLog: Tue Jun 8 13:36:25 CEST 1999 Werner Koch
1999-06-08 11:41:46 +00:00
oWithKeyData,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oSkipVerify,
oCompressKeys,
oCompressSigs,
oAlwaysTrust,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oEmuChecksumBug,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oRunAsShmCP,
oSetFilename,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oForYourEyesOnly,
oNoForYourEyesOnly,
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 12:41:46 +00:00
oSetPolicyURL,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oSigPolicyURL,
oCertPolicyURL,
oShowPolicyURL,
oNoShowPolicyURL,
See ChangeLog: Tue Jun 1 16:01:46 CEST 1999 Werner Koch
1999-06-01 14:08:57 +00:00
oUseEmbeddedFilename,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oComment,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
oDefaultComment,
*** empty log message ***
1998-09-11 05:47:32 +00:00
oThrowKeyid,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oShowPhotos,
oNoShowPhotos,
oPhotoViewer,
Snapshot release 0.4.2
1998-10-18 15:21:22 +00:00
oForceV3Sigs,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oNoForceV3Sigs,
oForceV4Certs,
oNoForceV4Certs,
See ChangeLog: Mon Apr 26 17:48:15 CEST 1999 Werner Koch
1999-04-26 15:53:01 +00:00
oForceMDC,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oNoForceMDC,
oDisableMDC,
oNoDisableMDC,
*** empty log message ***
1998-09-28 19:25:31 +00:00
oS2KMode,
oS2KDigest,
oS2KCipher,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oSimpleSKChecksum,
Some bug fixes of the last release
1998-11-10 12:59:59 +00:00
oCharset,
Expiration time works (I hope so)
1998-11-20 17:42:18 +00:00
oNotDashEscaped,
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 17:36:05 +00:00
oEscapeFrom,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oNoEscapeFrom,
See ChangeLog: Fri Nov 27 21:37:41 CET 1998 Werner Koch
1998-11-27 20:40:56 +00:00
oLockOnce,
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
oLockMultiple,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
oLockNever,
See ChangeLog: Sat Jan 16 09:27:30 CET 1999 Werner Koch
1999-01-16 08:29:29 +00:00
oKeyServer,
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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-22 22:26:14 +00: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 19:07:21 +00:00
oExportOptions,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oTempDir,
oExecPath,
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 13:16:33 +00:00
oEncryptTo,
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
1999-02-19 14:54:00 +00:00
oNoEncryptTo,
See ChangeLog: Sat May 22 22:47:26 CEST 1999 Werner Koch
1999-05-22 20:54:54 +00:00
oLoggerFD,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
oLoggerFile,
#endif /* __riscos__ */
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 10:53:35 +00:00
oUtf8Strings,
oNoUtf8Strings,
See ChangeLog: Thu Jul 15 10:15:35 CEST 1999 Werner Koch
1999-07-15 08:16:46 +00:00
oDisableCipherAlgo,
oDisablePubkeyAlgo,
See ChangeLog: Thu Jul 22 20:03:03 CEST 1999 Werner Koch
1999-07-22 18:11:55 +00:00
oAllowNonSelfsignedUID,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oNoAllowNonSelfsignedUID,
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
oAllowFreeformUID,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oNoAllowFreeformUID,
oAllowSecretKeyImport,
oEnableSpecialFilenames,
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 07:44:46 +00:00
oNoLiteral,
oSetFilesize,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00: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 17:38:04 +00: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 17:57:53 +00:00
oIgnoreMDCError,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oShowSessionKey,
oOverrideSessionKey,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
oNoRandomSeedFile,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oAutoKeyRetrieve,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
oNoAutoKeyRetrieve,
See ChangeLog: Mon Aug 21 17:59:17 CEST 2000 Werner Koch
2000-08-21 15:54:37 +00:00
oUseAgent,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oNoUseAgent,
oGpgAgentInfo,
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
oMergeOnly,
oTryAllSecrets,
oTrustedKey,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oNoExpensiveTrustChecks,
oFixedListMode,
oNoSigCache,
oNoSigCreateCheck,
oAutoCheckTrustDB,
oNoAutoCheckTrustDB,
oPreservePermissions,
oDefaultPreferenceList,
oPersonalCipherPreferences,
oPersonalDigestPreferences,
oPersonalCompressPreferences,
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
oEmuMDEncodeBug,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
oDisplay,
oTTYname,
oTTYtype,
oLCctype,
oLCmessages,
oGroup,
bug fix release
1998-08-11 17:29:34 +00:00
aTest };
added option export
1998-02-13 20:58:50 +00:00
static ARGPARSE_OPTS opts[] = {
new release
1998-05-15 18:49:19 +00:00
{ 300, NULL, 0, N_("@Commands:\n ") },
added option export
1998-02-13 20:58:50 +00:00
bug fix release
1998-08-11 17:29:34 +00:00
{ aSign, "sign", 256, N_("|[file]|make a signature")},
{ aClearsign, "clearsign", 256, N_("|[file]|make a clear text signature") },
{ aDetachedSign, "detach-sign", 256, N_("make a detached signature")},
{ aEncr, "encrypt", 256, N_("encrypt data")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ aEncrFiles, "encrypt-files", 256, N_("|[files]|encrypt files")},
bug fix release
1998-08-11 17:29:34 +00:00
{ aSym, "symmetric", 256, N_("encryption only with symmetric cipher")},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aStore, "store", 256, N_("store only")},
bug fix release
1998-08-11 17:29:34 +00:00
{ aDecrypt, "decrypt", 256, N_("decrypt data (default)")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ aDecryptFiles, "decrypt-files", 256, N_("|[files]|decrypt files")},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aVerify, "verify" , 256, N_("verify a signature")},
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ aVerifyFiles, "verify-files" , 256, "@" },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aListKeys, "list-keys", 256, N_("list keys")},
See ChangeLog: Wed Apr 7 20:51:39 CEST 1999 Werner Koch
1999-04-07 18:58:34 +00:00
{ aListKeys, "list-public-keys", 256, "@" },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aListSigs, "list-sigs", 256, N_("list keys and signatures")},
{ aCheckKeys, "check-sigs",256, N_("check key signatures")},
{ 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 16:49:22 +00:00
{ aKeygen, "gen-key", 256, N_("generate a new key pair")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 16:49:22 +00:00
{ aSignKey, "sign-key" ,256, N_("sign a key")},
{ aLSignKey, "lsign-key" ,256, N_("sign a key locally")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ aNRSignKey, "nrsign-key" ,256, N_("sign a key non-revocably")},
{ aNRLSignKey, "nrlsign-key" ,256, N_("sign a key locally and non-revocably")},
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
{ aEditKey, "edit-key" ,256, N_("sign or edit a key")},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aGenRevoke, "gen-revoke",256, N_("generate a revocation certificate")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ aDesigRevoke, "desig-revoke",256, "@" },
See ChangeLog: Thu Dec 10 20:15:36 CET 1998 Werner Koch
1998-12-10 19:20:47 +00:00
{ aExport, "export" , 256, N_("export keys") },
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 18:37:41 +00: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 10:53:39 +00:00
{ aRecvKeys, "recv-keys" , 256, N_("import keys from a key server") },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ aSearchKeys, "search-keys" , 256,
N_("search for keys on a key server") },
{ aRefreshKeys, "refresh-keys", 256,
N_("update all keys from a keyserver")},
See ChangeLog: Thu Dec 10 20:15:36 CET 1998 Werner Koch
1998-12-10 19:20:47 +00:00
{ aExportAll, "export-all" , 256, "@" },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aExportSecret, "export-secret-keys" , 256, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ aExportSecretSub, "export-secret-subkeys" , 256, "@" },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aImport, "import", 256 , N_("import/merge keys")},
some random changes
1998-10-25 19:00:01 +00:00
{ aFastImport, "fast-import", 256 , "@"},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aListPackets, "list-packets",256,N_("list only the sequence of packets")},
last local commit
1998-10-16 16:00:17 +00:00
{ aExportOwnerTrust,
"export-ownertrust", 256, N_("export the ownertrust values")},
{ aImportOwnerTrust,
"import-ownertrust", 256 , N_("import ownertrust values")},
{ aUpdateTrustDB,
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 17:47:23 +00:00
"update-trustdb",0 , N_("update the trust database")},
last local commit
1998-10-16 16:00:17 +00:00
{ aCheckTrustDB,
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
"check-trustdb",0 , N_("unattended trust database update")},
a new release
1998-10-07 13:30:43 +00:00
{ aFixTrustDB, "fix-trustdb",0 , N_("fix a corrupted trust database")},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aDeArmor, "dearmor", 256, N_("De-Armor a file or stdin") },
See ChangeLog: Fri Sep 17 12:56:42 CEST 1999 Werner Koch
1999-09-17 10:58:20 +00:00
{ aDeArmor, "dearmour", 256, "@" },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aEnArmor, "enarmor", 256, N_("En-Armor a file or stdin") },
See ChangeLog: Fri Sep 17 12:56:42 CEST 1999 Werner Koch
1999-09-17 10:58:20 +00:00
{ aEnArmor, "enarmour", 256, "@" },
*** empty log message ***
1998-09-11 05:47:32 +00: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 20:58:50 +00:00
new release
1998-05-15 18:49:19 +00:00
{ 301, NULL, 0, N_("@\nOptions:\n ") },
added option export
1998-02-13 20:58:50 +00:00
bug fix release
1998-08-11 17:29:34 +00:00
{ oArmor, "armor", 0, N_("create ascii armored output")},
See ChangeLog: Fri Sep 17 12:56:42 CEST 1999 Werner Koch
1999-09-17 10:58:20 +00:00
{ oArmor, "armour", 0, "@" },
See ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch
1999-01-24 17:16:40 +00:00
{ oRecipient, "recipient", 2, N_("|NAME|encrypt for NAME")},
{ oRecipient, "remote-user", 2, "@"}, /* old option name */
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
{ oDefRecipient, "default-recipient" ,2,
N_("|NAME|use NAME as default recipient")},
{ oDefRecipientSelf, "default-recipient-self" ,0,
N_("use the default key as default recipient")},
{ oNoDefRecipient, "no-default-recipient", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oTempDir, "temp-directory", 2, "@" },
{ oExecPath, "exec-path", 2, "@" },
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 13:16:33 +00:00
{ oEncryptTo, "encrypt-to", 2, "@" },
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
1999-02-19 14:54:00 +00:00
{ oNoEncryptTo, "no-encrypt-to", 0, "@" },
bug fix release
1998-08-11 17:29:34 +00:00
{ oUser, "local-user",2, N_("use this user-id to sign or decrypt")},
{ oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") },
(Does not compile yet)
1998-11-03 19:38:58 +00:00
{ oTextmodeShort, NULL, 0, "@"},
bug fix release
1998-08-11 17:29:34 +00:00
{ oTextmode, "textmode", 0, N_("use canonical text mode")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oExpert, "expert", 0, "@"},
{ oNoExpert, "no-expert", 0, "@"},
{ oAskSigExpire, "ask-sig-expire", 0, "@"},
{ oNoAskSigExpire, "no-ask-sig-expire", 0, "@"},
{ oAskCertExpire, "ask-cert-expire", 0, "@"},
{ oNoAskCertExpire, "no-ask-cert-expire", 0, "@"},
bug fix release
1998-08-11 17:29:34 +00:00
{ oOutput, "output", 2, N_("use as output file")},
{ oVerbose, "verbose", 0, N_("verbose") },
some random changes
1998-10-25 19:00:01 +00:00
{ oQuiet, "quiet", 0, N_("be somewhat more quiet") },
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
{ oNoTTY, "no-tty", 0, N_("don't use the terminal at all") },
Snapshot release 0.4.2
1998-10-18 15:21:22 +00:00
{ oForceV3Sigs, "force-v3-sigs", 0, N_("force v3 signatures") },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oNoForceV3Sigs, "no-force-v3-sigs", 0, N_("do not force v3 signatures") },
{ oForceV4Certs, "force-v4-certs", 0, N_("force v4 key signatures") },
{ oNoForceV4Certs, "no-force-v4-certs", 0, N_("do not force v4 key signatures") },
See ChangeLog: Mon Apr 26 17:48:15 CEST 1999 Werner Koch
1999-04-26 15:53:01 +00:00
{ oForceMDC, "force-mdc", 0, N_("always use a MDC for encryption") },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oNoForceMDC, "no-force-mdc", 0, "@" },
{ oDisableMDC, "disable-mdc", 0, N_("never use a MDC for encryption") },
{ oNoDisableMDC, "no-disable-mdc", 0, "@" },
See ChangeLog: Thu Feb 25 18:47:39 CET 1999 Werner Koch
1999-02-25 17:51:55 +00: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 17:24:21 +00:00
{ oInteractive, "interactive", 0, N_("prompt before overwriting") },
See ChangeLog: Mon Aug 21 17:59:17 CEST 2000 Werner Koch
2000-08-21 15:54:37 +00:00
{ oUseAgent, "use-agent",0, N_("use the gpg-agent")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oNoUseAgent, "no-use-agent",0, "@"},
{ oGpgAgentInfo, "gpg-agent-info",2, "@"},
bug fix release
1998-08-11 17:29:34 +00:00
{ oBatch, "batch", 0, N_("batch mode: never ask")},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oAnswerYes, "yes", 0, N_("assume yes on most questions")},
{ oAnswerNo, "no", 0, N_("assume no on most questions")},
{ oKeyring, "keyring" ,2, N_("add this keyring to the list of keyrings")},
{ oSecretKeyring, "secret-keyring" ,2, N_("add this secret keyring to the list")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oShowKeyring, "show-keyring", 0, N_("show which keyring a listed key is on")},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oDefaultKey, "default-key" ,2, N_("|NAME|use NAME as default secret key")},
See ChangeLog: Sat Jan 16 09:27:30 CET 1999 Werner Koch
1999-01-16 08:29:29 +00:00
{ oKeyServer, "keyserver",2, N_("|HOST|use this keyserver to lookup keys")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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-22 22:26:14 +00: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 19:07:21 +00:00
{ oExportOptions, "export-options",2,"@"},
See ChangeLog: Tue Dec 8 13:15:16 CET 1998 Werner Koch
1998-12-08 12:20:53 +00:00
{ oCharset, "charset" , 2, N_("|NAME|set terminal charset to NAME") },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oOptions, "options" , 2, N_("read options from file")},
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ oDebug, "debug" ,4|16, "@"},
{ oDebugAll, "debug-all" ,0, "@"},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
{ oStatusFile, "status-file" ,2, N_("|[file]|write status info to file") },
#endif /* __riscos__ */
{ oAttributeFD, "attribute-fd" ,1, "@" },
#ifdef __riscos__
{ oAttributeFile, "attribute-file" ,2, "@" },
#endif /* __riscos__ */
{ oNoSKComments, "no-comment", 0, "@"},
{ oNoSKComments, "no-sk-comments", 0, "@"},
{ oSKComments, "sk-comments", 0, "@"},
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ oCompletesNeeded, "completes-needed", 1, "@"},
{ oMarginalsNeeded, "marginals-needed", 1, "@"},
See ChangeLog ;-). Key validation should now be faster
1998-11-13 19:41:41 +00:00
{ oMaxCertDepth, "max-cert-depth", 1, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oTrustedKey, "trusted-key", 2, N_("|KEYID|ultimately trust this key")},
*** empty log message ***
1998-10-01 07:23:00 +00:00
{ oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")},
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
{ oOpenPGP, "openpgp", 0, N_("set all packet, cipher and digest options to OpenPGP behavior")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oPGP2, "pgp2", 0, N_("set all packet, cipher and digest options to PGP 2.x behavior")},
{ oNoPGP2, "no-pgp2", 0, "@"},
{ oPGP6, "pgp6", 0, "@"},
{ oNoPGP6, "no-pgp6", 0, "@"},
{ oPGP7, "pgp7", 0, "@"},
{ oNoPGP7, "no-pgp7", 0, "@"},
*** empty log message ***
1998-09-29 16:15:15 +00:00
{ oS2KMode, "s2k-mode", 1, N_("|N|use passphrase mode N")},
*** empty log message ***
1998-09-28 19:25:31 +00:00
{ oS2KDigest, "s2k-digest-algo",2,
*** empty log message ***
1998-09-29 16:15:15 +00:00
N_("|NAME|use message digest algorithm NAME for passphrases")},
*** empty log message ***
1998-09-28 19:25:31 +00:00
{ oS2KCipher, "s2k-cipher-algo",2,
*** empty log message ***
1998-09-29 16:15:15 +00:00
N_("|NAME|use cipher algorithm NAME for passphrases")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oSimpleSKChecksum, "simple-sk-checksum", 0, "@"},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oCipherAlgo, "cipher-algo", 2 , N_("|NAME|use cipher algorithm NAME")},
{ oDigestAlgo, "digest-algo", 2 , N_("|NAME|use message digest algorithm NAME")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oCertDigestAlgo, "cert-digest-algo", 2 , "@" },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oCompressAlgo, "compress-algo", 1 , N_("|N|use compress algorithm N")},
{ oThrowKeyid, "throw-keyid", 0, N_("throw keyid field of encrypted packets")},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oShowPhotos, "show-photos", 0, N_("Show Photo IDs")},
{ oNoShowPhotos, "no-show-photos", 0, N_("Don't show Photo IDs")},
{ oPhotoViewer, "photo-viewer", 2, N_("Set command line to view Photo IDs")},
{ oNotation, "notation-data", 2, "@" },
{ oSigNotation, "sig-notation", 2, "@" },
{ oCertNotation, "cert-notation", 2, "@" },
added option export
1998-02-13 20:58:50 +00:00
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00: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 20:58:50 +00:00
" -se -r Bob [file] sign and encrypt for user Bob\n"
*** empty log message ***
1998-09-28 19:25:31 +00: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 20:58:50 +00:00
/* hidden options */
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aExportOwnerTrust, "list-ownertrust",0 , "@"}, /* alias */
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
{ aPrintMDs, "print-mds" , 256, "@"}, /* old */
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ aListTrustDB, "list-trustdb",0 , "@"},
{ aListTrustPath, "list-trust-path",0, "@"},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ aPipeMode, "pipemode", 0, "@" },
bug fix release
1998-08-11 17:29:34 +00:00
{ oKOption, NULL, 0, "@"},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oPasswdFD, "passphrase-fd",1, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
{ oPasswdFile, "passphrase-file",2, "@" },
#endif /* __riscos__ */
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ oCommandFD, "command-fd",1, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
{ oCommandFile, "command-file",2, "@" },
#endif /* __riscos__ */
{ oQuickRandom, "quick-random", 0, "@"},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oNoVerbose, "no-verbose", 0, "@"},
{ oTrustDBName, "trustdb-name", 2, "@" },
{ oNoSecmemWarn, "no-secmem-warning", 0, "@" }, /* used only by regression tests */
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 16:48:21 +00:00
{ oNoMDCWarn, "no-mdc-warning", 0, "@" },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oNoArmor, "no-armor", 0, "@"},
See ChangeLog: Fri Sep 17 12:56:42 CEST 1999 Werner Koch
1999-09-17 10:58:20 +00:00
{ oNoArmor, "no-armour", 0, "@"},
*** empty log message ***
1998-09-11 05:47:32 +00: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 11:41:46 +00:00
{ oWithKeyData,"with-key-data", 0, "@"},
*** empty log message ***
1998-09-11 05:47:32 +00: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, "@"},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oDefCertCheckLevel, "default-cert-check-level", 1, "@"},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oAlwaysTrust, "always-trust", 0, "@"},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oEmuChecksumBug, "emulate-checksum-bug", 0, "@"},
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oRunAsShmCP, "run-as-shm-coprocess", 4, "@" },
{ oSetFilename, "set-filename", 2, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 12:41:46 +00:00
{ oSetPolicyURL, "set-policy-url", 2, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oSigPolicyURL, "sig-policy-url", 2, "@" },
{ oCertPolicyURL, "cert-policy-url", 2, "@" },
{ oShowPolicyURL, "show-policy-url", 0, "@" },
{ oNoShowPolicyURL, "no-show-policy-url", 0, "@" },
{ oShowNotation, "show-notation", 0, "@" },
{ oNoShowNotation, "no-show-notation", 0, "@" },
*** empty log message ***
1998-09-11 05:47:32 +00:00
{ oComment, "comment", 2, "@" },
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
{ oDefaultComment, "default-comment", 0, "@" },
{ oNoVersion, "no-version", 0, "@"},
{ oEmitVersion, "emit-version", 0, "@"},
Expiration time works (I hope so)
1998-11-20 17:42:18 +00:00
{ oNotDashEscaped, "not-dash-escaped", 0, "@" },
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 17:36:05 +00:00
{ oEscapeFrom, "escape-from-lines", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oNoEscapeFrom, "no-escape-from-lines", 0, "@" },
See ChangeLog: Fri Nov 27 21:37:41 CET 1998 Werner Koch
1998-11-27 20:40:56 +00:00
{ oLockOnce, "lock-once", 0, "@" },
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
{ oLockMultiple, "lock-multiple", 0, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ oLockNever, "lock-never", 0, "@" },
See ChangeLog: Sat May 22 22:47:26 CEST 1999 Werner Koch
1999-05-22 20:54:54 +00:00
{ oLoggerFD, "logger-fd",1, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
{ oLoggerFile, "logger-file",2, "@" },
#endif /* __riscos__ */
See ChangeLog: Tue Jun 1 16:01:46 CEST 1999 Werner Koch
1999-06-01 14:08:57 +00:00
{ oUseEmbeddedFilename, "use-embedded-filename", 0, "@" },
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 10:53:35 +00: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 14:24:35 +00:00
{ oWithFingerprint, "with-fingerprint", 0, "@" },
See ChangeLog: Thu Jul 15 10:15:35 CEST 1999 Werner Koch
1999-07-15 08:16:46 +00: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 18:11:55 +00:00
{ oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oNoAllowNonSelfsignedUID, "no-allow-non-selfsigned-uid", 0, "@" },
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
{ oAllowFreeformUID, "allow-freeform-uid", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oNoAllowFreeformUID, "no-allow-freeform-uid", 0, "@" },
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 07:44:46 +00:00
{ oNoLiteral, "no-literal", 0, "@" },
{ oSetFilesize, "set-filesize", 20, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ oHonorHttpProxy,"honor-http-proxy", 0, "@" },
{ oFastListMode,"fast-list-mode", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oFixedListMode,"fixed-list-mode", 0, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ oListOnly, "list-only", 0, "@"},
{ oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 17:57:53 +00:00
{ oIgnoreMDCError, "ignore-mdc-error", 0,"@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 17:34:53 +00:00
{ oNoRandomSeedFile, "no-random-seed-file", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oAutoKeyRetrieve, "auto-key-retrieve", 0, "@" },
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ oNoAutoKeyRetrieve, "no-auto-key-retrieve", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 14:35:34 +00:00
{ oMergeOnly, "merge-only", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oAllowSecretKeyImport, "allow-secret-key-import", 0, "@" },
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
{ oTryAllSecrets, "try-all-secrets", 0, "@" },
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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, "@"},
{ oPersonalCipherPreferences, "personal-cipher-preferences", 2, "@"},
{ oPersonalDigestPreferences, "personal-digest-preferences", 2, "@"},
{ oPersonalCompressPreferences, "personal-compress-preferences", 2, "@"},
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
{ oEmuMDEncodeBug, "emulate-md-encode-bug", 0, "@"},
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ oDisplay, "display", 2, "@" },
{ oTTYname, "ttyname", 2, "@" },
{ oTTYtype, "ttytype", 2, "@" },
{ oLCctype, "lc-ctype", 2, "@" },
{ oLCmessages, "lc-messages", 2, "@" },
{ oGroup, "group", 2, "@" },
added option export
1998-02-13 20:58:50 +00:00
{0} };
NT version compiles
1998-01-05 19:13:15 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
int g10_errors_seen = 0;
Some bug fixes of the last release
1998-11-10 12:59:59 +00:00
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 10:53:35 +00:00
static int utf8_strings = 0;
fixed severe exploit
1998-07-09 13:37:17 +00:00
static int maybe_setuid = 1;
NT version compiles
1998-01-05 19:13:15 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 17:34:53 +00:00
const char *(*mapf)(int), int (*chkf)(int) );
bug fix release
1998-08-11 17:29:34 +00:00
static void set_cmd( enum cmd_and_opt_values *ret_cmd,
enum cmd_and_opt_values new_cmd );
removed g10maint.c
1998-03-05 09:22:13 +00:00
static void print_hex( byte *p, size_t n );
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 );
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
RISCOS_GLOBAL_STATICS("GnuPG Heap")
#endif /* __riscos__ */
See ChangeLog: Sat Nov 13 17:44:23 CET 1999 Werner Koch
1999-11-13 16:43:23 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
const char *
strusage( int level )
initially checkin
1997-11-18 14:06:00 +00:00
{
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
static char *digests, *pubkeys, *ciphers, *zips;
initially checkin
1997-11-18 14:06:00 +00:00
const char *p;
switch( level ) {
See ChangeLog: Sun Apr 18 10:11:28 CEST 1999 Werner Koch
1999-04-18 08:18:52 +00:00
case 11: p = "gpg (GnuPG)";
removed g10maint.c
1998-03-05 09:22:13 +00:00
break;
some import functionality
1998-02-16 20:05:02 +00:00
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
removed g10maint.c
1998-03-05 09:22:13 +00:00
case 19: p =
add-key works
1998-05-26 13:38:00 +00:00
_("Please report bugs to <gnupg-bugs@gnu.org>.\n");
removed g10maint.c
1998-03-05 09:22:13 +00:00
break;
initially checkin
1997-11-18 14:06:00 +00:00
case 1:
removed g10maint.c
1998-03-05 09:22:13 +00: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 20:05:02 +00:00
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case 31: p = "\nHome: "; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifndef __riscos__
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case 32: p = opt.homedir; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 17:34:53 +00:00
case 33: p = _("\nSupported algorithms:\n"); break;
case 34:
some import functionality
1998-02-16 20:05:02 +00:00
if( !pubkeys )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
pubkeys = build_list("Pubkey: ", 0, pubkey_algo_to_string,
check_pubkey_algo );
some import functionality
1998-02-16 20:05:02 +00:00
p = pubkeys;
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case 35:
if( !ciphers )
ciphers = build_list("Cipher: ", 'S', cipher_algo_to_string,
check_cipher_algo );
p = ciphers;
break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case 36:
some import functionality
1998-02-16 20:05:02 +00:00
if( !digests )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
digests = build_list("Hash: ", 'H', digest_algo_to_string,
check_digest_algo );
some import functionality
1998-02-16 20:05:02 +00:00
p = digests;
initially checkin
1997-11-18 14:06:00 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case 37:
if( !zips )
zips = build_list("Compress: ",'Z',compress_algo_to_string,
check_compress_algo);
p = zips;
break;
some import functionality
1998-02-16 20:05:02 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
default: p = default_strusage(level);
initially checkin
1997-11-18 14:06:00 +00:00
}
return p;
}
some import functionality
1998-02-16 20:05:02 +00:00
static char *
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
build_list( const char *text, char letter,
const char * (*mapf)(int), int (*chkf)(int) )
some import functionality
1998-02-16 20:05:02 +00:00
{
int i;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
const char *s;
some import functionality
1998-02-16 20:05:02 +00:00
size_t n=strlen(text)+2;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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;
list = m_alloc( 21 + n ); *list = 0;
for(p=NULL, i=0; i <= 110; i++ ) {
if( !chkf(i) && (s=mapf(i)) ) {
if( !p ) {
some import functionality
1998-02-16 20:05:02 +00:00
p = stpcpy( list, text );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
line=p;
}
some import functionality
1998-02-16 20:05:02 +00:00
else
p = stpcpy( p, ", ");
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if(strlen(line)>60) {
int spaces=strlen(text);
list=m_realloc(list,n+spaces+1);
/* 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 20:05:02 +00:00
}
}
if( p )
p = stpcpy(p, "\n" );
return list;
}
added initial i18n stuff
1998-01-26 22:09:01 +00:00
static void
i18n_init(void)
{
See ChangeLog: Wed Sep 15 16:22:17 CEST 1999 Werner Koch
1999-09-15 14:26:39 +00:00
#ifdef USE_SIMPLE_GETTEXT
set_gettext_file( PACKAGE );
#else
some cleanups
1998-03-19 15:27:29 +00:00
#ifdef ENABLE_NLS
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
setlocale( LC_ALL, "" );
bindtextdomain( PACKAGE, G10_LOCALEDIR );
added initial i18n stuff
1998-01-26 22:09:01 +00:00
textdomain( PACKAGE );
#endif
See ChangeLog: Wed Sep 15 16:22:17 CEST 1999 Werner Koch
1999-09-15 14:26:39 +00:00
#endif
added initial i18n stuff
1998-01-26 22:09:01 +00:00
}
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00: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 13:46:34 +00:00
g10_exit(2);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
}
static char *
make_username( const char *string )
{
char *p;
if( utf8_strings )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
p = m_strdup(string);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
else
p = native_to_utf8( string );
return p;
}
initially checkin
1997-11-18 14:06:00 +00: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 13:46:34 +00:00
mpi_debug_mode = 1;
initially checkin
1997-11-18 14:06:00 +00:00
if( opt.debug & DBG_CIPHER_VALUE )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10c_debug_mode = 1;
IDEA removed, signing works
1997-11-24 11:04:11 +00:00
if( opt.debug & DBG_IOBUF_VALUE )
iobuf_debug_mode = 1;
gnupg extension are now working
1998-06-13 17:00:02 +00:00
initially checkin
1997-11-18 14:06:00 +00:00
}
NT version compiles
1998-01-05 19:13:15 +00:00
static void
bug fix release
1998-08-11 17:29:34 +00:00
set_cmd( enum cmd_and_opt_values *ret_cmd, enum cmd_and_opt_values new_cmd )
NT version compiles
1998-01-05 19:13:15 +00:00
{
bug fix release
1998-08-11 17:29:34 +00:00
enum cmd_and_opt_values cmd = *ret_cmd;
NT version compiles
1998-01-05 19:13:15 +00: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 13:46:34 +00:00
else if( cmd == aSign && new_cmd == aSym )
cmd = aSignSym;
else if( cmd == aSym && new_cmd == aSign )
cmd = aSignSym;
NT version compiles
1998-01-05 19:13:15 +00:00
else if( cmd == aKMode && new_cmd == aSym )
cmd = aKModeC;
armor rewritten, but still buggy
1998-02-04 18:54:31 +00:00
else if( ( cmd == aSign && new_cmd == aClearsign )
|| ( cmd == aClearsign && new_cmd == aSign ) )
cmd = aClearsign;
NT version compiles
1998-01-05 19:13:15 +00:00
else {
added initial i18n stuff
1998-01-26 22:09:01 +00:00
log_error(_("conflicting commands\n"));
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10_exit(2);
NT version compiles
1998-01-05 19:13:15 +00:00
}
*ret_cmd = cmd;
}
Armor works now
1997-11-21 14:53:57 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
static void add_group(char *string)
{
char *name,*value;
struct groupitem *item;
STRLIST values=NULL;
/* 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 19:21:58 +00:00
name=strsep(&string,"=");
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if(string==NULL)
{
* 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 19:21:58 +00:00
log_error(_("no = sign found in group definition \"%s\"\n"),name);
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
return;
}
/* Break apart the values */
while((value=strsep(&string," ")) && *value!='\0')
add_to_strlist2(&values,value,utf8_strings);
item=m_alloc(sizeof(struct groupitem));
item->name=name;
item->values=values;
item->next=opt.grouplist;
opt.grouplist=item;
}
* 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 15:53:15 +00:00
/* We need to check three things.
0) The homedir. It must be x00, a directory, and owned by the
user.
1) The options file. Okay unless it or its containing directory is
group or other writable or not owned by us. disable exec in this
case.
2) Extensions. Same as #2.
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;
* g10.c (check permissions): Back out previous change - some translations already done for 1.2.
2002-09-15 11:16:04 +00:00
char *tmppath,*isa,*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 15:53:15 +00: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;
/* 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
tmppath=m_strdup(path);
/* 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 08:40:12 +00: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 15:53:15 +00: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;
}
m_free(dir);
/* Assume failure */
ret=1;
if(item==0)
{
* g10.c (check permissions): Back out previous change - some translations already done for 1.2.
2002-09-15 11:16:04 +00:00
isa="homedir";
* 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 15:53:15 +00:00
/* 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)
{
* g10.c (check permissions): Back out previous change - some translations already done for 1.2.
2002-09-15 11:16:04 +00:00
if(item==1)
isa="configuration file";
else
isa="extension";
* 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 15:53:15 +00:00
/* 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)
* g10.c (check permissions): Back out previous change - some translations already done for 1.2.
2002-09-15 11:16:04 +00:00
log_info(_("WARNING: unsafe ownership on %s \"%s\"\n"),
isa,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 15:53:15 +00:00
if(perm)
* g10.c (check permissions): Back out previous change - some translations already done for 1.2.
2002-09-15 11:16:04 +00:00
log_info(_("WARNING: unsafe permissions on %s \"%s\"\n"),
isa,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 15:53:15 +00:00
if(enc_dir_own)
* g10.c (check permissions): Back out previous change - some translations already done for 1.2.
2002-09-15 11:16:04 +00:00
log_info(_("WARNING: unsafe enclosing directory "
"ownership on %s \"%s\"\n"),
isa,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 15:53:15 +00:00
if(enc_dir_perm)
* g10.c (check permissions): Back out previous change - some translations already done for 1.2.
2002-09-15 11:16:04 +00:00
log_info(_("WARNING: unsafe enclosing directory "
"permissions on %s \"%s\"\n"),
isa,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 15:53:15 +00:00
}
end:
m_free(tmppath);
if(homedir)
homedir_cache=ret;
return ret;
#endif /* HAVE_STAT && !HAVE_DOSISH_SYSTEM */
return 0;
}
added option export
1998-02-13 20:58:50 +00:00
add-key works
1998-05-26 13:38:00 +00:00
int
initially checkin
1997-11-18 14:06:00 +00:00
main( int argc, char **argv )
{
added option file handling
1997-12-12 12:03:58 +00:00
ARGPARSE_ARGS pargs;
initially checkin
1997-11-18 14:06:00 +00:00
IOBUF a;
added some trust model stuff
1998-01-16 21:15:24 +00:00
int rc=0;
added option file handling
1997-12-12 12:03:58 +00:00
int orig_argc;
char **orig_argv;
partial DSA support
1998-03-09 21:44:06 +00:00
const char *fname;
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 12:57:54 +00:00
char *username;
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
int may_coredump;
IDEA removed, signing works
1997-11-24 11:04:11 +00:00
STRLIST sl, remusr= NULL, locusr=NULL;
fixed severe exploit
1998-07-09 13:37:17 +00:00
STRLIST nrings=NULL, sec_nrings=NULL;
Armor works now
1997-11-21 14:53:57 +00:00
armor_filter_context_t afx;
fingerprints and self signatures added
1997-12-09 12:46:23 +00:00
int detached_sig = 0;
added option file handling
1997-12-12 12:03:58 +00:00
FILE *configfp = NULL;
char *configname = NULL;
unsigned configlineno;
bug fixes
1998-02-11 23:22:09 +00:00
int parse_debug = 0;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
int default_config = 1;
very first release
1997-12-20 17:23:29 +00:00
int default_keyring = 1;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
int greeting = 0;
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 17:47:23 +00:00
int nogreeting = 0;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
int use_random_seed = 1;
bug fix release
1998-08-11 17:29:34 +00:00
enum cmd_and_opt_values cmd = 0;
changed structure of trustdb
1998-02-02 14:36:06 +00:00
const char *trustdb_name = NULL;
fixed severe exploit
1998-07-09 13:37:17 +00:00
char *def_cipher_string = NULL;
char *def_digest_string = NULL;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
char *cert_digest_string = NULL;
*** empty log message ***
1998-09-28 19:25:31 +00:00
char *s2k_cipher_string = NULL;
char *s2k_digest_string = NULL;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
char *pers_cipher_list = NULL;
char *pers_digest_list = NULL;
char *pers_compress_list = NULL;
int eyes_only=0;
*** empty log message ***
1998-09-28 19:25:31 +00:00
int pwfd = -1;
See ChangeLog: Thu Jul 8 16:21:27 CEST 1999 Werner Koch
1999-07-08 14:24:35 +00:00
int with_fpr = 0; /* make an option out of --fingerprint */
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
int any_explicit_recipient = 0;
add coprocess facility
1998-07-31 16:45:58 +00:00
#ifdef USE_SHM_COPROCESSING
ulong requested_shm_size=0;
#endif
added option file handling
1997-12-12 12:03:58 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef __riscos__
riscos_global_defaults();
opt.lock_once = 1;
#endif /* __riscos__ */
new release
1998-05-15 18:49:19 +00:00
trap_unaligned();
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
secmem_set_flags( secmem_get_flags() | 2 ); /* suspend warnings */
release 0.2.3
1998-02-09 17:43:42 +00:00
/* Please note that we may running SUID(ROOT), so be very CAREFUL
* when adding any stuff between here and the call to
* secmem_init() somewhere after the option parsing
*/
Renamed to GNUPG
1998-02-24 18:50:46 +00:00
log_set_name("gpg");
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
secure_random_alloc(); /* put random number into secure memory */
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
may_coredump = disable_core_dumps();
backup
1998-10-12 20:16:38 +00:00
init_signals();
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 13:16:33 +00:00
create_dotlock(NULL); /* register locking cleanup */
added initial i18n stuff
1998-01-26 22:09:01 +00:00
i18n_init();
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
opt.command_fd = -1; /* no command fd */
added more stuff
1998-01-02 20:40:10 +00:00
opt.compress = -1; /* defaults to standard compress level */
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
/* note: if you change these lines, look at oOpenPGP */
intermediate check in
1998-08-05 16:51:59 +00:00
opt.def_cipher_algo = 0;
new release
1998-05-15 18:49:19 +00:00
opt.def_digest_algo = 0;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.cert_digest_algo = 0;
opt.def_compress_algo = -1;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
opt.s2k_mode = 3; /* iterated+salted */
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
Ready to test version 0.2.0
1998-01-25 18:56:33 +00:00
opt.completes_needed = 1;
opt.marginals_needed = 3;
See ChangeLog ;-). Key validation should now be faster
1998-11-13 19:41:41 +00:00
opt.max_cert_depth = 5;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
opt.pgp2_workarounds = 1;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.force_v3_sigs = 1;
opt.escape_from = 1;
* main.h, import.c (parse_import_options, fix_hkp_corruption, import_one, delete_inv_parts), g10.c (main): New import-option "repair-hkp-subkey-bug", which repairs as much as possible the HKP mangling multiple subkeys bug. It is on by default for keyserver receives, and off by default for regular --import. * main.h, import.c (import, import_one, delete_inv_parts), hkp.c (hkp_ask_import), keyserver.c (keyserver_spawn): Use keyserver import options when doing keyserver receives.
2002-07-24 21:17:19 +00:00
opt.import_options=0;
opt.export_options=
EXPORT_INCLUDE_NON_RFC|EXPORT_INCLUDE_ATTRIBUTES;
opt.keyserver_options.import_options=IMPORT_REPAIR_HKP_SUBKEY_BUG;
opt.keyserver_options.export_options=
EXPORT_INCLUDE_NON_RFC|EXPORT_INCLUDE_ATTRIBUTES;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.keyserver_options.include_subkeys=1;
* import.c (clean_subkeys, chk_self_sigs): Merge clean_subkeys into chk_self_sigs. This improves efficiency as the same signatures are not checked multiple times. Clarify when a subkey is revoked (any revocation signature, even if it is dated before the binding signature). * getkey.c (merge_selfsigs_subkey): Subkey revocation comments. * keylist.c (list_one): Stats are only for public key listings. * g10.c (main), options.skel: Default should be include-revoked for keyserver operations.
2002-08-22 17:47:42 +00:00
opt.keyserver_options.include_revoked=1;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#if defined (__MINGW32__) || defined (__CYGWIN32__)
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#else
bug fixes
1998-02-27 17:51:28 +00:00
opt.homedir = getenv("GNUPGHOME");
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#endif
bug fixes
1998-02-27 17:51:28 +00:00
if( !opt.homedir || !*opt.homedir ) {
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
opt.homedir = GNUPG_HOMEDIR;
bug fixes
1998-02-27 17:51:28 +00:00
}
added option file handling
1997-12-12 12:03:58 +00:00
applied Mathews typo and grammar fixes
1998-04-14 17:51:16 +00:00
/* check whether we have a config file on the commandline */
added option file handling
1997-12-12 12:03:58 +00:00
orig_argc = argc;
orig_argv = argv;
pargs.argc = &argc;
pargs.argv = &argv;
update from tobold
1998-06-11 07:16:50 +00:00
pargs.flags= 1|(1<<6); /* do not remove the args, ignore version */
initially checkin
1997-11-18 14:06:00 +00:00
while( arg_parse( &pargs, opts) ) {
*** empty log message ***
1998-09-11 05:47:32 +00:00
if( pargs.r_opt == oDebug || pargs.r_opt == oDebugAll )
bug fixes
1998-02-11 23:22:09 +00:00
parse_debug++;
*** empty log message ***
1998-09-11 05:47:32 +00:00
else if( pargs.r_opt == oOptions ) {
added option file handling
1997-12-12 12:03:58 +00: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 05:47:32 +00:00
else if( pargs.r_opt == oNoOptions )
import works
1998-02-17 20:48:52 +00:00
default_config = 0; /* --no-options */
*** empty log message ***
1998-09-11 05:47:32 +00:00
else if( pargs.r_opt == oHomedir )
import works
1998-02-17 20:48:52 +00:00
opt.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 15:53:15 +00:00
else if( pargs.r_opt == oNoPermissionWarn )
opt.no_perm_warn=1;
*** empty log message ***
1998-09-28 19:25:31 +00:00
#ifdef USE_SHM_COPROCESSING
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 17:49:37 +00: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 13:46:34 +00: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 17:49:37 +00:00
}
*** empty log message ***
1998-09-28 19:25:31 +00:00
#endif
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifdef HAVE_DOSISH_SYSTEM
if ( strchr (opt.homedir,'\\') ) {
char *d, *buf = m_alloc (strlen (opt.homedir)+1);
const char *s = opt.homedir;
for (d=buf,s=opt.homedir; *s; s++)
*d++ = *s == '\\'? '/': *s;
*d = 0;
opt.homedir = buf;
}
#endif
#ifdef USE_SHM_COPROCESSING
*** empty log message ***
1998-09-28 19:25:31 +00:00
if( opt.shm_coprocess ) {
init_shm_coprocessing(requested_shm_size, 1 );
added option file handling
1997-12-12 12:03:58 +00:00
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#endif
*** empty log message ***
1998-09-28 19:25:31 +00:00
/* initialize the secure memory. */
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
secmem_init( 16384 );
*** empty log message ***
1998-09-28 19:25:31 +00:00
maybe_setuid = 0;
/* Okay, we are now working under our real uid */
* 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 10:59:04 +00:00
set_native_charset (NULL); /* Try to auto set the character set */
added option file handling
1997-12-12 12:03:58 +00: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 13:29:27 +00:00
{
use of EXTSEP_S
2002-08-06 18:32:58 +00:00
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 13:29:27 +00: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);
m_free (p);
}
else
{ /* Keep on using the old default one. */
m_free (configname);
configname = make_filename(opt.homedir, "options", NULL );
}
}
added option file handling
1997-12-12 12:03:58 +00: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 15:53:15 +00:00
/* By this point we have a homedir, and cannot change it. */
check_permissions(opt.homedir,0);
added option file handling
1997-12-12 12:03:58 +00: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 15:53:15 +00:00
if(check_permissions(configname,1))
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 12:03:58 +00:00
configlineno = 0;
configfp = fopen( configname, "r" );
if( !configfp ) {
if( default_config ) {
bug fixes
1998-02-11 23:22:09 +00:00
if( parse_debug )
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
1998-12-29 13:47:31 +00:00
log_info(_("NOTE: no default option file `%s'\n"),
import works
1998-02-17 20:48:52 +00:00
configname );
added option file handling
1997-12-12 12:03:58 +00:00
}
added option export
1998-02-13 20:58:50 +00:00
else {
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
1998-12-29 13:47:31 +00:00
log_error(_("option file `%s': %s\n"),
added option file handling
1997-12-12 12:03:58 +00:00
configname, strerror(errno) );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10_exit(2);
added option export
1998-02-13 20:58:50 +00:00
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(configname); configname = NULL;
added option file handling
1997-12-12 12:03:58 +00:00
}
bug fixes
1998-02-11 23:22:09 +00:00
if( parse_debug && configname )
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
1998-12-29 13:47:31 +00:00
log_info(_("reading options from `%s'\n"), configname );
added option file handling
1997-12-12 12:03:58 +00:00
default_config = 0;
}
while( optfile_parse( configfp, configname, &configlineno,
&pargs, opts) ) {
initially checkin
1997-11-18 14:06:00 +00:00
switch( pargs.r_opt ) {
*** empty log message ***
1998-09-11 05:47:32 +00:00
case aCheckKeys: set_cmd( &cmd, aCheckKeys); break;
case aListPackets: set_cmd( &cmd, aListPackets); break;
case aImport: set_cmd( &cmd, aImport); break;
some random changes
1998-10-25 19:00:01 +00:00
case aFastImport: set_cmd( &cmd, aFastImport); break;
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 18:37:41 +00:00
case aSendKeys: set_cmd( &cmd, aSendKeys); break;
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
1999-03-20 10:53:39 +00:00
case aRecvKeys: set_cmd( &cmd, aRecvKeys); break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aSearchKeys: set_cmd( &cmd, aSearchKeys); break;
case aRefreshKeys: set_cmd( &cmd, aRefreshKeys); break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case aExport: set_cmd( &cmd, aExport); break;
See ChangeLog: Thu Dec 10 20:15:36 CET 1998 Werner Koch
1998-12-10 19:20:47 +00:00
case aExportAll: set_cmd( &cmd, aExportAll); break;
*** empty log message ***
1998-09-11 05:47:32 +00: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 17:34:53 +00:00
case aExportSecretSub: set_cmd( &cmd, aExportSecretSub); break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aDeleteSecretKeys: set_cmd( &cmd, aDeleteSecretKeys);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
greeting=1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 09:22:13 +00:00
bug fix release
1998-08-11 17:29:34 +00: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 17:34:53 +00:00
bug fix release
1998-08-11 17:29:34 +00:00
case aDecrypt: set_cmd( &cmd, aDecrypt); break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aDecryptFiles: set_cmd( &cmd, aDecryptFiles); break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
bug fix release
1998-08-11 17:29:34 +00:00
case aEncr: set_cmd( &cmd, aEncr); break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aEncrFiles: set_cmd( &cmd, aEncrFiles ); break;
bug fix release
1998-08-11 17:29:34 +00:00
case aSign: set_cmd( &cmd, aSign ); break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
case aKeygen: set_cmd( &cmd, aKeygen); greeting=1; break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case aSignKey: set_cmd( &cmd, aSignKey); break;
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
case aLSignKey: set_cmd( &cmd, aLSignKey); break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aNRSignKey: set_cmd( &cmd, aNRSignKey); break;
case aNRLSignKey: set_cmd( &cmd, aNRLSignKey); break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case aStore: set_cmd( &cmd, aStore); break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
case aEditKey: set_cmd( &cmd, aEditKey); greeting=1; break;
bug fix release
1998-08-11 17:29:34 +00:00
case aClearsign: set_cmd( &cmd, aClearsign); break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case aGenRevoke: set_cmd( &cmd, aGenRevoke); break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aDesigRevoke: set_cmd( &cmd, aDesigRevoke); break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case aVerify: set_cmd( &cmd, aVerify); break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case aVerifyFiles: set_cmd( &cmd, aVerifyFiles); break;
See ChangeLog: Sun Apr 18 10:11:28 CEST 1999 Werner Koch
1999-04-18 08:18:52 +00:00
case aPrimegen: set_cmd( &cmd, aPrimegen); break;
case aGenRandom: set_cmd( &cmd, aGenRandom); break;
*** empty log message ***
1998-09-11 05:47:32 +00: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 16:00:17 +00:00
case aUpdateTrustDB: set_cmd( &cmd, aUpdateTrustDB); break;
a new release
1998-10-07 13:30:43 +00:00
case aFixTrustDB: set_cmd( &cmd, aFixTrustDB); break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case aListTrustPath: set_cmd( &cmd, aListTrustPath); break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
case aDeArmor: set_cmd( &cmd, aDeArmor); break;
case aEnArmor: set_cmd( &cmd, aEnArmor); break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case aExportOwnerTrust: set_cmd( &cmd, aExportOwnerTrust); break;
case aImportOwnerTrust: set_cmd( &cmd, aImportOwnerTrust); break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aPipeMode: set_cmd( &cmd, aPipeMode); break;
case aRebuildKeydbCaches: set_cmd( &cmd, aRebuildKeydbCaches); break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oArmor: opt.armor = 1; opt.no_armor=0; break;
bug fix release
1998-08-11 17:29:34 +00:00
case oOutput: opt.outfile = pargs.r.ret_str; break;
some random changes
1998-10-25 19:00:01 +00:00
case oQuiet: opt.quiet = 1; break;
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
case oNoTTY: tty_no_terminal(1); break;
See ChangeLog: Thu Feb 25 18:47:39 CET 1999 Werner Koch
1999-02-25 17:51:55 +00:00
case oDryRun: opt.dry_run = 1; break;
See ChangeLog: Wed May 19 16:04:30 CEST 1999 Werner Koch
1999-05-19 14:12:26 +00:00
case oInteractive: opt.interactive = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oVerbose: g10_opt_verbose++;
opt.verbose++; opt.list_sigs=1; break;
bug fix release
1998-08-11 17:29:34 +00:00
case oKOption: set_cmd( &cmd, aKMode ); break;
removed g10maint.c
1998-03-05 09:22:13 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oBatch: opt.batch = 1; nogreeting = 1; break;
case oUseAgent:
#ifndef __riscos__
opt.use_agent = 1;
#else /* __riscos__ */
opt.use_agent = 0;
not_implemented("use-agent");
#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 05:47:32 +00: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;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oShowKeyring: opt.show_keyring = 1; break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oDebug: opt.debug |= pargs.r.ret_ulong; break;
case oDebugAll: opt.debug = ~0; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oStatusFD:
set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) );
break;
#ifdef __riscos__
case oStatusFile:
set_status_fd( iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) );
break;
#endif /* __riscos__ */
case oAttributeFD:
set_attrib_fd(iobuf_translate_file_handle (pargs.r.ret_int, 1));
break;
#ifdef __riscos__
case oAttributeFile:
set_attrib_fd(iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) );
break;
#endif /* __riscos__ */
case oLoggerFD:
log_set_logfile( NULL,
iobuf_translate_file_handle (pargs.r.ret_int, 1) );
break;
#ifdef __riscos__
case oLoggerFile:
log_set_logfile( NULL,
iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) );
break;
#endif /* __riscos__ */
See ChangeLog: Thu Jul 8 16:21:27 CEST 1999 Werner Koch
1999-07-08 14:24:35 +00:00
case oWithFingerprint:
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.with_fingerprint = 1;
with_fpr=1; /*fall thru*/
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oFingerprint: opt.fingerprint++; break;
case oSecretKeyring: append_to_strlist( &sec_nrings, pargs.r.ret_str); break;
case oOptions:
added option file handling
1997-12-12 12:03:58 +00:00
/* config files may not be nested (silently ignore them) */
if( !configfp ) {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(configname);
configname = m_strdup(pargs.r.ret_str);
added option file handling
1997-12-12 12:03:58 +00:00
goto next_pass;
}
break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oNoArmor: opt.no_armor=1; opt.armor=0; break;
case oNoDefKeyring: default_keyring = 0; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oDefCertCheckLevel: opt.def_cert_check_level=pargs.r.ret_int; break;
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 17:47:23 +00:00
case oNoGreeting: nogreeting = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oNoVerbose: g10_opt_verbose = 0;
opt.verbose = 0; opt.list_sigs=0; break;
case oQuickRandom: quick_random_gen(1); break;
case oSKComments: opt.sk_comments=1; break;
case oNoSKComments: opt.sk_comments=0; break;
See ChangeLog: Wed Feb 10 17:15:39 CET 1999 Werner Koch
1999-02-10 16:22:40 +00:00
case oNoVersion: opt.no_version=1; break;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
case oEmitVersion: opt.no_version=0; break;
*** empty log message ***
1998-09-11 05:47:32 +00: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 19:41:41 +00:00
case oMaxCertDepth: opt.max_cert_depth = pargs.r.ret_int; break;
*** empty log message ***
1998-09-11 05:47:32 +00: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 15:41:14 +00:00
case oDefRecipient:
if( *pargs.r.ret_str )
opt.def_recipient = make_username(pargs.r.ret_str);
break;
case oDefRecipientSelf:
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(opt.def_recipient); opt.def_recipient = NULL;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
opt.def_recipient_self = 1;
break;
case oNoDefRecipient:
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(opt.def_recipient); opt.def_recipient = NULL;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
opt.def_recipient_self = 0;
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */
case oHomedir: break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oNoBatch: opt.batch = 0; break;
See ChangeLog: Tue Jun 8 13:36:25 CEST 1999 Werner Koch
1999-06-08 11:41:46 +00:00
case oWithKeyData: opt.with_key_data=1; /* fall thru */
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oWithColons: opt.with_colons=':'; break;
case oSkipVerify: opt.skip_verify=1; break;
case oCompressAlgo: opt.def_compress_algo = pargs.r.ret_int; break;
case oCompressKeys: opt.compress_keys = 1; break;
case aListSecretKeys: set_cmd( &cmd, aListSecretKeys); break;
case oAlwaysTrust: opt.always_trust = 1; break;
last local commit
1998-10-16 16:00:17 +00:00
case oLoadExtension:
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifndef __riscos__
* g10.c (main) [__MINGW32__]: Activate oLoadExtension.
2002-09-13 07:52:45 +00:00
#if defined(USE_DYNAMIC_LINKING) || defined(__MINGW32__)
* 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 15:53:15 +00:00
if(check_permissions(pargs.r.ret_str,2))
log_info(_("cipher extension \"%s\" not loaded due to "
"unsafe permissions\n"),pargs.r.ret_str);
else
register_cipher_extension(orig_argc? *orig_argv:NULL,
pargs.r.ret_str);
#endif
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#else /* __riscos__ */
not_implemented("load-extension");
#endif /* __riscos__ */
last local commit
1998-10-16 16:00:17 +00:00
break;
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 17:36:05 +00:00
case oRFC1991:
opt.rfc1991 = 1;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
opt.rfc2440 = 0;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.force_v4_certs = 0;
* encode.c (encode_simple): Fix problem with using compression algo 2 and symmetric compressed files. * encode.c (encode_simple, encode_crypt): If we are not using a MDC, compress even if a file is already compressed. This is to help against the chosen ciphertext attack. * pkclist.c (select_algo_from_prefs): Fix requested algorithm bug so the request succeeds even if the requested algorithm is not the first found. * cipher.c (write_header), encode.c (use_mdc, encode_simple, encode_crypt, encrypt_filter), g10.c (main): Be more eager to use a MDC. We use a MDC if the keys directly support it, if the keys list AES (any) or TWOFISH anywhere in the prefs, or if the cipher chosen does not have a 64 bit blocksize.
2002-08-13 19:00:23 +00:00
opt.disable_mdc = 1;
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 17:36:05 +00:00
opt.escape_from = 1;
break;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
case oOpenPGP:
* encode.c (encode_simple): Fix problem with using compression algo 2 and symmetric compressed files. * encode.c (encode_simple, encode_crypt): If we are not using a MDC, compress even if a file is already compressed. This is to help against the chosen ciphertext attack. * pkclist.c (select_algo_from_prefs): Fix requested algorithm bug so the request succeeds even if the requested algorithm is not the first found. * cipher.c (write_header), encode.c (use_mdc, encode_simple, encode_crypt, encrypt_filter), g10.c (main): Be more eager to use a MDC. We use a MDC if the keys directly support it, if the keys list AES (any) or TWOFISH anywhere in the prefs, or if the cipher chosen does not have a 64 bit blocksize.
2002-08-13 19:00:23 +00:00
/* TODO: When 2440bis becomes a RFC, these may need
changing. */
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
opt.rfc1991 = 0;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
opt.rfc2440 = 1;
* encode.c (encode_simple): Fix problem with using compression algo 2 and symmetric compressed files. * encode.c (encode_simple, encode_crypt): If we are not using a MDC, compress even if a file is already compressed. This is to help against the chosen ciphertext attack. * pkclist.c (select_algo_from_prefs): Fix requested algorithm bug so the request succeeds even if the requested algorithm is not the first found. * cipher.c (write_header), encode.c (use_mdc, encode_simple, encode_crypt, encrypt_filter), g10.c (main): Be more eager to use a MDC. We use a MDC if the keys directly support it, if the keys list AES (any) or TWOFISH anywhere in the prefs, or if the cipher chosen does not have a 64 bit blocksize.
2002-08-13 19:00:23 +00:00
opt.disable_mdc = 1;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 17:34:53 +00:00
opt.pgp2_workarounds = 0;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
opt.escape_from = 0;
opt.force_v3_sigs = 0;
opt.compress_keys = 0; /* not mandated but we do it */
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 13:46:34 +00:00
opt.cert_digest_algo = 0;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
opt.def_compress_algo = 1;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.s2k_mode = 3; /* iterated+salted */
opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oPGP2: opt.pgp2 = 1; break;
case oNoPGP2: opt.pgp2 = 0; break;
case oPGP6: opt.pgp6 = 1; break;
case oNoPGP6: opt.pgp6 = 0; break;
case oPGP7: opt.pgp7 = 1; break;
case oNoPGP7: opt.pgp7 = 0; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case oEmuMDEncodeBug: opt.emulate_bugs |= EMUBUG_MDENCODE; break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oCompressSigs: opt.compress_sigs = 1; break;
case oRunAsShmCP:
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#ifndef __riscos__
Cleanups and minor fixes.
2002-09-10 08:40:12 +00:00
# ifndef USE_SHM_COPROCESSING
*** empty log message ***
1998-09-28 19:25:31 +00:00
/* not possible in the option file,
* but we print the warning here anyway */
add coprocess facility
1998-07-31 16:45:58 +00:00
log_error("shared memory coprocessing is not available\n");
Cleanups and minor fixes.
2002-09-10 08:40:12 +00:00
# endif
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
#else /* __riscos__ */
not_implemented("run-as-shm-coprocess");
#endif /* __riscos__ */
add coprocess facility
1998-07-31 16:45:58 +00:00
break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oSetFilename: opt.set_filename = pargs.r.ret_str; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oForYourEyesOnly: eyes_only = 1; break;
case oNoForYourEyesOnly: eyes_only = 0; break;
case oSetPolicyURL:
add_policy_url(pargs.r.ret_str,0);
add_policy_url(pargs.r.ret_str,1);
break;
case oSigPolicyURL: add_policy_url(pargs.r.ret_str,0); break;
case oCertPolicyURL: add_policy_url(pargs.r.ret_str,1); break;
case oShowPolicyURL: opt.show_policy_url=1; break;
case oNoShowPolicyURL: opt.show_policy_url=0; break;
See ChangeLog: Tue Jun 1 16:01:46 CEST 1999 Werner Koch
1999-06-01 14:08:57 +00:00
case oUseEmbeddedFilename: opt.use_embedded_filename = 1; break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oComment: opt.comment_string = pargs.r.ret_str; break;
See ChangeLog: Tue Jun 15 14:23:10 CEST 1999 Werner Koch
1999-06-15 12:31:07 +00:00
case oDefaultComment: opt.comment_string = NULL; break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oThrowKeyid: opt.throw_keyid = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oShowPhotos: opt.show_photos = 1; break;
case oNoShowPhotos: opt.show_photos = 0; break;
case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
Snapshot release 0.4.2
1998-10-18 15:21:22 +00:00
case oForceV3Sigs: opt.force_v3_sigs = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 15:53:01 +00:00
case oForceMDC: opt.force_mdc = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 19:25:31 +00:00
case oS2KMode: opt.s2k_mode = pargs.r.ret_int; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oS2KDigest: s2k_digest_string = m_strdup(pargs.r.ret_str); break;
case oS2KCipher: s2k_cipher_string = m_strdup(pargs.r.ret_str); break;
case oSimpleSKChecksum: opt.simple_sk_checksum = 1; break;
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
1999-02-19 14:54:00 +00:00
case oNoEncryptTo: opt.no_encrypt_to = 1; break;
See ChangeLog: Tue Feb 16 14:10:02 CET 1999 Werner Koch
1999-02-16 13:16:33 +00: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 10:53:35 +00: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 13:16:33 +00:00
sl->flags = 1;
break;
See ChangeLog: Sun Jan 24 18:16:26 CET 1999 Werner Koch
1999-01-24 17:16:40 +00:00
case oRecipient: /* store the recipient */
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 10:53:35 +00:00
add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
any_explicit_recipient = 1;
*** empty log message ***
1998-09-11 05:47:32 +00:00
break;
(Does not compile yet)
1998-11-03 19:38:58 +00:00
case oTextmodeShort: opt.textmode = 2; break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oTextmode: opt.textmode=1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oExpert: opt.expert = 1; break;
case oNoExpert: opt.expert = 0; break;
case oAskSigExpire: opt.ask_sig_expire = 1; break;
case oNoAskSigExpire: opt.ask_sig_expire = 0; break;
case oAskCertExpire: opt.ask_cert_expire = 1; break;
case oNoAskCertExpire: opt.ask_cert_expire = 0; break;
*** empty log message ***
1998-09-11 05:47:32 +00:00
case oUser: /* store the local users */
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 10:53:35 +00:00
add_to_strlist2( &locusr, pargs.r.ret_str, utf8_strings );
*** empty log message ***
1998-09-11 05:47:32 +00:00
break;
case oCompress: opt.compress = pargs.r.ret_int; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oPasswdFD:
pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0);
break;
#ifdef __riscos__
case oPasswdFile:
pwfd = iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 0), 0);
break;
#endif /* __riscos__ */
case oCommandFD:
opt.command_fd = iobuf_translate_file_handle (pargs.r.ret_int, 0);
break;
#ifdef __riscos__
case oCommandFile:
opt.command_fd = iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 0), 0);
break;
#endif /* __riscos__ */
case oCipherAlgo: def_cipher_string = m_strdup(pargs.r.ret_str); break;
case oDigestAlgo: def_digest_string = m_strdup(pargs.r.ret_str); break;
case oCertDigestAlgo: cert_digest_string = m_strdup(pargs.r.ret_str); break;
case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break;
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 16:48:21 +00:00
case oNoMDCWarn: opt.no_mdc_warn=1; break;
* 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 10:59:04 +00:00
case oCharset:
Some bug fixes of the last release
1998-11-10 12:59:59 +00:00
if( set_native_charset( pargs.r.ret_str ) )
log_error(_("%s is not a valid character set\n"),
pargs.r.ret_str);
break;
Expiration time works (I hope so)
1998-11-20 17:42:18 +00:00
case oNotDashEscaped: opt.not_dash_escaped = 1; break;
See ChangeLog: Thu Dec 17 18:31:15 CET 1998 Werner Koch
1998-12-17 17:36:05 +00:00
case oEscapeFrom: opt.escape_from = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oNoEscapeFrom: opt.escape_from = 0; break;
See ChangeLog: Fri Nov 27 21:37:41 CET 1998 Werner Koch
1998-11-27 20:40:56 +00:00
case oLockOnce: opt.lock_once = 1; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case oLockNever: disable_dotlock(); break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oLockMultiple:
#ifndef __riscos__
opt.lock_once = 0;
#else /* __riscos__ */
not_implemented("lock-multiple");
#endif /* __riscos__ */
break;
case oKeyServer:
* options.h, g10.c (main), keyserver.c (keyserver_refresh): Maintain and use the original keyserver URI for cosmetics rather than trying to recreate it when needed. * mainproc.c (check_sig_and_print): Properly disregard expired uids. Make sure that the first uid listed is a real uid and not an attribute (attributes should only be listed in the "aka" section). When there are no valid textual userids, try for an invalid textual userid before using any attribute uid.
2002-07-02 22:13:00 +00:00
opt.keyserver_uri=m_strdup(pargs.r.ret_str);
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if(parse_keyserver_uri(pargs.r.ret_str,configname,configlineno))
log_error(_("could not parse keyserver URI\n"));
break;
case oKeyServerOptions:
parse_keyserver_options(pargs.r.ret_str);
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-22 22:26:14 +00:00
case oImportOptions:
if(!parse_import_options(pargs.r.ret_str,&opt.import_options))
{
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 19:07:21 +00:00
case oExportOptions:
if(!parse_export_options(pargs.r.ret_str,&opt.export_options))
{
if(configname)
log_error(_("%s:%d: invalid export options\n"),
configname,configlineno);
else
log_error(_("invalid export options\n"));
}
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oTempDir: opt.temp_dir=pargs.r.ret_str; break;
case oExecPath:
* 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 19:24:08 +00:00
if(set_exec_path(pargs.r.ret_str,0))
* 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 04:01:21 +00: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 19:24:08 +00:00
else
opt.exec_path_set=1;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
break;
case oNotation:
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;
case oShowNotation: opt.show_notation=1; break;
case oNoShowNotation: opt.show_notation=0; break;
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 10:53:35 +00:00
case oUtf8Strings: utf8_strings = 1; break;
case oNoUtf8Strings: utf8_strings = 0; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 08:16:46 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 08:16:46 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 17:34:53 +00:00
case oAllowNonSelfsignedUID: opt.allow_non_selfsigned_uid = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 14:35:34 +00:00
case oAllowFreeformUID: opt.allow_freeform_uid = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oNoAllowFreeformUID: opt.allow_freeform_uid = 0; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00: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 13:46:34 +00:00
case oHonorHttpProxy:
opt.keyserver_options.honor_http_proxy = 1;
deprecated_warning(configname,configlineno,
"--honor-http-proxy",
"--keyserver-options ",
"honor-http-proxy");
break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case oFastListMode: opt.fast_list_mode = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oFixedListMode: opt.fixed_list_mode = 1; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00: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 13:46:34 +00: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 17:57:53 +00:00
case oIgnoreMDCError: opt.ignore_mdc_error = 1; break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case oNoRandomSeedFile: use_random_seed = 0; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oAutoKeyRetrieve:
case oNoAutoKeyRetrieve:
opt.keyserver_options.auto_key_retrieve=
(pargs.r_opt==oAutoKeyRetrieve);
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;
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00:00
case oMergeOnly: opt.merge_only = 1; break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case oAllowSecretKeyImport: /* obsolete */ break;
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00: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 13:46:34 +00: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;
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;
Some bug fixes of the last release
1998-11-10 12:59:59 +00:00
default : pargs.err = configfp? 1:2; break;
initially checkin
1997-11-18 14:06:00 +00:00
}
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
added option file handling
1997-12-12 12:03:58 +00:00
if( configfp ) {
fclose( configfp );
configfp = NULL;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(configname); configname = NULL;
added option file handling
1997-12-12 12:03:58 +00:00
goto next_pass;
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free( configname ); configname = NULL;
added option export
1998-02-13 20:58:50 +00:00
if( log_get_errorcount(0) )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10_exit(2);
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 17:47:23 +00:00
if( nogreeting )
greeting = 0;
added option file handling
1997-12-12 12:03:58 +00:00
bug fixes
1998-02-11 23:22:09 +00:00
if( greeting ) {
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
1999-02-19 14:54:00 +00:00
fprintf(stderr, "%s %s; %s\n",
strusage(11), strusage(13), strusage(14) );
fprintf(stderr, "%s\n", strusage(15) );
bug fixes
1998-02-11 23:22:09 +00:00
}
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
#ifdef IS_DEVELOPMENT_VERSION
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
if( !opt.batch ) {
log_info("NOTE: THIS IS A DEVELOPMENT VERSION!\n");
log_info("It is only intended for test purposes and should NOT be\n");
log_info("used in a production environment or with production keys!\n");
See ChangeLog: Wed Jul 14 19:42:08 CEST 1999 Werner Koch
1999-07-14 17:47:23 +00:00
}
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
#endif
See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch
2000-09-18 14:35:34 +00: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 10:59:04 +00: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 14:35:34 +00: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 13:46:34 +00:00
if (eyes_only) {
if (opt.set_filename)
log_info(_("WARNING: %s overrides %s\n"),
"--for-your-eyes-only","--set-filename");
opt.set_filename="_CONSOLE";
}
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 07:44:46 +00: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 13:46:34 +00: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 07:44:46 +00:00
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 07:44:46 +00: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 08:18:52 +00:00
if( opt.batch )
tty_batchmode( 1 );
bug fixes
1998-02-11 23:22:09 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
secmem_set_flags( secmem_get_flags() & ~2 ); /* resume warnings */
Ready to test version 0.2.0
1998-01-25 18:56:33 +00:00
initially checkin
1997-11-18 14:06:00 +00:00
set_debug();
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10_opt_homedir = opt.homedir;
/* Do these after the switch(), so they can override settings. */
if(opt.pgp2 && (opt.pgp6 || opt.pgp7))
log_error(_("%s not allowed with %s!\n"),
"--pgp2",opt.pgp6?"--pgp6":"--pgp7");
else
{
if(opt.pgp2)
{
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))
{
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). */
if(check_cipher_algo(CIPHER_ALGO_IDEA))
{
log_info(_("encrypting a message in --pgp2 mode requires "
"the IDEA cipher\n"));
idea_cipher_warn(1);
unusable=1;
}
else if(cmd==aSym)
{
m_free(def_cipher_string);
def_cipher_string = m_strdup("idea");
}
}
if(unusable)
{
* 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 17:38:04 +00:00
log_info(_("this message may not be usable by %s\n"),
"PGP 2.x");
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.pgp2=0;
}
else
{
opt.rfc1991 = 1;
opt.rfc2440 = 0;
opt.force_mdc = 0;
opt.disable_mdc = 1;
opt.force_v4_certs = 0;
opt.sk_comments = 0;
opt.escape_from = 1;
opt.force_v3_sigs = 1;
opt.pgp2_workarounds = 1;
opt.ask_sig_expire = 0;
opt.ask_cert_expire = 0;
m_free(def_digest_string);
def_digest_string = m_strdup("md5");
opt.def_compress_algo = 1;
}
}
if(opt.pgp6 || opt.pgp7)
{
opt.sk_comments=0;
opt.escape_from=1;
opt.force_v3_sigs=1;
opt.ask_sig_expire=0;
opt.def_compress_algo=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-22 22:26:14 +00:00
if(opt.pgp6) /* pgp7 has MDC */
{
opt.force_mdc=0;
opt.disable_mdc=1;
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
}
}
fixed severe exploit
1998-07-09 13:37:17 +00: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 17:34:53 +00:00
* may try to load an module */
fixed severe exploit
1998-07-09 13:37:17 +00:00
if( def_cipher_string ) {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.def_cipher_algo = string_to_cipher_algo(def_cipher_string);
if(opt.def_cipher_algo==0 &&
ascii_strcasecmp(def_cipher_string,"idea")==0)
idea_cipher_warn(1);
m_free(def_cipher_string); def_cipher_string = NULL;
if( check_cipher_algo(opt.def_cipher_algo) )
intermediate check in
1998-08-05 16:51:59 +00:00
log_error(_("selected cipher algorithm is invalid\n"));
fixed severe exploit
1998-07-09 13:37:17 +00:00
}
if( def_digest_string ) {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.def_digest_algo = string_to_digest_algo(def_digest_string);
m_free(def_digest_string); def_digest_string = NULL;
if( check_digest_algo(opt.def_digest_algo) )
intermediate check in
1998-08-05 16:51:59 +00:00
log_error(_("selected digest algorithm is invalid\n"));
fixed severe exploit
1998-07-09 13:37:17 +00:00
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if( cert_digest_string ) {
opt.cert_digest_algo = string_to_digest_algo(cert_digest_string);
m_free(cert_digest_string); cert_digest_string = NULL;
if( check_digest_algo(opt.cert_digest_algo) )
log_error(_("selected certification digest algorithm is invalid\n"));
}
*** empty log message ***
1998-09-28 19:25:31 +00:00
if( s2k_cipher_string ) {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.s2k_cipher_algo = string_to_cipher_algo(s2k_cipher_string);
m_free(s2k_cipher_string); s2k_cipher_string = NULL;
if( check_cipher_algo(opt.s2k_cipher_algo) )
*** empty log message ***
1998-09-28 19:25:31 +00:00
log_error(_("selected cipher algorithm is invalid\n"));
}
if( s2k_digest_string ) {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.s2k_digest_algo = string_to_digest_algo(s2k_digest_string);
m_free(s2k_digest_string); s2k_digest_string = NULL;
if( check_digest_algo(opt.s2k_digest_algo) )
*** empty log message ***
1998-09-28 19:25:31 +00:00
log_error(_("selected digest algorithm is invalid\n"));
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if( opt.def_compress_algo < -1 || opt.def_compress_algo > 2 )
log_error(_("compress algorithm must be in range %d..%d\n"), 0, 2);
intermediate check in
1998-08-05 16:51:59 +00:00
if( opt.completes_needed < 1 )
log_error(_("completes-needed must be greater than 0\n"));
if( opt.marginals_needed < 2 )
log_error(_("marginals-needed must be greater than 1\n"));
See ChangeLog ;-). Key validation should now be faster
1998-11-13 19:41:41 +00:00
if( opt.max_cert_depth < 1 || opt.max_cert_depth > 255 )
log_error(_("max-cert-depth must be in range 1 to 255\n"));
*** empty log message ***
1998-09-28 19:25:31 +00:00
switch( opt.s2k_mode ) {
*** empty log message ***
1998-09-29 16:15:15 +00:00
case 0:
Some bug fixes of the last release
1998-11-10 12:59:59 +00:00
log_info(_("NOTE: simple S2K mode (0) is strongly discouraged\n"));
*** empty log message ***
1998-09-29 16:15:15 +00:00
break;
case 1: case 3: break;
*** empty log message ***
1998-09-28 19:25:31 +00:00
default:
log_error(_("invalid S2K mode; must be 0, 1 or 3\n"));
}
intermediate check in
1998-08-05 16:51:59 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if(opt.def_cert_check_level<0 || opt.def_cert_check_level>3)
log_error(_("invalid default-check-level; must be 0, 1, 2, or 3\n"));
/* This isn't actually needed, but does serve to error out if the
string is invalid. */
if(opt.def_preference_list &&
keygen_set_std_prefs(opt.def_preference_list,0))
log_error(_("invalid default preferences\n"));
/* We provide defaults for the personal digest list */
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 12:20:53 +00:00
fixed severe exploit
1998-07-09 13:37:17 +00:00
if( log_get_errorcount(0) )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10_exit(2);
fixed severe exploit
1998-07-09 13:37:17 +00:00
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
/* set the random seed file */
if( use_random_seed ) {
char *p = make_filename(opt.homedir, "random_seed", NULL );
set_random_seed_file(p);
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(p);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
}
if( !cmd && opt.fingerprint && !with_fpr ) {
partial DSA support
1998-03-09 21:44:06 +00:00
set_cmd( &cmd, aListKeys);
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
}
partial DSA support
1998-03-09 21:44:06 +00:00
NT version compiles
1998-01-05 19:13:15 +00: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 13:46:34 +00:00
g10_opt_verbose = opt.verbose;
NT version compiles
1998-01-05 19:13:15 +00:00
}
removed g10maint.c
1998-03-05 09:22:13 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
/* Compression algorithm 0 means no compression at all */
if( opt.def_compress_algo == 0)
opt.compress = 0;
partial DSA support
1998-03-09 21:44:06 +00:00
removed g10maint.c
1998-03-05 09:22:13 +00:00
/* kludge to let -sat generate a clear text signature */
(Does not compile yet)
1998-11-03 19:38:58 +00:00
if( opt.textmode == 2 && !detached_sig && opt.armor && cmd == aSign )
removed g10maint.c
1998-03-05 09:22:13 +00:00
cmd = aClearsign;
initially checkin
1997-11-18 14:06:00 +00:00
if( opt.verbose > 1 )
set_packet_list_mode(1);
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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
case the secrings are stored on a floppy */
partial DSA support
1998-03-09 21:44:06 +00:00
if( cmd != aDeArmor && cmd != aEnArmor
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
&& !(cmd == aKMode && argc == 2 ) )
{
if (cmd != aCheckKeys && cmd != aListSigs && cmd != aListKeys
&& cmd != aVerify && cmd != aVerifyFiles
&& cmd != aSym)
{
if (!sec_nrings || default_keyring) /* add default secret rings */
keydb_add_resource ("secring" EXTSEP_S "gpg", 0, 1);
for (sl = sec_nrings; sl; sl = sl->next)
keydb_add_resource ( sl->d, 0, 1 );
}
if( !nrings || default_keyring ) /* add default ring */
keydb_add_resource ("pubring" EXTSEP_S "gpg", 0, 0);
fixed severe exploit
1998-07-09 13:37:17 +00:00
for(sl = nrings; sl; sl = sl->next )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
keydb_add_resource ( sl->d, 0, 0 );
}
fixed severe exploit
1998-07-09 13:37:17 +00:00
FREE_STRLIST(nrings);
FREE_STRLIST(sec_nrings);
initially checkin
1997-11-18 14:06:00 +00:00
*** empty log message ***
1998-09-28 19:25:31 +00:00
if( pwfd != -1 ) /* read the passphrase now. */
read_passphrase_from_fd( pwfd );
fname = argc? *argv : NULL;
initially checkin
1997-11-18 14:06:00 +00:00
removed g10maint.c
1998-03-05 09:22:13 +00:00
switch( cmd ) {
case aPrimegen:
new release
1998-05-15 18:49:19 +00:00
case aPrintMD:
removed g10maint.c
1998-03-05 09:22:13 +00:00
case aPrintMDs:
case aGenRandom:
case aDeArmor:
case aEnArmor:
a new release
1998-10-07 13:30:43 +00:00
case aFixTrustDB:
removed g10maint.c
1998-03-05 09:22:13 +00:00
break;
partial DSA support
1998-03-09 21:44:06 +00:00
case aKMode:
case aListKeys:
*** empty log message ***
1998-05-29 11:53:54 +00:00
case aListSecretKeys:
partial DSA support
1998-03-09 21:44:06 +00:00
case aCheckKeys:
*** empty log message ***
1998-05-29 11:53:54 +00:00
if( opt.with_colons ) /* need this to list the trust */
See ChangeLog: Thu Mar 11 16:39:46 CET 1999 Werner Koch
1999-03-11 15:42:06 +00:00
rc = setup_trustdb(1, trustdb_name );
partial DSA support
1998-03-09 21:44:06 +00:00
break;
See ChangeLog: Thu Mar 11 16:39:46 CET 1999 Werner Koch
1999-03-11 15:42:06 +00: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 09:22:13 +00:00
}
added some trust model stuff
1998-01-16 21:15:24 +00:00
if( rc )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
log_error(_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
switch (cmd) {
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;
}
started with trust stuff
1998-01-12 10:18:17 +00:00
NT version compiles
1998-01-05 19:13:15 +00:00
switch( cmd ) {
initially checkin
1997-11-18 14:06:00 +00:00
case aStore: /* only store the file */
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 18:54:31 +00:00
wrong_args(_("--store [filename]"));
initially checkin
1997-11-18 14:06:00 +00:00
if( (rc = encode_store(fname)) )
sync
1998-07-14 17:10:28 +00:00
log_error_f( print_fname_stdin(fname),
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
"store failed: %s\n", g10_errstr(rc) );
initially checkin
1997-11-18 14:06:00 +00:00
break;
case aSym: /* encrypt the given file only with the symmetric cipher */
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 18:54:31 +00:00
wrong_args(_("--symmetric [filename]"));
initially checkin
1997-11-18 14:06:00 +00:00
if( (rc = encode_symmetric(fname)) )
sync
1998-07-14 17:10:28 +00:00
log_error_f(print_fname_stdin(fname),
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
"symmetric encryption failed: %s\n",g10_errstr(rc) );
initially checkin
1997-11-18 14:06:00 +00:00
break;
case aEncr: /* encrypt the given file */
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 18:54:31 +00:00
wrong_args(_("--encrypt [filename]"));
initially checkin
1997-11-18 14:06:00 +00:00
if( (rc = encode_crypt(fname,remusr)) )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
log_error("%s: encryption failed: %s\n", print_fname_stdin(fname), g10_errstr(rc) );
IDEA removed, signing works
1997-11-24 11:04:11 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aEncrFiles: /* encrypt the given files */
encode_crypt_files(argc, argv, remusr);
break;
IDEA removed, signing works
1997-11-24 11:04:11 +00:00
case aSign: /* sign the given file */
*** empty log message ***
1998-01-13 19:04:23 +00: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 18:54:31 +00:00
wrong_args(_("--sign [filename]"));
*** empty log message ***
1998-01-13 19:04:23 +00:00
if( argc ) {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
sl = m_alloc_clear( sizeof *sl + strlen(fname));
*** empty log message ***
1998-01-13 19:04:23 +00: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 13:46:34 +00:00
log_error("signing failed: %s\n", g10_errstr(rc) );
*** empty log message ***
1998-01-13 19:04:23 +00:00
free_strlist(sl);
IDEA removed, signing works
1997-11-24 11:04:11 +00:00
break;
case aSignEncr: /* sign and encrypt the given file */
Sylvester Version
1997-12-31 12:32:54 +00:00
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 18:54:31 +00:00
wrong_args(_("--sign --encrypt [filename]"));
*** empty log message ***
1998-01-13 19:04:23 +00:00
if( argc ) {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
sl = m_alloc_clear( sizeof *sl + strlen(fname));
*** empty log message ***
1998-01-13 19:04:23 +00:00
strcpy(sl->d, fname);
}
else
sl = NULL;
if( (rc = sign_file(sl, detached_sig, locusr, 1, remusr, NULL)) )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
log_error("%s: sign+encrypt failed: %s\n", print_fname_stdin(fname), g10_errstr(rc) );
*** empty log message ***
1998-01-13 19:04:23 +00:00
free_strlist(sl);
initially checkin
1997-11-18 14:06:00 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 18:54:31 +00: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 13:46:34 +00:00
log_error("%s: clearsign failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
partial DSA support
1998-03-09 21:44:06 +00:00
break;
case aVerify:
if( (rc = verify_signatures( argc, argv ) ))
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
log_error("verify signatures failed: %s\n", g10_errstr(rc) );
partial DSA support
1998-03-09 21:44:06 +00:00
break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case aVerifyFiles:
if( (rc = verify_files( argc, argv ) ))
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
log_error("verify files failed: %s\n", g10_errstr(rc) );
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
break;
partial DSA support
1998-03-09 21:44:06 +00:00
case aDecrypt:
if( argc > 1 )
wrong_args(_("--decrypt [filename]"));
if( (rc = decrypt_message( fname ) ))
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
log_error("decrypt_message failed: %s\n", g10_errstr(rc) );
armor rewritten, but still buggy
1998-02-04 18:54:31 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aDecryptFiles:
decrypt_messages(argc, argv);
break;
added some stuff for signing keys
1997-12-16 19:15:09 +00:00
case aSignKey: /* sign the key given as argument */
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
if( argc != 1 )
wrong_args(_("--sign-key user-id"));
username = make_username( fname );
keyedit_menu(fname, locusr, NULL, 1 );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(username);
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
break;
case aLSignKey:
if( argc != 1 )
wrong_args(_("--lsign-key user-id"));
username = make_username( fname );
keyedit_menu(fname, locusr, NULL, 2 );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(username);
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aNRSignKey:
if( argc != 1 )
wrong_args(_("--nrsign-key user-id"));
username = make_username( fname );
keyedit_menu(fname, locusr, NULL, 3 );
m_free(username);
break;
case aNRLSignKey:
if( argc != 1 )
wrong_args(_("--nrlsign-key user-id"));
username = make_username( fname );
keyedit_menu(fname, locusr, NULL, 4 );
m_free(username);
break;
intermediate release
1998-07-06 10:23:57 +00:00
case aEditKey: /* Edit a key signature */
Expiration time works (I hope so)
1998-11-20 17:42:18 +00:00
if( !argc )
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
wrong_args(_("--edit-key user-id [commands]"));
username = make_username( fname );
Expiration time works (I hope so)
1998-11-20 17:42:18 +00: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 16:49:22 +00:00
append_to_strlist( &sl, *argv );
keyedit_menu( username, locusr, sl, 0 );
Expiration time works (I hope so)
1998-11-20 17:42:18 +00:00
free_strlist(sl);
}
else
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
keyedit_menu(username, locusr, NULL, 0 );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(username);
Bug in blowfish behoben
1998-01-06 21:01:36 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 08:43:28 +00:00
break;
added option export
1998-02-13 20:58:50 +00:00
case aCheckKeys:
partial DSA support
1998-03-09 21:44:06 +00: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 17:34:53 +00: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 11:53:54 +00:00
break;
case aListSecretKeys:
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00: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 21:44:06 +00:00
break;
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 12:57:54 +00: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 17:34:53 +00: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 21:44:06 +00:00
else if( argc == 2 ) { /* -kv userid keyring */
if( access( argv[1], R_OK ) ) {
log_error(_("can't open %s: %s\n"),
print_fname_stdin(argv[1]), strerror(errno));
NT version compiles
1998-01-05 19:13:15 +00:00
}
added option export
1998-02-13 20:58:50 +00:00
else {
partial DSA support
1998-03-09 21:44:06 +00:00
/* add keyring (default keyrings are not registered in this
* special case */
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
keydb_add_resource( argv[1], 0, 0 );
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00: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 20:58:50 +00:00
}
NT version compiles
1998-01-05 19:13:15 +00:00
}
else
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
1999-07-26 07:44:46 +00:00
wrong_args(_("-k[v][v][v][c] [user-id] [keyring]") );
NT version compiles
1998-01-05 19:13:15 +00:00
break;
added some stuff for signing keys
1997-12-16 19:15:09 +00:00
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
case aKeygen: /* generate a key */
if( opt.batch ) {
if( argc > 1 )
wrong_args("--gen-key [parameterfile]");
generate_keypair( argc? *argv : NULL );
}
else {
if( argc )
wrong_args("--gen-key");
generate_keypair(NULL);
}
initially checkin
1997-11-18 14:06:00 +00:00
break;
some random changes
1998-10-25 19:00:01 +00:00
case aFastImport:
added some trust model stuff
1998-01-16 21:15:24 +00:00
case aImport:
* main.h, import.c (parse_import_options, fix_hkp_corruption, import_one, delete_inv_parts), g10.c (main): New import-option "repair-hkp-subkey-bug", which repairs as much as possible the HKP mangling multiple subkeys bug. It is on by default for keyserver receives, and off by default for regular --import. * main.h, import.c (import, import_one, delete_inv_parts), hkp.c (hkp_ask_import), keyserver.c (keyserver_spawn): Use keyserver import options when doing keyserver receives.
2002-07-24 21:17:19 +00:00
import_keys( argc? argv:NULL, argc, (cmd == aFastImport),
NULL, opt.import_options );
added some trust model stuff
1998-01-16 21:15:24 +00:00
break;
added initial i18n stuff
1998-01-26 22:09:01 +00:00
case aExport:
See ChangeLog: Thu Dec 10 20:15:36 CET 1998 Werner Koch
1998-12-10 19:20:47 +00:00
case aExportAll:
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 18:37:41 +00:00
case aSendKeys:
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
1999-03-20 10:53:39 +00:00
case aRecvKeys:
added initial i18n stuff
1998-01-26 22:09:01 +00:00
sl = NULL;
for( ; argc; argc--, argv++ )
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 12:57:54 +00:00
add_to_strlist2( &sl, *argv, utf8_strings );
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 18:37:41 +00:00
if( cmd == aSendKeys )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
keyserver_export( sl );
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
1999-03-20 10:53:39 +00:00
else if( cmd == aRecvKeys )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
keyserver_import( sl );
See ChangeLog: Tue Jan 19 19:34:58 CET 1999 Werner Koch
1999-01-19 18:37:41 +00:00
else
* 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 19:07:21 +00:00
export_pubkeys( sl, opt.export_options );
added initial i18n stuff
1998-01-26 22:09:01 +00:00
free_strlist(sl);
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aSearchKeys:
sl = NULL;
for( ; argc; argc--, argv++ )
append_to_strlist2( &sl, *argv, utf8_strings );
keyserver_search( sl );
free_strlist(sl);
break;
case aRefreshKeys:
sl = NULL;
for( ; argc; argc--, argv++ )
add_to_strlist2( &sl, *argv, utf8_strings );
keyserver_refresh(sl);
free_strlist(sl);
break;
textual changes
1998-06-29 12:30:57 +00:00
case aExportSecret:
sl = NULL;
for( ; argc; argc--, argv++ )
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 12:57:54 +00:00
add_to_strlist2( &sl, *argv, utf8_strings );
textual changes
1998-06-29 12:30:57 +00:00
export_seckeys( sl );
free_strlist(sl);
break;
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00: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 20:05:02 +00: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 12:57:54 +00:00
username = make_username(*argv);
gen_revoke( username );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free( username );
break;
case aDesigRevoke:
if( argc != 1 )
wrong_args("--desig-revoke user-id");
username = make_username(*argv);
gen_desig_revoke( username );
m_free( username );
some import functionality
1998-02-16 20:05:02 +00:00
break;
removed g10maint.c
1998-03-05 09:22:13 +00: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 13:46:34 +00:00
log_error(_("dearmoring failed: %s\n"), g10_errstr(rc));
removed g10maint.c
1998-03-05 09:22:13 +00: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 13:46:34 +00:00
log_error(_("enarmoring failed: %s\n"), g10_errstr(rc));
removed g10maint.c
1998-03-05 09:22:13 +00:00
break;
case aPrimegen:
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
{ int mode = argc < 2 ? 0 : atoi(*argv);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00: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 17:34:53 +00:00
MPI g = mpi_alloc(1);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00: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 13:46:34 +00:00
mpi_free(g);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
}
else
wrong_args("--gen-prime mode bits [qbits] ");
add DSA key generation
1998-05-05 20:34:20 +00:00
putchar('\n');
}
removed g10maint.c
1998-03-05 09:22:13 +00:00
break;
case aGenRandom:
{
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00: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 11:55:58 +00:00
byte *p;
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 15:41:14 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
p = get_random_bits( n*8, level, 0);
See ChangeLog: Fri Jul 28 18:19:11 CEST 2000 Werner Koch
2000-07-28 16:19:07 +00:00
#ifdef HAVE_DOSISH_SYSTEM
setmode ( fileno(stdout), O_BINARY );
#endif
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if (opt.armor) {
char *tmp = make_radix64_string (p, n);
fputs (tmp, stdout);
m_free (tmp);
if (n%3 == 1)
putchar ('=');
if (n%3)
putchar ('=');
} else {
fwrite( p, n, 1, stdout );
}
m_free(p);
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
if( !endless )
count -= n;
removed g10maint.c
1998-03-05 09:22:13 +00:00
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if (opt.armor)
putchar ('\n');
removed g10maint.c
1998-03-05 09:22:13 +00:00
}
break;
new release
1998-05-15 18:49:19 +00:00
case aPrintMD:
if( argc < 1)
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
wrong_args("--print-md algo [files]");
{
int all_algos = (**argv=='*' && !(*argv)[1]);
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 10:19:50 +00: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 13:46:34 +00:00
print_mds(NULL, algo);
See ChangeLog: Fri Mar 24 11:25:45 CET 2000 Werner Koch
2000-03-24 10:19:50 +00:00
else {
for(; argc; argc--, argv++ )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
print_mds(*argv, algo);
new release
1998-05-15 18:49:19 +00:00
}
}
}
break;
See ChangeLog: Tue Jul 13 17:39:25 CEST 1999 Werner Koch
1999-07-13 15:41:14 +00:00
case aPrintMDs: /* old option */
removed g10maint.c
1998-03-05 09:22:13 +00:00
if( !argc )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
print_mds(NULL,0);
removed g10maint.c
1998-03-05 09:22:13 +00:00
else {
for(; argc; argc--, argv++ )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
print_mds(*argv,0);
removed g10maint.c
1998-03-05 09:22:13 +00:00
}
break;
case aListTrustDB:
if( !argc )
list_trustdb(NULL);
else {
for( ; argc; argc--, argv++ )
list_trustdb( *argv );
}
break;
last local commit
1998-10-16 16:00:17 +00:00
case aUpdateTrustDB:
if( argc )
wrong_args("--update-trustdb");
update_trustdb();
break;
changed trustdb design
1998-07-21 12:53:38 +00:00
case aCheckTrustDB:
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
/* Old versions allowed for arguments - ignore them */
check_trustdb();
changed trustdb design
1998-07-21 12:53:38 +00:00
break;
a new release
1998-10-07 13:30:43 +00:00
case aFixTrustDB:
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
log_error("this command is not yet implemented.\n");
a new release
1998-10-07 13:30:43 +00: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 09:22:13 +00:00
case aListTrustPath:
some bug fixes
1998-11-18 19:59:06 +00:00
if( !argc )
See ChangeLog: Mon Jul 12 18:45:57 CEST 1999 Werner Koch
1999-07-12 16:49:22 +00:00
wrong_args("--list-trust-path <user-ids>");
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 12:57:54 +00:00
for( ; argc; argc--, argv++ ) {
username = make_username( *argv );
list_trust_path( username );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(username);
See ChangeLog: Mon Jul 12 14:55:34 CEST 1999 Werner Koch
1999-07-12 12:57:54 +00:00
}
removed g10maint.c
1998-03-05 09:22:13 +00:00
break;
edit-key is now complete
1998-07-29 19:35:05 +00:00
case aExportOwnerTrust:
intermediate release
1998-07-06 10:23:57 +00:00
if( argc )
edit-key is now complete
1998-07-29 19:35:05 +00: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 10:23:57 +00:00
break;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
case aPipeMode:
if ( argc )
wrong_args ("--pipemode");
run_in_pipemode ();
break;
case aRebuildKeydbCaches:
if (argc)
wrong_args ("--rebuild-keydb-caches");
keydb_rebuild_caches ();
break;
removed g10maint.c
1998-03-05 09:22:13 +00:00
added more stuff
1998-01-02 20:40:10 +00:00
case aListPackets:
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
opt.list_packets=2;
initially checkin
1997-11-18 14:06:00 +00:00
default:
if( argc > 1 )
armor rewritten, but still buggy
1998-02-04 18:54:31 +00:00
wrong_args(_("[filename]"));
Some bug fixes of the last release
1998-11-10 12:59:59 +00: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"));
initially checkin
1997-11-18 14:06:00 +00:00
if( !(a = iobuf_open(fname)) )
See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch
1998-12-29 13:47:31 +00:00
log_error(_("can't open `%s'\n"), print_fname_stdin(fname));
added option export
1998-02-13 20:58:50 +00:00
else {
Some bug fixes of the last release
1998-11-10 12:59:59 +00:00
added option export
1998-02-13 20:58:50 +00:00
if( !opt.no_armor ) {
some import functionality
1998-02-16 20:05:02 +00:00
if( use_armor_filter( a ) ) {
memset( &afx, 0, sizeof afx);
iobuf_push_filter( a, armor_filter, &afx );
}
added option export
1998-02-13 20:58:50 +00: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 12:26:10 +00:00
rc = proc_packets(NULL, a );
if( rc )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
log_error("processing message failed: %s\n", g10_errstr(rc) );
added option export
1998-02-13 20:58:50 +00:00
iobuf_close(a);
added more stuff
1998-01-02 20:40:10 +00:00
}
initially checkin
1997-11-18 14:06:00 +00:00
break;
}
/* cleanup */
FREE_STRLIST(remusr);
IDEA removed, signing works
1997-11-24 11:04:11 +00:00
FREE_STRLIST(locusr);
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10_exit(0);
add-key works
1998-05-26 13:38:00 +00:00
return 8; /*NEVER REACHED*/
version 0.2.1
1998-01-28 16:09:43 +00:00
}
void
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10_exit( int rc )
version 0.2.1
1998-01-28 16:09:43 +00:00
{
See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch
2000-07-14 17:34:53 +00:00
update_random_seed_file();
See ChangeLog: Fri Jul 2 11:45:54 CEST 1999 Werner Koch
1999-07-02 09:50:57 +00:00
if( opt.debug & DBG_MEMSTAT_VALUE ) {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_print_stats("on exit");
random_dump_stats();
See ChangeLog: Fri Jul 2 11:45:54 CEST 1999 Werner Koch
1999-07-02 09:50:57 +00:00
}
a couple of changes; but some parts are now broken
1998-02-11 03:25:44 +00:00
if( opt.debug )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
secmem_dump_stats();
secmem_term();
Some bug fixes of the last release
1998-11-10 12:59:59 +00:00
rc = rc? rc : log_get_errorcount(0)? 2 :
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
g10_errors_seen? 1 : 0;
*** empty log message ***
1998-01-30 16:23:16 +00:00
exit(rc );
initially checkin
1997-11-18 14:06:00 +00:00
}
intermediate release
1998-07-06 10:23:57 +00:00
removed g10maint.c
1998-03-05 09:22:13 +00:00
static void
print_hex( byte *p, size_t n )
{
int i;
if( n == 20 ) {
for(i=0; i < n ; i++, i++, p += 2 ) {
new release
1998-05-15 18:49:19 +00:00
if( i )
putchar(' ');
removed g10maint.c
1998-03-05 09:22:13 +00:00
if( i == 10 )
putchar(' ');
new release
1998-05-15 18:49:19 +00:00
printf("%02X%02X", *p, p[1] );
removed g10maint.c
1998-03-05 09:22:13 +00:00
}
}
*** empty log message ***
1998-04-30 14:06:01 +00:00
else if( n == 24 ) {
for(i=0; i < n ; i += 4, p += 4 ) {
new release
1998-05-15 18:49:19 +00:00
if( i )
putchar(' ');
*** empty log message ***
1998-04-30 14:06:01 +00:00
if( i == 12 )
putchar(' ');
new release
1998-05-15 18:49:19 +00:00
printf("%02X%02X%02X%02X", *p, p[1], p[2], p[3] );
*** empty log message ***
1998-04-30 14:06:01 +00:00
}
}
removed g10maint.c
1998-03-05 09:22:13 +00:00
else {
for(i=0; i < n ; i++, p++ ) {
new release
1998-05-15 18:49:19 +00:00
if( i )
putchar(' ');
removed g10maint.c
1998-03-05 09:22:13 +00:00
if( i && !(i%8) )
putchar(' ');
new release
1998-05-15 18:49:19 +00:00
printf("%02X", *p );
removed g10maint.c
1998-03-05 09:22:13 +00:00
}
}
}
static void
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 09:22:13 +00:00
{
FILE *fp;
char buf[1024];
size_t n;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
MD_HANDLE md;
new release
1998-05-15 18:49:19 +00:00
char *pname;
removed g10maint.c
1998-03-05 09:22:13 +00:00
if( !fname ) {
fp = stdin;
See ChangeLog: Fri Jul 28 18:19:11 CEST 2000 Werner Koch
2000-07-28 16:19:07 +00:00
#ifdef HAVE_DOSISH_SYSTEM
setmode ( fileno(fp) , O_BINARY );
#endif
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
pname = m_strdup("[stdin]: ");
removed g10maint.c
1998-03-05 09:22:13 +00:00
}
new release
1998-05-15 18:49:19 +00:00
else {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
pname = m_alloc(strlen(fname)+3);
new release
1998-05-15 18:49:19 +00:00
strcpy(stpcpy(pname,fname),": ");
removed g10maint.c
1998-03-05 09:22:13 +00:00
fp = fopen( fname, "rb" );
new release
1998-05-15 18:49:19 +00:00
}
removed g10maint.c
1998-03-05 09:22:13 +00:00
if( !fp ) {
new release
1998-05-15 18:49:19 +00:00
log_error("%s%s\n", pname, strerror(errno) );
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
m_free(pname);
removed g10maint.c
1998-03-05 09:22:13 +00:00
return;
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
md = md_open( 0, 0 );
new release
1998-05-15 18:49:19 +00:00
if( algo )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
md_enable( md, algo );
new release
1998-05-15 18:49:19 +00:00
else {
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
md_enable( md, DIGEST_ALGO_MD5 );
md_enable( md, DIGEST_ALGO_SHA1 );
md_enable( md, DIGEST_ALGO_RMD160 );
if( !check_digest_algo(DIGEST_ALGO_TIGER) )
md_enable( md, DIGEST_ALGO_TIGER );
new release
1998-05-15 18:49:19 +00:00
}
removed g10maint.c
1998-03-05 09:22:13 +00:00
while( (n=fread( buf, 1, DIM(buf), fp )) )
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
md_write( md, buf, n );
removed g10maint.c
1998-03-05 09:22:13 +00:00
if( ferror(fp) )
new release
1998-05-15 18:49:19 +00:00
log_error("%s%s\n", pname, strerror(errno) );
removed g10maint.c
1998-03-05 09:22:13 +00:00
else {
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 );
if( !check_digest_algo(DIGEST_ALGO_TIGER) )
print_hashline( md, DIGEST_ALGO_TIGER, fname );
}
}
else {
if( algo ) {
if( fname )
fputs( pname, stdout );
print_hex(md_read(md, algo), md_digest_length(algo) );
}
else {
printf( "%s MD5 = ", fname?pname:"" );
print_hex(md_read(md, DIGEST_ALGO_MD5), 16 );
printf("\n%s SHA1 = ", fname?pname:"" );
print_hex(md_read(md, DIGEST_ALGO_SHA1), 20 );
printf("\n%sRMD160 = ", fname?pname:"" );
print_hex(md_read(md, DIGEST_ALGO_RMD160), 20 );
if( !check_digest_algo(DIGEST_ALGO_TIGER) ) {
printf("\n%s TIGER = ", fname?pname:"" );
print_hex(md_read(md, DIGEST_ALGO_TIGER), 24 );
}
}
putchar('\n');
}
removed g10maint.c
1998-03-05 09:22:13 +00:00
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
md_close(md);
removed g10maint.c
1998-03-05 09:22:13 +00:00
if( fp != stdin )
fclose(fp);
}
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 17:56:15 +00:00
/****************
* Check the supplied name,value string and add it to the notation
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 17:56:15 +00:00
static void
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
add_notation_data( const char *string, int which )
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 17:56:15 +00:00
{
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 12:41:46 +00:00
const char *s;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
STRLIST sl,*notation_data;
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 12:41:46 +00:00
int critical=0;
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 17:56:15 +00:00
int highbit=0;
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
if(which)
notation_data=&opt.cert_notation_data;
else
notation_data=&opt.sig_notation_data;
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 12:41:46 +00:00
if( *string == '!' ) {
critical = 1;
string++;
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
for( s=string ; *s != '='; s++ ) {
if( !*s || (*s & 0x80) || (!isgraph(*s) && !isspace(*s)) ) {
log_error(_("a notation name must have only printable characters "
"or spaces, and end with an '='\n") );
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 17:56:15 +00:00
return;
}
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
/* we only support printable text - therefore we enforce the use
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 17:56:15 +00:00
* of only printable characters (an empty value is valid) */
for( s++; *s ; s++ ) {
if( iscntrl(*s) ) {
log_error(_("a notation value must not use "
"any control characters\n") );
return;
}
else if( *s & 0x80 )
highbit = 1;
}
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
1999-07-01 10:53:35 +00:00
if( highbit ) /* must use UTF8 encoding */
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
sl = add_to_strlist2( notation_data, string, utf8_strings );
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 17:56:15 +00:00
else
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
sl = add_to_strlist( notation_data, string );
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 12:41:46 +00:00
if( critical )
sl->flags |= 1;
}
Update head to match stable 1.0
2002-06-29 13:46:34 +00: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 12:41:46 +00:00
{
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
int i,critical=0;
STRLIST sl;
if(*string=='!')
{
string++;
critical=1;
See ChangeLog: Wed May 26 14:36:29 CEST 1999 Werner Koch
1999-05-26 12:41:46 +00:00
}
See ChangeLog: Tue May 25 19:50:32 CEST 1999 Werner Koch
1999-05-25 17:56:15 +00:00
Update head to match stable 1.0
2002-06-29 13:46:34 +00:00
for(i=0;i<strlen(string);i++)
if(string[i]&0x80 || iscntrl(string[i]))
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;
}
Copy Permalink