-/* g10.c - The GNUPG utility (main for gpg)
+/* g10.c - The GnuPG utility (main for gpg)
* Copyright (C) 1998 Free Software Foundation, Inc.
*
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
*
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
#include <unistd.h>
+#define MAINTAINER_OPTIONS
#include "packet.h"
#include "iobuf.h"
#include "ttyio.h"
#include "i18n.h"
#include "status.h"
+#include "g10defs.h"
#ifndef IS_G10MAINT
#define IS_G10 1
#endif
+enum cmd_and_opt_values { aNull = 0,
+ oArmor = 'a',
+ aDetachedSign = 'b',
+ aSym = 'c',
+ aDecrypt = 'd',
+ aEncr = 'e',
+ oKOption = 'k',
+ oDryRun = 'n',
+ oOutput = 'o',
+ oQuiet = 'q',
+ oRemote = 'r',
+ aSign = 's',
+ oTextmodeShort= 't',
+ oUser = 'u',
+ oVerbose = 'v',
+ oCompress = 'z',
+ oBatch = 500,
+ aClearsign,
+ aStore,
+ aKeygen,
+ aSignEncr,
+ aSignKey,
+ aListPackets,
+ aEditKey,
+ aDeleteKey,
+ aDeleteSecretKey,
+ aKMode,
+ aKModeC,
+ aImport,
+ aFastImport,
+ aVerify,
+ aListKeys,
+ aListSigs,
+ aListSecretKeys,
+ aExport,
+ aExportAll,
+ aExportSecret,
+ aCheckKeys,
+ aGenRevoke,
+ aPrimegen,
+ aPrintMD,
+ aPrintMDs,
+ aCheckTrustDB,
+ aUpdateTrustDB,
+ aFixTrustDB,
+ aListTrustDB,
+ aListTrustPath,
+ aExportOwnerTrust,
+ aImportOwnerTrust,
+ aDeArmor,
+ aEnArmor,
+ aGenRandom,
+
+ oTextmode,
+ oFingerprint,
+ oAnswerYes,
+ oAnswerNo,
+ oKeyring,
+ oSecretKeyring,
+ oDefaultKey,
+ oTrustedKey,
+ oOptions,
+ oDebug,
+ oDebugAll,
+ oStatusFD,
+ oNoComment,
+ oCompletesNeeded,
+ oMarginalsNeeded,
+ oMaxCertDepth,
+ oLoadExtension,
+ oRFC1991,
+ oCipherAlgo,
+ oDigestAlgo,
+ oCompressAlgo,
+ oPasswdFD,
+ oQuickRandom,
+ oNoVerbose,
+ oTrustDBName,
+ oNoSecmemWarn,
+ oNoArmor,
+ oNoDefKeyring,
+ oNoGreeting,
+ oNoOptions,
+ oNoBatch,
+ oHomedir,
+ oWithColons,
+ oSkipVerify,
+ oCompressKeys,
+ oCompressSigs,
+ oAlwaysTrust,
+ oEmuChecksumBug,
+ oRunAsShmCP,
+ oSetFilename,
+ oComment,
+ oThrowKeyid,
+ oForceV3Sigs,
+ oS2KMode,
+ oS2KDigest,
+ oS2KCipher,
+ oCharset,
+ oNotDashEscaped,
+ oEscapeFrom,
+ oLockOnce,
+aTest };
+
+
static ARGPARSE_OPTS opts[] = {
{ 300, NULL, 0, N_("@Commands:\n ") },
#ifdef IS_G10
- { 's', "sign", 0, N_("|[file]|make a signature")},
- { 539, "clearsign", 0, N_("|[file]|make a clear text signature") },
- { 'b', "detach-sign", 0, N_("make a detached signature")},
- { 'e', "encrypt", 0, N_("encrypt data")},
- { 'c', "symmetric", 0, N_("encryption only with symmetric cipher")},
- { 507, "store", 0, N_("store only")},
- { 'd', "decrypt", 0, N_("decrypt data (default)")},
- { 550, "verify" , 0, N_("verify a signature")},
+ { 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")},
+ { aSym, "symmetric", 256, N_("encryption only with symmetric cipher")},
+ { aStore, "store", 256, N_("store only")},
+ { aDecrypt, "decrypt", 256, N_("decrypt data (default)")},
+ { aVerify, "verify" , 256, N_("verify a signature")},
+ #endif
+ { aListKeys, "list-keys", 256, N_("list keys")},
+ { 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")},
+ #ifdef IS_G10
+ { aKeygen, "gen-key", 256, N_("generate a new key pair")},
#endif
- { 551, "list-keys", 0, N_("list keys")},
- { 552, "list-sigs", 0, N_("list keys and signatures")},
- { 508, "check-sigs",0, N_("check key signatures")},
- { 515, "fingerprint", 0, N_("list keys and fingerprints")},
- { 558, "list-secret-keys", 0, N_("list secret keys")},
+ { aDeleteKey, "delete-key",256, N_("remove key from the public keyring")},
#ifdef IS_G10
- { 503, "gen-key", 0, N_("generate a new key pair")},
- { 554, "add-key", 0, N_("add a subkey to a key pair")},
- { 506, "sign-key" ,0, N_("make a signature on a key in the keyring")},
- { 505, "delete-key",0, N_("remove key from the public keyring")},
- { 524, "edit-key" ,0, N_("edit a key signature")},
- { 525, "change-passphrase", 0, N_("change the passphrase of your secret keyring")},
- { 542, "gen-revoke",0, N_("generate a revocation certificate")},
+ { aEditKey, "edit-key" ,256, N_("sign or edit a key")},
+ { aGenRevoke, "gen-revoke",256, N_("generate a revocation certificate")},
#endif
- { 537, "export" , 0, N_("export keys") },
- { 563, "export-secret-keys" , 0, "@" },
- { 565, "do-not-export-rsa", 0, "@" },
- { 530, "import", 0 , N_("import/merge keys")},
- { 521, "list-packets",0,N_("list only the sequence of packets")},
+ { aExport, "export" , 256, N_("export keys") },
+ { aExportAll, "export-all" , 256, "@" },
+ { aExportSecret, "export-secret-keys" , 256, "@" },
+ { aImport, "import", 256 , N_("import/merge keys")},
+ { aFastImport, "fast-import", 256 , "@"},
+ { aListPackets, "list-packets",256,N_("list only the sequence of packets")},
#ifdef IS_G10MAINT
- { 564, "list-ownertrust", 0, "list the ownertrust values"},
- { 546, "dearmor", 0, N_("De-Armor a file or stdin") },
- { 547, "enarmor", 0, N_("En-Armor a file or stdin") },
- { 555, "print-md" , 0, N_("|algo [files]|print message digests")},
- { 516, "print-mds" , 0, N_("print all message digests")},
- { 513, "gen-prime" , 0, "@" },
- { 548, "gen-random" , 0, "@" },
+ { aExportOwnerTrust,
+ "export-ownertrust", 256, N_("export the ownertrust values")},
+ { aImportOwnerTrust,
+ "import-ownertrust", 256 , N_("import ownertrust values")},
+ { aUpdateTrustDB,
+ "update-trustdb",0 , N_("|[NAMES]|update the trust database")},
+ { aCheckTrustDB,
+ "check-trustdb",0 , N_("|[NAMES]|check the trust database")},
+ { aFixTrustDB, "fix-trustdb",0 , N_("fix a corrupted trust database")},
+ { aDeArmor, "dearmor", 256, N_("De-Armor a file or stdin") },
+ { aEnArmor, "enarmor", 256, N_("En-Armor a file or stdin") },
+ { aPrintMD, "print-md" , 256, N_("|algo [files]|print message digests")},
+ { aPrintMDs, "print-mds" , 256, N_("print all message digests")},
+ #ifdef MAINTAINER_OPTIONS
+ { aPrimegen, "gen-prime" , 256, "@" },
+ { aGenRandom, "gen-random" , 256, "@" },
+ #endif
#endif
{ 301, NULL, 0, N_("@\nOptions:\n ") },
- { 'a', "armor", 0, N_("create ascii armored output")},
+ { oArmor, "armor", 0, N_("create ascii armored output")},
#ifdef IS_G10
- { 'u', "local-user",2, N_("use this user-id to sign or decrypt")},
- { 'r', "remote-user", 2, N_("use this user-id for encryption")},
- { 'z', NULL, 1, N_("|N|set compress level N (0 disables)") },
- { 't', "textmode", 0, N_("use canonical text mode")},
+ { oUser, "local-user",2, N_("use this user-id to sign or decrypt")},
+ { oRemote, "remote-user", 2, N_("use this user-id for encryption")},
+ { oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") },
+ { oTextmodeShort, NULL, 0, "@"},
+ { oTextmode, "textmode", 0, N_("use canonical text mode")},
#endif
- { 'o', "output", 2, N_("use as output file")},
- { 'v', "verbose", 0, N_("verbose") },
- { 'n', "dry-run", 0, N_("do not make any changes") },
- { 500, "batch", 0, N_("batch mode: never ask")},
- { 501, "yes", 0, N_("assume yes on most questions")},
- { 502, "no", 0, N_("assume no on most questions")},
- { 509, "keyring" ,2, N_("add this keyring to the list of keyrings")},
- { 517, "secret-keyring" ,2, N_("add this secret keyring to the list")},
- { 541, "default-key" ,2, N_("|NAME|use NAME as default secret key")},
- { 518, "options" , 2, N_("read options from file")},
-
- { 510, "debug" ,4|16, N_("set debugging flags")},
- { 511, "debug-all" ,0, N_("enable full debugging")},
- { 512, "status-fd" ,1, N_("|FD|write status info to this FD") },
- { 534, "no-comment", 0, N_("do not write comment packets")},
- { 535, "completes-needed", 1, N_("(default is 1)")},
- { 536, "marginals-needed", 1, N_("(default is 3)")},
- { 560, "load-extension" ,2, N_("|file|load extension module")},
- { 561, "rfc1991", 0, N_("emulate the mode described in RFC1991")},
+ { oOutput, "output", 2, N_("use as output file")},
+ { oVerbose, "verbose", 0, N_("verbose") },
+ { oQuiet, "quiet", 0, N_("be somewhat more quiet") },
+ { oForceV3Sigs, "force-v3-sigs", 0, N_("force v3 signatures") },
+ /* { oDryRun, "dry-run", 0, N_("do not make any changes") }, */
+ { oBatch, "batch", 0, N_("batch mode: never ask")},
+ { 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")},
+ { oDefaultKey, "default-key" ,2, N_("|NAME|use NAME as default secret key")},
+ { oCharset, "charset" , 2, N_("|NAME|set terminal charset to NAME") },
+ { oOptions, "options" , 2, N_("read options from file")},
+
+ { oDebug, "debug" ,4|16, N_("set debugging flags")},
+ { oDebugAll, "debug-all" ,0, N_("enable full debugging")},
+ { oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
+ { oNoComment, "no-comment", 0, N_("do not write comment packets")},
+ { oCompletesNeeded, "completes-needed", 1, N_("(default is 1)")},
+ { oMarginalsNeeded, "marginals-needed", 1, N_("(default is 3)")},
+ { oMaxCertDepth, "max-cert-depth", 1, "@" },
+ { oTrustedKey, "trusted-key", 2, N_("|KEYID|ulimately trust this key")},
+ { oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")},
+ { oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")},
+ { oS2KMode, "s2k-mode", 1, N_("|N|use passphrase mode N")},
+ { oS2KDigest, "s2k-digest-algo",2,
+ N_("|NAME|use message digest algorithm NAME for passphrases")},
+ { oS2KCipher, "s2k-cipher-algo",2,
+ N_("|NAME|use cipher algorithm NAME for passphrases")},
#ifdef IS_G10
- { 527, "cipher-algo", 2 , N_("|NAME|use cipher algorithm NAME")},
- { 529, "digest-algo", 2 , N_("|NAME|use message digest algorithm NAME")},
- { 556, "compress-algo", 1 , N_("|N|use compress algorithm N")},
+ { oCipherAlgo, "cipher-algo", 2 , N_("|NAME|use cipher algorithm NAME")},
+ { oDigestAlgo, "digest-algo", 2 , N_("|NAME|use message digest algorithm NAME")},
+ { oCompressAlgo, "compress-algo", 1 , N_("|N|use compress algorithm N")},
+ { oThrowKeyid, "throw-keyid", 0, N_("throw keyid field of encrypted packets")},
#else /* some dummies */
- { 527, "cipher-algo", 2 , "@"},
- { 529, "digest-algo", 2 , "@"},
- { 556, "compress-algo", 1 , "@"},
+ { oCipherAlgo, "cipher-algo", 2 , "@"},
+ { oDigestAlgo, "digest-algo", 2 , "@"},
+ { oCompressAlgo, "compress-algo", 1 , "@"},
#endif
#ifdef IS_G10
{ 302, NULL, 0, N_("@\nExamples:\n\n"
" -se -r Bob [file] sign and encrypt for user Bob\n"
- " -sat [file] make a clear text signature\n"
- " -sb [file] make a detached signature\n"
- " -k [userid] show keys\n"
- " -kc [userid] show fingerprint\n" ) },
+ " --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" ) },
#endif
/* hidden options */
#ifdef IS_G10MAINT
- { 514, "test" , 0, "@" },
- { 564, "list-ownertrust",0 , "@"},
- { 531, "list-trustdb",0 , "@"},
- { 533, "list-trust-path",0, "@"},
+ { aExportOwnerTrust, "list-ownertrust",0 , "@"}, /* alias */
+ { aListTrustDB, "list-trustdb",0 , "@"},
+ { aListTrustPath, "list-trust-path",0, "@"},
#endif
#ifdef IS_G10
- { 'k', NULL, 0, "@"},
- { 504, "delete-secret-key",0, "@" },
- { 524, "edit-sig" ,0, "@"}, /* alias for edit-key */
- { 523, "passphrase-fd",1, "@" },
+ { oKOption, NULL, 0, "@"},
+ { oPasswdFD, "passphrase-fd",1, "@" },
+ { aSignKey, "sign-key" ,256, "@" }, /* alias for edit-key */
#endif
- { 532, "quick-random", 0, "@"},
- { 526, "no-verbose", 0, "@"},
- { 538, "trustdb-name", 2, "@" },
- { 540, "no-secmem-warning", 0, "@" }, /* used only by regression tests */
- { 519, "no-armor", 0, "@"},
- { 520, "no-default-keyring", 0, "@" },
- { 522, "no-greeting", 0, "@" },
- { 543, "no-options", 0, "@" }, /* shortcut for --options /dev/null */
- { 544, "homedir", 2, "@" }, /* defaults to "~/.gnupg" */
- { 545, "no-batch", 0, "@" },
- { 549, "with-colons", 0, "@"},
- { 551, "list-key", 0, "@" }, /* alias */
- { 552, "list-sig", 0, "@" }, /* alias */
- { 508, "check-sig",0, "@" }, /* alias */
- { 553, "skip-verify",0, "@" },
- { 557, "compress-keys",0, "@"},
- { 559, "always-trust", 0, "@"},
- { 562, "emulate-checksum-bug", 0, "@"},
-
+ { aDeleteSecretKey, "delete-secret-key",0, "@" },
+ { oQuickRandom, "quick-random", 0, "@"},
+ { oNoVerbose, "no-verbose", 0, "@"},
+ { oTrustDBName, "trustdb-name", 2, "@" },
+ { oNoSecmemWarn, "no-secmem-warning", 0, "@" }, /* used only by regression tests */
+ { oNoArmor, "no-armor", 0, "@"},
+ { 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, "@"},
+ { 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, "@"},
+ { oAlwaysTrust, "always-trust", 0, "@"},
+ { oEmuChecksumBug, "emulate-checksum-bug", 0, "@"},
+ { oRunAsShmCP, "run-as-shm-coprocess", 4, "@" },
+ { oSetFilename, "set-filename", 2, "@" },
+ { oComment, "comment", 2, "@" },
+ { oNotDashEscaped, "not-dash-escaped", 0, "@" },
+ { oEscapeFrom, "escape-from-lines", 0, "@" },
+ { oLockOnce, "lock-once", 0, "@" },
{0} };
-enum cmd_values { aNull = 0,
- aSym, aStore, aEncr, aKeygen, aSign, aSignEncr,
- aSignKey, aClearsign, aListPackets, aEditKey, aDeleteKey, aDeleteSecretKey,
- aKMode, aKModeC, aChangePass, aImport, aVerify, aDecrypt, aListKeys,
- aListSigs, aKeyadd, aListSecretKeys,
- aExport, aExportSecret,
- aCheckKeys, aGenRevoke, aPrimegen, aPrintMD, aPrintMDs,
- aListTrustDB, aListTrustPath, aListOwnerTrust,
- aDeArmor, aEnArmor, aGenRandom,
-aTest };
+
+int g10_errors_seen = 0;
+
static int maybe_setuid = 1;
static char *build_list( const char *text,
const char *(*mapf)(int), int (*chkf)(int) );
-static void set_cmd( enum cmd_values *ret_cmd,
- enum cmd_values new_cmd );
+static void set_cmd( enum cmd_and_opt_values *ret_cmd,
+ enum cmd_and_opt_values new_cmd );
#ifdef IS_G10MAINT
static void print_hex( byte *p, size_t n );
static void print_mds( const char *fname, int algo );
-static void do_test(int);
#endif
const char *
switch( level ) {
case 11: p =
#ifdef IS_G10MAINT
- "gpgm (GNUPG)";
+ "gpgm (GnuPG)";
#else
- "gpg (GNUPG)";
+ "gpg (GnuPG)";
#endif
break;
case 13: p = VERSION; break;
case 41: p =
#ifdef IS_G10MAINT
_("Syntax: gpgm [options] [files]\n"
- "GNUPG maintenance utility\n");
+ "GnuPG maintenance utility\n");
#else
_("Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
#endif
break;
- case 31: p = "\n"; break;
+ case 31: p = _("\nSupported algorithms:\n"); break;
case 32:
if( !ciphers )
- ciphers = build_list("Supported ciphers: ", cipher_algo_to_string,
+ ciphers = build_list("Cipher: ", cipher_algo_to_string,
check_cipher_algo );
p = ciphers;
break;
case 33:
if( !pubkeys )
- pubkeys = build_list("Supported pubkeys: ", pubkey_algo_to_string,
+ pubkeys = build_list("Pubkey: ", pubkey_algo_to_string,
check_pubkey_algo );
p = pubkeys;
break;
case 34:
if( !digests )
- digests = build_list("Supported digests: ", digest_algo_to_string,
+ digests = build_list("Hash: ", digest_algo_to_string,
check_digest_algo );
p = digests;
break;
{
#ifdef ENABLE_NLS
#ifdef HAVE_LC_MESSAGES
+ setlocale( LC_TIME, "" );
setlocale( LC_MESSAGES, "" );
#else
setlocale( LC_ALL, "" );
static void
-set_cmd( enum cmd_values *ret_cmd, enum cmd_values new_cmd )
+set_cmd( enum cmd_and_opt_values *ret_cmd, enum cmd_and_opt_values new_cmd )
{
- enum cmd_values cmd = *ret_cmd;
+ enum cmd_and_opt_values cmd = *ret_cmd;
if( !cmd || cmd == new_cmd )
cmd = new_cmd;
-static void
-check_opts(void)
-{
- if( !opt.def_cipher_algo || check_cipher_algo(opt.def_cipher_algo) )
- log_error(_("selected cipher algorithm is invalid\n"));
- if( opt.def_digest_algo && check_digest_algo(opt.def_digest_algo) )
- log_error(_("selected digest algorithm is invalid\n"));
- if( opt.def_compress_algo < 1 || opt.def_compress_algo > 2 )
- log_error(_("compress algorithm must be in range %d..%d\n"), 1, 2);
- 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"));
-}
-
-
-
-
int
main( int argc, char **argv )
{
unsigned configlineno;
int parse_debug = 0;
int default_config =1;
- int errors=0;
int default_keyring = 1;
int greeting = 1;
- enum cmd_values cmd = 0;
+ enum cmd_and_opt_values cmd = 0;
const char *trustdb_name = NULL;
char *def_cipher_string = NULL;
char *def_digest_string = NULL;
+ char *s2k_cipher_string = NULL;
+ char *s2k_digest_string = NULL;
+ int pwfd = -1;
+ #ifdef USE_SHM_COPROCESSING
+ ulong requested_shm_size=0;
+ #endif
trap_unaligned();
+ secmem_set_flags( secmem_get_flags() | 2 ); /* suspend warnings */
#ifdef IS_G10MAINT
secmem_init( 0 ); /* disable use of secmem */
maybe_setuid = 0;
*/
log_set_name("gpg");
secure_random_alloc(); /* put random number into secure memory */
- init_signals();
+ disable_core_dumps();
#endif
+ init_signals();
i18n_init();
opt.compress = -1; /* defaults to standard compress level */
/* fixme: set the next two to zero and decide where used */
- opt.def_cipher_algo = DEFAULT_CIPHER_ALGO;
+ opt.def_cipher_algo = 0;
opt.def_digest_algo = 0;
opt.def_compress_algo = 2;
+ opt.s2k_mode = 1; /* salted */
+ opt.s2k_digest_algo = DIGEST_ALGO_RMD160;
+ opt.s2k_cipher_algo = CIPHER_ALGO_BLOWFISH;
opt.completes_needed = 1;
opt.marginals_needed = 3;
+ opt.max_cert_depth = 5;
opt.homedir = getenv("GNUPGHOME");
if( !opt.homedir || !*opt.homedir ) {
#ifdef __MINGW32__
pargs.argv = &argv;
pargs.flags= 1|(1<<6); /* do not remove the args, ignore version */
while( arg_parse( &pargs, opts) ) {
- if( pargs.r_opt == 510 || pargs.r_opt == 511 )
+ if( pargs.r_opt == oDebug || pargs.r_opt == oDebugAll )
parse_debug++;
- else if( pargs.r_opt == 518 ) {
+ else if( pargs.r_opt == oOptions ) {
/* 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;
}
- else if( pargs.r_opt == 543 )
+ else if( pargs.r_opt == oNoOptions )
default_config = 0; /* --no-options */
- else if( pargs.r_opt == 544 )
+ else if( pargs.r_opt == oHomedir )
opt.homedir = pargs.r.ret_str;
+ #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;
+ }
+ #endif
}
+
+ #ifdef USE_SHM_COPROCESSING
+ if( opt.shm_coprocess ) {
+ #ifdef IS_G10
+ init_shm_coprocessing(requested_shm_size, 1 );
+ #else
+ init_shm_coprocessing(requested_shm_size, 0 );
+ #endif
+ }
+ #endif
+ #ifdef IS_G10
+ /* initialize the secure memory. */
+ secmem_init( 16384 );
+ maybe_setuid = 0;
+ /* Okay, we are now working under our real uid */
+ #endif
+
if( default_config )
configname = make_filename(opt.homedir, "options", NULL );
if( !configfp ) {
if( default_config ) {
if( parse_debug )
- log_info(_("note: no default option file '%s'\n"),
+ log_info(_("NOTE: no default option file `%s'\n"),
configname );
}
else {
- log_error(_("option file '%s': %s\n"),
+ log_error(_("option file `%s': %s\n"),
configname, strerror(errno) );
- g10_exit(1);
+ g10_exit(2);
}
m_free(configname); configname = NULL;
}
if( parse_debug && configname )
- log_info(_("reading options from '%s'\n"), configname );
+ log_info(_("reading options from `%s'\n"), configname );
default_config = 0;
}
while( optfile_parse( configfp, configname, &configlineno,
&pargs, opts) ) {
switch( pargs.r_opt ) {
+ case aCheckKeys: set_cmd( &cmd, aCheckKeys); break;
+ case aListPackets: set_cmd( &cmd, aListPackets); break;
+ case aImport: set_cmd( &cmd, aImport); break;
+ case aFastImport: set_cmd( &cmd, aFastImport); break;
+ case aExport: set_cmd( &cmd, aExport); break;
+ case aExportAll: set_cmd( &cmd, aExportAll); break;
+ case aListKeys: set_cmd( &cmd, aListKeys); break;
+ case aListSigs: set_cmd( &cmd, aListSigs); break;
+ case aExportSecret: set_cmd( &cmd, aExportSecret); break;
+ case aDeleteSecretKey: set_cmd( &cmd, aDeleteSecretKey); break;
+ case aDeleteKey: set_cmd( &cmd, aDeleteKey); break;
+
+ #ifdef IS_G10
+ case aDetachedSign: detached_sig = 1; set_cmd( &cmd, aSign ); break;
+ case aSym: set_cmd( &cmd, aSym); break;
+ case aDecrypt: set_cmd( &cmd, aDecrypt); break;
+ case aEncr: set_cmd( &cmd, aEncr); break;
+ case aSign: set_cmd( &cmd, aSign ); break;
+ case aKeygen: set_cmd( &cmd, aKeygen); break;
+ case aSignKey: set_cmd( &cmd, aSignKey); break;
+ case aStore: set_cmd( &cmd, aStore); break;
+ case aEditKey: set_cmd( &cmd, aEditKey); break;
+ case aClearsign: set_cmd( &cmd, aClearsign); break;
+ case aGenRevoke: set_cmd( &cmd, aGenRevoke); break;
+ case aVerify: set_cmd( &cmd, aVerify); break;
+ #else
+ #ifdef MAINTAINER_OPTIONS
+ case aPrimegen: set_cmd( &cmd, aPrimegen); break;
+ case aGenRandom: set_cmd( &cmd, aGenRandom); break;
+ #endif
+ 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;
+ case aUpdateTrustDB: set_cmd( &cmd, aUpdateTrustDB); break;
+ case aFixTrustDB: set_cmd( &cmd, aFixTrustDB); break;
+ case aListTrustPath: set_cmd( &cmd, aListTrustPath); break;
+ case aDeArmor: set_cmd( &cmd, aDeArmor); break;
+ case aEnArmor: set_cmd( &cmd, aEnArmor); break;
+ case aExportOwnerTrust: set_cmd( &cmd, aExportOwnerTrust); break;
+ case aImportOwnerTrust: set_cmd( &cmd, aImportOwnerTrust); break;
+ #endif /* IS_G10MAINT */
+
+
+
+ case oArmor: opt.armor = 1; opt.no_armor=0; break;
+ case oOutput: opt.outfile = pargs.r.ret_str; break;
+ case oQuiet: opt.quiet = 1; break;
+ case oVerbose: g10_opt_verbose++;
+ opt.verbose++; opt.list_sigs=1; break;
+ case oKOption: set_cmd( &cmd, aKMode ); break;
+
+ case oBatch: opt.batch = 1; greeting = 0; break;
+ 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;
+ case oDebug: opt.debug |= pargs.r.ret_ulong; break;
+ case oDebugAll: opt.debug = ~0; break;
+ case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
+ case oFingerprint: opt.fingerprint++; break;
+ case oSecretKeyring: append_to_strlist( &sec_nrings, pargs.r.ret_str); break;
+ case oOptions:
+ /* config files may not be nested (silently ignore them) */
+ if( !configfp ) {
+ m_free(configname);
+ configname = m_strdup(pargs.r.ret_str);
+ goto next_pass;
+ }
+ break;
+ case oNoArmor: opt.no_armor=1; opt.armor=0; break;
+ case oNoDefKeyring: default_keyring = 0; break;
+ case oNoGreeting: greeting = 0; break;
+ case oNoVerbose: g10_opt_verbose = 0;
+ opt.verbose = 0; opt.list_sigs=0; break;
+ case oQuickRandom: quick_random_gen(1); break;
+ case oNoComment: opt.no_comment=1; break;
+ case oCompletesNeeded: opt.completes_needed = pargs.r.ret_int; break;
+ case oMarginalsNeeded: opt.marginals_needed = pargs.r.ret_int; break;
+ case oMaxCertDepth: opt.max_cert_depth = pargs.r.ret_int; break;
+ case oTrustDBName: trustdb_name = pargs.r.ret_str; break;
+ case oDefaultKey: opt.def_secret_key = pargs.r.ret_str; break;
+ case oTrustedKey: register_trusted_key( pargs.r.ret_str ); break;
+ case oNoOptions: break; /* no-options */
+ case oHomedir: opt.homedir = pargs.r.ret_str; break;
+ case oNoBatch: opt.batch = 0; break;
+ 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;
+ case oLoadExtension:
+ register_cipher_extension(orig_argc? *orig_argv:NULL,
+ pargs.r.ret_str);
+ break;
+ case oRFC1991:
+ opt.rfc1991 = 1;
+ opt.no_comment = 1;
+ opt.escape_from = 1;
+ break;
+ case oEmuChecksumBug: opt.emulate_bugs |= EMUBUG_GPGCHKSUM; break;
+ case oCompressSigs: opt.compress_sigs = 1; break;
+ case oRunAsShmCP:
+ #ifndef USE_SHM_COPROCESSING
+ /* not possible in the option file,
+ * but we print the warning here anyway */
+ log_error("shared memory coprocessing is not available\n");
+ #endif
+ break;
+ case oSetFilename: opt.set_filename = pargs.r.ret_str; break;
+ case oComment: opt.comment_string = pargs.r.ret_str; break;
+ case oThrowKeyid: opt.throw_keyid = 1; break;
+ case oForceV3Sigs: opt.force_v3_sigs = 1; break;
+ case oS2KMode: opt.s2k_mode = pargs.r.ret_int; break;
+ 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 'a': opt.armor = 1; opt.no_armor=0; break;
#ifdef IS_G10
- case 'b': detached_sig = 1; set_cmd( &cmd, aSign ); break;
- case 'c': set_cmd( &cmd, aSym); break;
- case 'd': set_cmd( &cmd, aDecrypt); break;
- case 'e': set_cmd( &cmd, aEncr); break;
- case 'r': /* store the remote users */
+ case oRemote: /* store the remote users */
sl = m_alloc( sizeof *sl + strlen(pargs.r.ret_str));
strcpy(sl->d, pargs.r.ret_str);
sl->next = remusr;
remusr = sl;
break;
- case 's': set_cmd( &cmd, aSign ); break;
- case 't': opt.textmode=1; break;
- case 'u': /* store the local users */
+ case oTextmodeShort: opt.textmode = 2; break;
+ case oTextmode: opt.textmode=1; break;
+ case oUser: /* store the local users */
sl = m_alloc( sizeof *sl + strlen(pargs.r.ret_str));
strcpy(sl->d, pargs.r.ret_str);
sl->next = locusr;
locusr = sl;
break;
- case 'z': opt.compress = pargs.r.ret_int; break;
- case 503: set_cmd( &cmd, aKeygen); break;
- case 504: set_cmd( &cmd, aDeleteSecretKey); break;
- case 505: set_cmd( &cmd, aDeleteKey); break;
- case 506: set_cmd( &cmd, aSignKey); break;
- case 507: set_cmd( &cmd, aStore); break;
- case 523: set_passphrase_fd( pargs.r.ret_int ); break;
- case 524: set_cmd( &cmd, aEditKey); break;
- case 525: set_cmd( &cmd, aChangePass); break;
- case 527: def_cipher_string = m_strdup(pargs.r.ret_str); break;
- case 529: def_digest_string = m_strdup(pargs.r.ret_str); break;
- case 539: set_cmd( &cmd, aClearsign); break;
- case 540: secmem_set_flags( secmem_get_flags() | 1 ); break;
- case 542: set_cmd( &cmd, aGenRevoke); break;
- case 550: set_cmd( &cmd, aVerify); break;
+ case oCompress: opt.compress = pargs.r.ret_int; break;
+ case oPasswdFD: pwfd = pargs.r.ret_int; break;
+ 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 oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break;
#else
- case 527:
- case 529:
+ case oCipherAlgo:
+ case oDigestAlgo:
+ case oNoSecmemWarn:
+ break; /* dummies */
+ #endif
+ case oCharset:
+ if( set_native_charset( pargs.r.ret_str ) )
+ log_error(_("%s is not a valid character set\n"),
+ pargs.r.ret_str);
break;
- #endif /* !IS_G10 */
-
- #ifdef IS_G10MAINT
- case 513: set_cmd( &cmd, aPrimegen); break;
- case 514: set_cmd( &cmd, aTest); break;
- case 516: set_cmd( &cmd, aPrintMDs); break;
- case 531: set_cmd( &cmd, aListTrustDB); break;
- case 533: set_cmd( &cmd, aListTrustPath); break;
- case 540: break; /* dummy */
- case 546: set_cmd( &cmd, aDeArmor); break;
- case 547: set_cmd( &cmd, aEnArmor); break;
- case 548: set_cmd( &cmd, aGenRandom); break;
- case 555: set_cmd( &cmd, aPrintMD); break;
- case 564: set_cmd( &cmd, aListOwnerTrust); break;
- #endif /* IS_G10MAINT */
+ case oNotDashEscaped: opt.not_dash_escaped = 1; break;
+ case oEscapeFrom: opt.escape_from = 1; break;
+ case oLockOnce: opt.lock_once = 1; break;
- case 'o': opt.outfile = pargs.r.ret_str; break;
- case 'v': g10_opt_verbose++;
- opt.verbose++; opt.list_sigs=1; break;
- case 'k': set_cmd( &cmd, aKMode ); break;
-
- case 500: opt.batch = 1; greeting = 0; break;
- case 501: opt.answer_yes = 1; break;
- case 502: opt.answer_no = 1; break;
- case 508: set_cmd( &cmd, aCheckKeys); break;
- case 509: append_to_strlist( &nrings, pargs.r.ret_str); break;
- case 510: opt.debug |= pargs.r.ret_ulong; break;
- case 511: opt.debug = ~0; break;
- case 512: set_status_fd( pargs.r.ret_int ); break;
- case 515: opt.fingerprint = 1; break;
- case 517: append_to_strlist( &sec_nrings, pargs.r.ret_str); break;
- case 518:
- /* config files may not be nested (silently ignore them) */
- if( !configfp ) {
- m_free(configname);
- configname = m_strdup(pargs.r.ret_str);
- goto next_pass;
- }
- break;
- case 519: opt.no_armor=1; opt.armor=0; break;
- case 520: default_keyring = 0; break;
- case 521: set_cmd( &cmd, aListPackets); break;
- case 522: greeting = 0; break;
- case 526: g10_opt_verbose = 0;
- opt.verbose = 0; opt.list_sigs=0; break;
- case 530: set_cmd( &cmd, aImport); break;
- case 532: quick_random_gen(1); break;
- case 534: opt.no_comment=1; break;
- case 535: opt.completes_needed = pargs.r.ret_int; break;
- case 536: opt.marginals_needed = pargs.r.ret_int; break;
- case 537: set_cmd( &cmd, aExport); break;
- case 538: trustdb_name = pargs.r.ret_str; break;
- case 541: opt.def_secret_key = pargs.r.ret_str; break;
- case 543: break; /* no-options */
- case 544: opt.homedir = pargs.r.ret_str; break;
- case 545: opt.batch = 0; break;
- case 549: opt.with_colons=':'; break;
- case 551: set_cmd( &cmd, aListKeys); break;
- case 552: set_cmd( &cmd, aListSigs); break;
- case 553: opt.skip_verify=1; break;
- case 554: set_cmd( &cmd, aKeyadd); break;
- case 556: opt.def_compress_algo = pargs.r.ret_int; break;
- case 557: opt.compress_keys = 1; break;
- case 558: set_cmd( &cmd, aListSecretKeys); break;
- case 559: opt.always_trust = 1; break;
- case 560: register_cipher_extension(pargs.r.ret_str); break;
- case 561: opt.rfc1991 = 1; break;
- case 562: opt.emulate_bugs |= 1; break;
- case 563: set_cmd( &cmd, aExportSecret); break;
- case 565: opt.do_not_export_rsa = 1; break;
- default : errors++; pargs.err = configfp? 1:2; break;
+ default : pargs.err = configfp? 1:2; break;
}
}
if( configfp ) {
tty_printf("%s\n", strusage(15) );
}
- #ifdef IS_G10
- /* initialize the secure memory. */
- secmem_init( 16384 );
- maybe_setuid = 0;
- /* Okay, we are now working under our real uid */
- #endif
-
- /*write_status( STATUS_ENTER );*/
+ secmem_set_flags( secmem_get_flags() & ~2 ); /* resume warnings */
set_debug();
if( def_cipher_string ) {
opt.def_cipher_algo = string_to_cipher_algo(def_cipher_string);
m_free(def_cipher_string); def_cipher_string = NULL;
+ if( check_cipher_algo(opt.def_cipher_algo) )
+ log_error(_("selected cipher algorithm is invalid\n"));
}
if( def_digest_string ) {
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) )
+ log_error(_("selected digest algorithm is invalid\n"));
+ }
+ if( s2k_cipher_string ) {
+ 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) )
+ log_error(_("selected cipher algorithm is invalid\n"));
+ }
+ if( s2k_digest_string ) {
+ 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) )
+ log_error(_("selected digest algorithm is invalid\n"));
+ }
+ if( opt.def_compress_algo < 1 || opt.def_compress_algo > 2 )
+ log_error(_("compress algorithm must be in range %d..%d\n"), 1, 2);
+ 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"));
+ if( opt.max_cert_depth < 1 || opt.max_cert_depth > 255 )
+ log_error(_("max-cert-depth must be in range 1 to 255\n"));
+ switch( opt.s2k_mode ) {
+ case 0:
+ log_info(_("NOTE: simple S2K mode (0) is strongly discouraged\n"));
+ break;
+ case 1: case 3: break;
+ default:
+ log_error(_("invalid S2K mode; must be 0, 1 or 3\n"));
+ }
+
+ { const char *p = strusage(13);
+ for( ; *p && (isdigit(*p) || *p=='.'); p++ )
+ ;
+ if( *p )
+ log_info("NOTE: this is a development version!\n");
}
- check_opts();
+
if( log_get_errorcount(0) )
g10_exit(2);
/* kludge to let -sat generate a clear text signature */
- if( opt.textmode && !detached_sig && opt.armor && cmd == aSign )
+ if( opt.textmode == 2 && !detached_sig && opt.armor && cmd == aSign )
cmd = aClearsign;
if( opt.verbose > 1 )
&& !(cmd == aKMode && argc == 2 ) ) {
if( !sec_nrings || default_keyring ) /* add default secret rings */
- add_secret_keyring("secring.gpg");
+ add_keyblock_resource("secring.gpg", 0, 1);
for(sl = sec_nrings; sl; sl = sl->next )
- add_secret_keyring( sl->d );
+ add_keyblock_resource( sl->d, 0, 1 );
if( !nrings || default_keyring ) /* add default ring */
- add_keyring("pubring.gpg");
+ add_keyblock_resource("pubring.gpg", 0, 0);
for(sl = nrings; sl; sl = sl->next )
- add_keyring( sl->d );
+ add_keyblock_resource( sl->d, 0, 0 );
}
FREE_STRLIST(nrings);
FREE_STRLIST(sec_nrings);
- if( argc )
- fname = *argv;
- else {
- fname = NULL;
- if( get_passphrase_fd() == 0 ) {
- /* reading data and passphrase from stdin:
- * we assume the first line is the passphrase, so
- * we should read it now.
- *
- * We should do it here, but for now it is not needed.
- * Anyway, this password scheme is not quite good
- */
- }
- }
+
+ if( pwfd != -1 ) /* read the passphrase now. */
+ read_passphrase_from_fd( pwfd );
+
+ fname = argc? *argv : NULL;
switch( cmd ) {
case aPrimegen:
case aGenRandom:
case aDeArmor:
case aEnArmor:
+ case aFixTrustDB:
break;
case aKMode:
case aListKeys:
if( opt.with_colons ) /* need this to list the trust */
rc = init_trustdb(1, trustdb_name );
break;
- case aListOwnerTrust: rc = init_trustdb( 0, trustdb_name ); break;
+ case aExportOwnerTrust: rc = init_trustdb( 0, trustdb_name ); break;
case aListTrustDB: rc = init_trustdb( argc? 1:0, trustdb_name ); break;
default: rc = init_trustdb(1, trustdb_name ); break;
}
if( argc > 1 )
wrong_args(_("--store [filename]"));
if( (rc = encode_store(fname)) )
- log_error("%s: store failed: %s\n",
- print_fname_stdin(fname), g10_errstr(rc) );
+ log_error_f( print_fname_stdin(fname),
+ "store failed: %s\n", g10_errstr(rc) );
break;
#ifdef IS_G10
case aSym: /* encrypt the given file only with the symmetric cipher */
if( argc > 1 )
wrong_args(_("--symmetric [filename]"));
if( (rc = encode_symmetric(fname)) )
- log_error("%s: symmetric encryption failed: %s\n",
- print_fname_stdin(fname), g10_errstr(rc) );
+ log_error_f(print_fname_stdin(fname),
+ "symmetric encryption failed: %s\n",g10_errstr(rc) );
break;
case aEncr: /* encrypt the given file */
case aSignKey: /* sign the key given as argument */
- if( argc != 1 )
- wrong_args(_("--sign-key username"));
- /* note: fname is the user id! */
- if( (rc = sign_key(fname, locusr)) )
- log_error("%s: sign key failed: %s\n", print_fname_stdin(fname), g10_errstr(rc) );
- break;
-
case aEditKey: /* Edit a key signature */
- if( argc != 1 )
- wrong_args(_("--edit-key username"));
- /* note: fname is the user id! */
- if( (rc = edit_keysigs(fname)) )
- log_error("%s: edit signature failed: %s\n", print_fname_stdin(fname), g10_errstr(rc) );
+ if( !argc )
+ wrong_args(_("--edit-key username [commands]"));
+ if( argc > 1 ) {
+ sl = NULL;
+ for( argc--, argv++ ; argc; argc--, argv++ )
+ append_to_strlist( &sl, *argv );
+ keyedit_menu( fname, locusr, sl );
+ free_strlist(sl);
+ }
+ else
+ keyedit_menu(fname, locusr, NULL );
break;
+ #endif /* IS_G10 */
+
case aDeleteSecretKey:
if( argc != 1 )
wrong_args(_("--delete-secret-key username"));
log_error("%s: delete key failed: %s\n", print_fname_stdin(fname), g10_errstr(rc) );
break;
- case aChangePass: /* Change the passphrase */
- if( argc > 1 ) /* no arg: use default, 1 arg use this one */
- wrong_args(_("--change-passphrase [username]"));
- /* note: fname is the user id! */
- if( (rc = change_passphrase(fname)) )
- log_error("%s: change passphrase failed: %s\n", print_fname_stdin(fname),
- g10_errstr(rc) );
- break;
- #endif /* IS_G10 */
case aCheckKeys:
opt.check_sigs = 1;
else {
/* add keyring (default keyrings are not registered in this
* special case */
- add_keyring( argv[1] );
+ add_keyblock_resource( argv[1], 0, 0 );
public_key_list( **argv?1:0, argv );
}
}
wrong_args("--gen-key");
generate_keypair();
break;
- case aKeyadd: /* add a subkey (interactive) */
- if( argc != 1 )
- wrong_args("--add-key userid");
- generate_subkeypair(*argv);
- break;
#endif
+ case aFastImport:
case aImport:
if( !argc ) {
- rc = import_keys( NULL );
+ rc = import_keys( NULL, (cmd == aFastImport) );
if( rc )
log_error("import failed: %s\n", g10_errstr(rc) );
}
for( ; argc; argc--, argv++ ) {
- rc = import_keys( *argv );
+ rc = import_keys( *argv, (cmd == aFastImport) );
if( rc )
- log_error("import from '%s' failed: %s\n",
+ log_error("import from `%s' failed: %s\n",
*argv, g10_errstr(rc) );
}
break;
case aExport:
+ case aExportAll:
sl = NULL;
for( ; argc; argc--, argv++ )
add_to_strlist( &sl, *argv );
- export_pubkeys( sl );
+ export_pubkeys( sl, (cmd == aExport) );
free_strlist(sl);
break;
break;
+ #ifdef MAINTAINER_OPTIONS
case aPrimegen:
if( argc == 1 ) {
mpi_print( stdout, generate_public_prime( atoi(argv[0]) ), 1);
else
usage(1);
break;
+ #endif /* MAINTAINER OPTIONS */
+ #ifdef MAINTAINER_OPTIONS
case aGenRandom:
if( argc < 1 || argc > 2 )
wrong_args("--gen-random level [hex]");
{
+ int c;
int level = atoi(*argv);
for(;;) {
- int c = get_random_byte(level);
- if( argc == 1 ) {
- printf("%02x", c );
+ byte *p;
+ if( argc == 2 ) {
+ p = get_random_bits( 8, level, 0);
+ printf("%02x", *p );
fflush(stdout);
}
- else
- putchar(c&0xff);
+ else {
+ p = get_random_bits( 800, level, 0);
+ for(c=0; c < 100; c++ )
+ putchar( p[c] );
+ }
+ m_free(p);
}
}
break;
+ #endif /* MAINTAINER OPTIONS */
case aPrintMD:
if( argc < 1)
int algo = string_to_digest_algo(*argv);
if( !algo )
- log_error(_("invalid hash algorithm '%s'\n"), *argv );
+ log_error(_("invalid hash algorithm `%s'\n"), *argv );
else {
argc--; argv++;
if( !argc )
}
break;
- case aTest: do_test( argc? atoi(*argv): 1 ); break;
-
case aListTrustDB:
if( !argc )
list_trustdb(NULL);
}
break;
+ case aUpdateTrustDB:
+ if( argc )
+ wrong_args("--update-trustdb");
+ update_trustdb();
+ break;
+
+ case aCheckTrustDB:
+ if( !argc )
+ check_trustdb(NULL);
+ else {
+ for( ; argc; argc--, argv++ )
+ check_trustdb( *argv );
+ }
+ break;
+
+ case aFixTrustDB:
+ log_error("this command ist not yet implemented.\"\n");
+ log_error("A workaround is to use \"--export-ownertrust\", remove\n");
+ log_error("the trustdb file and do an \"--import-ownertrust\".\n" );
+ break;
+
case aListTrustPath:
- if( argc != 2 )
- wrong_args("--list-trust-path [-- -]<maxdepth> <username>");
- list_trust_path( atoi(*argv), argv[1] );
+ if( !argc )
+ wrong_args("--list-trust-path <usernames>");
+ for( ; argc; argc--, argv++ )
+ list_trust_path( *argv );
break;
- case aListOwnerTrust:
+ case aExportOwnerTrust:
if( argc )
- wrong_args("--list-ownertrust");
- list_ownertrust();
+ wrong_args("--export-ownertrust");
+ export_ownertrust();
+ break;
+
+ case aImportOwnerTrust:
+ if( argc > 1 )
+ wrong_args("--import-ownertrust [file]");
+ import_ownertrust( argc? *argv:NULL );
break;
#endif /* IS_G10MAINT */
/* fixme: g10maint should do regular maintenace tasks here */
if( argc > 1 )
wrong_args(_("[filename]"));
+ /* 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"));
+
if( !(a = iobuf_open(fname)) )
- log_error(_("can't open '%s'\n"), print_fname_stdin(fname));
+ log_error(_("can't open `%s'\n"), print_fname_stdin(fname));
else {
+
if( !opt.no_armor ) {
if( use_armor_filter( a ) ) {
memset( &afx, 0, sizeof afx);
void
g10_exit( int rc )
{
+ if( opt.debug & DBG_MEMSTAT_VALUE )
+ m_print_stats("on exit");
if( opt.debug )
secmem_dump_stats();
secmem_term();
- rc = rc? rc : log_get_errorcount(0)? 2:0;
+ rc = rc? rc : log_get_errorcount(0)? 2 :
+ g10_errors_seen? 1 : 0;
/*write_status( STATUS_LEAVE );*/
exit(rc );
}
-void
-do_not_use_RSA()
-{
- static int did_rsa_note = 0;
-
- if( !did_rsa_note ) {
- did_rsa_note = 1;
- log_info(_("RSA keys are depreciated; please consider "
- "creating a new key and use this key in the future\n"));
- }
-}
#ifdef IS_G10MAINT
-static void
-do_test(int times)
-{
- m_check(NULL);
-}
#endif /* IS_G10MAINT */
projects / gnupg.git / blobdiff